diff --git a/arch/arm64/configs/wahoo_defconfig b/arch/arm64/configs/wahoo_defconfig
index a46867af4159..fe03a79a7951 100644
--- a/arch/arm64/configs/wahoo_defconfig
+++ b/arch/arm64/configs/wahoo_defconfig
@@ -169,6 +169,7 @@ CONFIG_NETFILTER_XT_MATCH_LIMIT=y
 CONFIG_NETFILTER_XT_MATCH_MAC=y
 CONFIG_NETFILTER_XT_MATCH_MARK=y
 CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
+CONFIG_NETFILTER_XT_MATCH_OWNER=y
 CONFIG_NETFILTER_XT_MATCH_POLICY=y
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
 CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
@@ -223,6 +224,7 @@ CONFIG_NET_CLS_FW=y
 CONFIG_NET_CLS_U32=y
 CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_FLOW=y
+CONFIG_NET_CLS_BPF=y
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_CMP=y
 CONFIG_NET_EMATCH_NBYTE=y
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 208c83f308ac..2c75a97cabb1 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1031,6 +1031,14 @@ static void volume_control_quirks(struct usb_mixer_elem_info *cval,
 		}
 		break;
 
+	case USB_ID(0x05ac, 0x110a): /* Apple USB C to 3.5mm adapter */
+		if(!strcmp(kctl->id.name, "PCM Playback Volume")){
+			/* Set PCM Playback Volume for channel 1 and 2 to maximum supported volume */
+			snd_usb_set_cur_mix_value(cval, 1, 0, cval->max);
+			snd_usb_set_cur_mix_value(cval, 2, 1, cval->max);
+		}
+		break;
+
 	case USB_ID(0x046d, 0x0807): /* Logitech Webcam C500 */
 	case USB_ID(0x046d, 0x0808):
 	case USB_ID(0x046d, 0x0809):