diff --git kernel/configs/ti_arm64_prune.config kernel/configs/ti_arm64_prune.config
index e0023c8cf..1884ed177 100644
--- kernel/configs/ti_arm64_prune.config
+++ kernel/configs/ti_arm64_prune.config
@@ -155,6 +155,33 @@ CONFIG_USB_CHIPIDEA=n
 CONFIG_USB_ISP1760=n
 CONFIG_USB_HSIC_USB3503=n
 
+# CC33XX
+CONFIG_WL18XX=n
+CONFIG_WLCORE=n
+CONFIG_WLCORE_SDIO=n
+CONFIG_CC33XX=m
+CONFIG_CC33XX_SDIO=m
+CONFIG_CC33XX_SPI=m
+CONFIG_BT_TI=m
+CONFIG_BT_TI_UART=m
+CONFIG_BT_TI_SDIO=m
+CONFIG_CFG80211=m
+CONFIG_MAC80211=m
+
+CONFIG_EXPERT=y
+CONFIG_CFG80211=m
+CONFIG_CFG80211_DEBUGFS=n
+CONFIG_CFG80211_CRDA_SUPPORT=n
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_CERTIFICATION_ONUS=y
+
+CONFIG_KEYS=y
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS7_MESSAGE_PARSER=y
+
 # Generic kernel
 
 # We recommend to turn off Real-Time group scheduling in the
diff --git drivers/net/wireless/ti/cc33xx/debugfs.c drivers/net/wireless/ti/cc33xx/debugfs.c
index c9fb8c051..e42431e6a 100644
--- drivers/net/wireless/ti/cc33xx/debugfs.c
+++ drivers/net/wireless/ti/cc33xx/debugfs.c
@@ -221,8 +221,8 @@ static ssize_t radar_debug_mode_write(struct file *file,
		goto out;

	cc33xx_for_each_wlvif_ap(wl, wlvif) {
-		wlcore_cmd_generic_cfg(wl, wlvif,
-				       WLCORE_CFG_FEATURE_RADAR_DEBUG,
+		cc33xx_cmd_generic_cfg(wl, wlvif,
+				       CC33XX_CFG_FEATURE_RADAR_DEBUG,
				       wl->radar_debug_mode, 0);
	}
 
@@ -250,7 +250,6 @@ static const struct file_operations radar_debug_mode_ops = {

 static void cc33xx_debugfs_add_files_helper(struct dentry *moddir)
 {
-	DEBUGFS_ADD(radar_debug_mode, moddir);
 }
 #else
 static void cc33xx_debugfs_add_files_helper(struct dentry *moddir) {}
diff --git net/wireless/certs/sforshee.hex net/wireless/certs/sforshee.hex
deleted file mode 100644
index 14ea66643..000000000
--- net/wireless/certs/sforshee.hex
+++ /dev/null
@@ -1,86 +0,0 @@
-/* Seth Forshee's regdb certificate */
-0x30, 0x82, 0x02, 0xa4, 0x30, 0x82, 0x01, 0x8c,
-0x02, 0x09, 0x00, 0xb2, 0x8d, 0xdf, 0x47, 0xae,
-0xf9, 0xce, 0xa7, 0x30, 0x0d, 0x06, 0x09, 0x2a,
-0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
-0x05, 0x00, 0x30, 0x13, 0x31, 0x11, 0x30, 0x0f,
-0x06, 0x03, 0x55, 0x04, 0x03, 0x0c, 0x08, 0x73,
-0x66, 0x6f, 0x72, 0x73, 0x68, 0x65, 0x65, 0x30,
-0x20, 0x17, 0x0d, 0x31, 0x37, 0x31, 0x30, 0x30,
-0x36, 0x31, 0x39, 0x34, 0x30, 0x33, 0x35, 0x5a,
-0x18, 0x0f, 0x32, 0x31, 0x31, 0x37, 0x30, 0x39,
-0x31, 0x32, 0x31, 0x39, 0x34, 0x30, 0x33, 0x35,
-0x5a, 0x30, 0x13, 0x31, 0x11, 0x30, 0x0f, 0x06,
-0x03, 0x55, 0x04, 0x03, 0x0c, 0x08, 0x73, 0x66,
-0x6f, 0x72, 0x73, 0x68, 0x65, 0x65, 0x30, 0x82,
-0x01, 0x22, 0x30, 0x0d, 0x06, 0x09, 0x2a, 0x86,
-0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01, 0x05,
-0x00, 0x03, 0x82, 0x01, 0x0f, 0x00, 0x30, 0x82,
-0x01, 0x0a, 0x02, 0x82, 0x01, 0x01, 0x00, 0xb5,
-0x40, 0xe3, 0x9c, 0x28, 0x84, 0x39, 0x03, 0xf2,
-0x39, 0xd7, 0x66, 0x2c, 0x41, 0x38, 0x15, 0xac,
-0x7e, 0xa5, 0x83, 0x71, 0x25, 0x7e, 0x90, 0x7c,
-0x68, 0xdd, 0x6f, 0x3f, 0xd9, 0xd7, 0x59, 0x38,
-0x9f, 0x7c, 0x6a, 0x52, 0xc2, 0x03, 0x2a, 0x2d,
-0x7e, 0x66, 0xf4, 0x1e, 0xb3, 0x12, 0x70, 0x20,
-0x5b, 0xd4, 0x97, 0x32, 0x3d, 0x71, 0x8b, 0x3b,
-0x1b, 0x08, 0x17, 0x14, 0x6b, 0x61, 0xc4, 0x57,
-0x8b, 0x96, 0x16, 0x1c, 0xfd, 0x24, 0xd5, 0x0b,
-0x09, 0xf9, 0x68, 0x11, 0x84, 0xfb, 0xca, 0x51,
-0x0c, 0xd1, 0x45, 0x19, 0xda, 0x10, 0x44, 0x8a,
-0xd9, 0xfe, 0x76, 0xa9, 0xfd, 0x60, 0x2d, 0x18,
-0x0b, 0x28, 0x95, 0xb2, 0x2d, 0xea, 0x88, 0x98,
-0xb8, 0xd1, 0x56, 0x21, 0xf0, 0x53, 0x1f, 0xf1,
-0x02, 0x6f, 0xe9, 0x46, 0x9b, 0x93, 0x5f, 0x28,
-0x90, 0x0f, 0xac, 0x36, 0xfa, 0x68, 0x23, 0x71,
-0x57, 0x56, 0xf6, 0xcc, 0xd3, 0xdf, 0x7d, 0x2a,
-0xd9, 0x1b, 0x73, 0x45, 0xeb, 0xba, 0x27, 0x85,
-0xef, 0x7a, 0x7f, 0xa5, 0xcb, 0x80, 0xc7, 0x30,
-0x36, 0xd2, 0x53, 0xee, 0xec, 0xac, 0x1e, 0xe7,
-0x31, 0xf1, 0x36, 0xa2, 0x9c, 0x63, 0xc6, 0x65,
-0x5b, 0x7f, 0x25, 0x75, 0x68, 0xa1, 0xea, 0xd3,
-0x7e, 0x00, 0x5c, 0x9a, 0x5e, 0xd8, 0x20, 0x18,
-0x32, 0x77, 0x07, 0x29, 0x12, 0x66, 0x1e, 0x36,
-0x73, 0xe7, 0x97, 0x04, 0x41, 0x37, 0xb1, 0xb1,
-0x72, 0x2b, 0xf4, 0xa1, 0x29, 0x20, 0x7c, 0x96,
-0x79, 0x0b, 0x2b, 0xd0, 0xd8, 0xde, 0xc8, 0x6c,
-0x3f, 0x93, 0xfb, 0xc5, 0xee, 0x78, 0x52, 0x11,
-0x15, 0x1b, 0x7a, 0xf6, 0xe2, 0x68, 0x99, 0xe7,
-0xfb, 0x46, 0x16, 0x84, 0xe3, 0xc7, 0xa1, 0xe6,
-0xe0, 0xd2, 0x46, 0xd5, 0xe1, 0xc4, 0x5f, 0xa0,
-0x66, 0xf4, 0xda, 0xc4, 0xff, 0x95, 0x1d, 0x02,
-0x03, 0x01, 0x00, 0x01, 0x30, 0x0d, 0x06, 0x09,
-0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01,
-0x0b, 0x05, 0x00, 0x03, 0x82, 0x01, 0x01, 0x00,
-0x87, 0x03, 0xda, 0xf2, 0x82, 0xc2, 0xdd, 0xaf,
-0x7c, 0x44, 0x2f, 0x86, 0xd3, 0x5f, 0x4c, 0x93,
-0x48, 0xb9, 0xfe, 0x07, 0x17, 0xbb, 0x21, 0xf7,
-0x25, 0x23, 0x4e, 0xaa, 0x22, 0x0c, 0x16, 0xb9,
-0x73, 0xae, 0x9d, 0x46, 0x7c, 0x75, 0xd9, 0xc3,
-0x49, 0x57, 0x47, 0xbf, 0x33, 0xb7, 0x97, 0xec,
-0xf5, 0x40, 0x75, 0xc0, 0x46, 0x22, 0xf0, 0xa0,
-0x5d, 0x9c, 0x79, 0x13, 0xa1, 0xff, 0xb8, 0xa3,
-0x2f, 0x7b, 0x8e, 0x06, 0x3f, 0xc8, 0xb6, 0xe4,
-0x6a, 0x28, 0xf2, 0x34, 0x5c, 0x23, 0x3f, 0x32,
-0xc0, 0xe6, 0xad, 0x0f, 0xac, 0xcf, 0x55, 0x74,
-0x47, 0x73, 0xd3, 0x01, 0x85, 0xb7, 0x0b, 0x22,
-0x56, 0x24, 0x7d, 0x9f, 0x09, 0xa9, 0x0e, 0x86,
-0x9e, 0x37, 0x5b, 0x9c, 0x6d, 0x02, 0xd9, 0x8c,
-0xc8, 0x50, 0x6a, 0xe2, 0x59, 0xf3, 0x16, 0x06,
-0xea, 0xb2, 0x42, 0xb5, 0x58, 0xfe, 0xba, 0xd1,
-0x81, 0x57, 0x1a, 0xef, 0xb2, 0x38, 0x88, 0x58,
-0xf6, 0xaa, 0xc4, 0x2e, 0x8b, 0x5a, 0x27, 0xe4,
-0xa5, 0xe8, 0xa4, 0xca, 0x67, 0x5c, 0xac, 0x72,
-0x67, 0xc3, 0x6f, 0x13, 0xc3, 0x2d, 0x35, 0x79,
-0xd7, 0x8a, 0xe7, 0xf5, 0xd4, 0x21, 0x30, 0x4a,
-0xd5, 0xf6, 0xa3, 0xd9, 0x79, 0x56, 0xf2, 0x0f,
-0x10, 0xf7, 0x7d, 0xd0, 0x51, 0x93, 0x2f, 0x47,
-0xf8, 0x7d, 0x4b, 0x0a, 0x84, 0x55, 0x12, 0x0a,
-0x7d, 0x4e, 0x3b, 0x1f, 0x2b, 0x2f, 0xfc, 0x28,
-0xb3, 0x69, 0x34, 0xe1, 0x80, 0x80, 0xbb, 0xe2,
-0xaf, 0xb9, 0xd6, 0x30, 0xf1, 0x1d, 0x54, 0x87,
-0x23, 0x99, 0x9f, 0x51, 0x03, 0x4c, 0x45, 0x7d,
-0x02, 0x65, 0x73, 0xab, 0xfd, 0xcf, 0x94, 0xcc,
-0x0d, 0x3a, 0x60, 0xfd, 0x3c, 0x14, 0x2f, 0x16,
-0x33, 0xa9, 0x21, 0x1f, 0xcb, 0x50, 0xb1, 0x8f,
-0x03, 0xee, 0xa0, 0x66, 0xa9, 0x16, 0x79, 0x14,
diff --git net/wireless/certs/wens.hex net/wireless/certs/wens.hex
deleted file mode 100644
index 0d50369be..000000000
--- net/wireless/certs/wens.hex
+++ /dev/null
@@ -1,87 +0,0 @@
-/* Chen-Yu Tsai's regdb certificate */
-0x30, 0x82, 0x02, 0xa7, 0x30, 0x82, 0x01, 0x8f,
-0x02, 0x14, 0x61, 0xc0, 0x38, 0x65, 0x1a, 0xab,
-0xdc, 0xf9, 0x4b, 0xd0, 0xac, 0x7f, 0xf0, 0x6c,
-0x72, 0x48, 0xdb, 0x18, 0xc6, 0x00, 0x30, 0x0d,
-0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
-0x01, 0x01, 0x0b, 0x05, 0x00, 0x30, 0x0f, 0x31,
-0x0d, 0x30, 0x0b, 0x06, 0x03, 0x55, 0x04, 0x03,
-0x0c, 0x04, 0x77, 0x65, 0x6e, 0x73, 0x30, 0x20,
-0x17, 0x0d, 0x32, 0x33, 0x31, 0x32, 0x30, 0x31,
-0x30, 0x37, 0x34, 0x31, 0x31, 0x34, 0x5a, 0x18,
-0x0f, 0x32, 0x31, 0x32, 0x33, 0x31, 0x31, 0x30,
-0x37, 0x30, 0x37, 0x34, 0x31, 0x31, 0x34, 0x5a,
-0x30, 0x0f, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x03,
-0x55, 0x04, 0x03, 0x0c, 0x04, 0x77, 0x65, 0x6e,
-0x73, 0x30, 0x82, 0x01, 0x22, 0x30, 0x0d, 0x06,
-0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01,
-0x01, 0x01, 0x05, 0x00, 0x03, 0x82, 0x01, 0x0f,
-0x00, 0x30, 0x82, 0x01, 0x0a, 0x02, 0x82, 0x01,
-0x01, 0x00, 0xa9, 0x7a, 0x2c, 0x78, 0x4d, 0xa7,
-0x19, 0x2d, 0x32, 0x52, 0xa0, 0x2e, 0x6c, 0xef,
-0x88, 0x7f, 0x15, 0xc5, 0xb6, 0x69, 0x54, 0x16,
-0x43, 0x14, 0x79, 0x53, 0xb7, 0xae, 0x88, 0xfe,
-0xc0, 0xb7, 0x5d, 0x47, 0x8e, 0x1a, 0xe1, 0xef,
-0xb3, 0x90, 0x86, 0xda, 0xd3, 0x64, 0x81, 0x1f,
-0xce, 0x5d, 0x9e, 0x4b, 0x6e, 0x58, 0x02, 0x3e,
-0xb2, 0x6f, 0x5e, 0x42, 0x47, 0x41, 0xf4, 0x2c,
-0xb8, 0xa8, 0xd4, 0xaa, 0xc0, 0x0e, 0xe6, 0x48,
-0xf0, 0xa8, 0xce, 0xcb, 0x08, 0xae, 0x37, 0xaf,
-0xf6, 0x40, 0x39, 0xcb, 0x55, 0x6f, 0x5b, 0x4f,
-0x85, 0x34, 0xe6, 0x69, 0x10, 0x50, 0x72, 0x5e,
-0x4e, 0x9d, 0x4c, 0xba, 0x38, 0x36, 0x0d, 0xce,
-0x73, 0x38, 0xd7, 0x27, 0x02, 0x2a, 0x79, 0x03,
-0xe1, 0xac, 0xcf, 0xb0, 0x27, 0x85, 0x86, 0x93,
-0x17, 0xab, 0xec, 0x42, 0x77, 0x37, 0x65, 0x8a,
-0x44, 0xcb, 0xd6, 0x42, 0x93, 0x92, 0x13, 0xe3,
-0x39, 0x45, 0xc5, 0x6e, 0x00, 0x4a, 0x7f, 0xcb,
-0x42, 0x17, 0x2b, 0x25, 0x8c, 0xb8, 0x17, 0x3b,
-0x15, 0x36, 0x59, 0xde, 0x42, 0xce, 0x21, 0xe6,
-0xb6, 0xc7, 0x6e, 0x5e, 0x26, 0x1f, 0xf7, 0x8a,
-0x57, 0x9e, 0xa5, 0x96, 0x72, 0xb7, 0x02, 0x32,
-0xeb, 0x07, 0x2b, 0x73, 0xe2, 0x4f, 0x66, 0x58,
-0x9a, 0xeb, 0x0f, 0x07, 0xb6, 0xab, 0x50, 0x8b,
-0xc3, 0x8f, 0x17, 0xfa, 0x0a, 0x99, 0xc2, 0x16,
-0x25, 0xbf, 0x2d, 0x6b, 0x1a, 0xaa, 0xe6, 0x3e,
-0x5f, 0xeb, 0x6d, 0x9b, 0x5d, 0x4d, 0x42, 0x83,
-0x2d, 0x39, 0xb8, 0xc9, 0xac, 0xdb, 0x3a, 0x91,
-0x50, 0xdf, 0xbb, 0xb1, 0x76, 0x6d, 0x15, 0x73,
-0xfd, 0xc6, 0xe6, 0x6b, 0x71, 0x9e, 0x67, 0x36,
-0x22, 0x83, 0x79, 0xb1, 0xd6, 0xb8, 0x84, 0x52,
-0xaf, 0x96, 0x5b, 0xc3, 0x63, 0x02, 0x4e, 0x78,
-0x70, 0x57, 0x02, 0x03, 0x01, 0x00, 0x01, 0x30,
-0x0d, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7,
-0x0d, 0x01, 0x01, 0x0b, 0x05, 0x00, 0x03, 0x82,
-0x01, 0x01, 0x00, 0x24, 0x28, 0xee, 0x22, 0x74,
-0x7f, 0x7c, 0xfa, 0x6c, 0x1f, 0xb3, 0x18, 0xd1,
-0xc2, 0x3d, 0x7d, 0x29, 0x42, 0x88, 0xad, 0x82,
-0xa5, 0xb1, 0x8a, 0x05, 0xd0, 0xec, 0x5c, 0x91,
-0x20, 0xf6, 0x82, 0xfd, 0xd5, 0x67, 0x60, 0x5f,
-0x31, 0xf5, 0xbd, 0x88, 0x91, 0x70, 0xbd, 0xb8,
-0xb9, 0x8c, 0x88, 0xfe, 0x53, 0xc9, 0x54, 0x9b,
-0x43, 0xc4, 0x7a, 0x43, 0x74, 0x6b, 0xdd, 0xb0,
-0xb1, 0x3b, 0x33, 0x45, 0x46, 0x78, 0xa3, 0x1c,
-0xef, 0x54, 0x68, 0xf7, 0x85, 0x9c, 0xe4, 0x51,
-0x6f, 0x06, 0xaf, 0x81, 0xdb, 0x2a, 0x7b, 0x7b,
-0x6f, 0xa8, 0x9c, 0x67, 0xd8, 0xcb, 0xc9, 0x91,
-0x40, 0x00, 0xae, 0xd9, 0xa1, 0x9f, 0xdd, 0xa6,
-0x43, 0x0e, 0x28, 0x7b, 0xaa, 0x1b, 0xe9, 0x84,
-0xdb, 0x76, 0x64, 0x42, 0x70, 0xc9, 0xc0, 0xeb,
-0xae, 0x84, 0x11, 0x16, 0x68, 0x4e, 0x84, 0x9e,
-0x7e, 0x92, 0x36, 0xee, 0x1c, 0x3b, 0x08, 0x63,
-0xeb, 0x79, 0x84, 0x15, 0x08, 0x9d, 0xaf, 0xc8,
-0x9a, 0xc7, 0x34, 0xd3, 0x94, 0x4b, 0xd1, 0x28,
-0x97, 0xbe, 0xd1, 0x45, 0x75, 0xdc, 0x35, 0x62,
-0xac, 0x1d, 0x1f, 0xb7, 0xb7, 0x15, 0x87, 0xc8,
-0x98, 0xc0, 0x24, 0x31, 0x56, 0x8d, 0xed, 0xdb,
-0x06, 0xc6, 0x46, 0xbf, 0x4b, 0x6d, 0xa6, 0xd5,
-0xab, 0xcc, 0x60, 0xfc, 0xe5, 0x37, 0xb6, 0x53,
-0x7d, 0x58, 0x95, 0xa9, 0x56, 0xc7, 0xf7, 0xee,
-0xc3, 0xa0, 0x76, 0xf7, 0x65, 0x4d, 0x53, 0xfa,
-0xff, 0x5f, 0x76, 0x33, 0x5a, 0x08, 0xfa, 0x86,
-0x92, 0x5a, 0x13, 0xfa, 0x1a, 0xfc, 0xf2, 0x1b,
-0x8c, 0x7f, 0x42, 0x6d, 0xb7, 0x7e, 0xb7, 0xb4,
-0xf0, 0xc7, 0x83, 0xbb, 0xa2, 0x81, 0x03, 0x2d,
-0xd4, 0x2a, 0x63, 0x3f, 0xf7, 0x31, 0x2e, 0x40,
-0x33, 0x5c, 0x46, 0xbc, 0x9b, 0xc1, 0x05, 0xa5,
-0x45, 0x4e, 0xc3,