diff --git a/arch/arm/configs/odroidc_defconfig b/arch/arm/configs/odroidc_defconfig
index ecf2b0c1ddd5..8bba8d4d4cb2 100644
--- a/arch/arm/configs/odroidc_defconfig
+++ b/arch/arm/configs/odroidc_defconfig
@@ -1088,32 +1088,7 @@ CONFIG_CAN_MCP251X=m
 # CONFIG_CAN_SOFTING is not set
 # CONFIG_CAN_DEBUG_DEVICES is not set
 # CONFIG_IRDA is not set
-CONFIG_BT=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=y
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=y
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_ATH3K=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIUART_3WIRE=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-# CONFIG_BT_MRVL_SDIO is not set
-CONFIG_BT_ATH3K=m
+# CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@@ -1129,12 +1104,8 @@ CONFIG_WEXT_PRIV=y
 # CFG80211 needs to be enabled for MAC80211
 #
 # CONFIG_WIMAX is not set
-CONFIG_RFKILL=y
-CONFIG_RFKILL_PM=y
-CONFIG_RFKILL_LEDS=y
-# CONFIG_RFKILL_INPUT is not set
+# CONFIG_RFKILL is not set
 # CONFIG_RFKILL_REGULATOR is not set
-# CONFIG_RFKILL_GPIO is not set
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
@@ -1340,7 +1311,6 @@ CONFIG_AM_WIFI_USB=y
 #
 # Bluetooth Device Support
 #
-CONFIG_BT_DEVICE=y
 CONFIG_BT_WAKE_CTRL=y
 # CONFIG_BT_RTKBTUSB is not set
 # CONFIG_MESON_NFC is not set
@@ -1961,7 +1931,6 @@ CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 # CONFIG_USB_USBNET is not set
-CONFIG_USB_HSO=m
 CONFIG_USB_CDC_PHONET=m
 CONFIG_USB_IPHETH=m
 # CONFIG_WLAN is not set
@@ -4362,7 +4331,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
-# CONFIG_CRYPTO_CMAC is not set
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_HMAC=y
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_VMAC is not set
@@ -4605,6 +4574,35 @@ CONFIG_BACKPORT_MAC80211_LEDS=y
 # CONFIG_BACKPORT_MAC80211_DEBUGFS is not set
 # CONFIG_BACKPORT_MAC80211_MESSAGE_TRACING is not set
 # CONFIG_BACKPORT_MAC80211_DEBUG_MENU is not set
+CONFIG_BACKPORT_BT=y
+CONFIG_BACKPORT_BT_BREDR=y
+CONFIG_BACKPORT_BT_RFCOMM=m
+CONFIG_BACKPORT_BT_RFCOMM_TTY=y
+CONFIG_BACKPORT_BT_BNEP=m
+CONFIG_BACKPORT_BT_BNEP_MC_FILTER=y
+CONFIG_BACKPORT_BT_BNEP_PROTO_FILTER=y
+CONFIG_BACKPORT_BT_HIDP=m
+CONFIG_BACKPORT_BT_LE=y
+# CONFIG_BACKPORT_BT_SELFTEST is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BACKPORT_BT_HCIBTUSB=m
+# CONFIG_BACKPORT_BT_HCIBTSDIO is not set
+CONFIG_BACKPORT_BT_HCIUART=m
+CONFIG_BACKPORT_BT_HCIUART_H4=y
+CONFIG_BACKPORT_BT_HCIUART_BCSP=y
+CONFIG_BACKPORT_BT_HCIUART_ATH3K=y
+CONFIG_BACKPORT_BT_HCIUART_LL=y
+CONFIG_BACKPORT_BT_HCIUART_3WIRE=y
+CONFIG_BACKPORT_BT_HCIBCM203X=m
+CONFIG_BACKPORT_BT_HCIBPA10X=m
+CONFIG_BACKPORT_BT_HCIBFUSB=m
+CONFIG_BACKPORT_BT_HCIVHCI=m
+CONFIG_BACKPORT_BT_MRVL=m
+CONFIG_BACKPORT_BT_ATH3K=m
+CONFIG_BACKPORT_BT_RTL=y
 CONFIG_BACKPORT_WLAN=y
 # CONFIG_BACKPORT_LIBERTAS_THINFIRM is not set
 CONFIG_BACKPORT_AT76C50X_USB=m
@@ -4724,5 +4722,6 @@ CONFIG_BACKPORT_USB_SIERRA_NET=m
 CONFIG_BACKPORT_USB_WDM=m
 CONFIG_RTL8192CU=m
 CONFIG_RTL8821AU=m
+CONFIG_RTL8821CU=m
 CONFIG_RTL8188EU=m
 CONFIG_RTL8192DU=m