diff --git a/baseconfig/arm/CONFIG_RADIO_WL128X b/baseconfig/arm/CONFIG_RADIO_WL128X
deleted file mode 100644
index 88b42f8e6..000000000
--- a/baseconfig/arm/CONFIG_RADIO_WL128X
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_RADIO_WL128X=m
diff --git a/baseconfig/arm/CONFIG_TI_ST b/baseconfig/arm/CONFIG_TI_ST
deleted file mode 100644
index e6d0d4428..000000000
--- a/baseconfig/arm/CONFIG_TI_ST
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_TI_ST=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA20_I2S b/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA20_I2S
new file mode 100644
index 000000000..abfe22877
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_SND_SOC_TEGRA20_I2S
@@ -0,0 +1 @@
+CONFIG_SND_SOC_TEGRA20_I2S=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 9cc528648..0eaa71e58 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4270,7 +4270,6 @@ CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
 CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -5636,7 +5635,7 @@ CONFIG_TIPC=m
 CONFIG_TIPC_MEDIA_UDP=y
 # CONFIG_TI_SCI_CLK is not set
 CONFIG_TI_SCI_PROTOCOL=m
-CONFIG_TI_ST=m
+# CONFIG_TI_ST is not set
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TLAN is not set
 CONFIG_TLS=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 151f383ed..47a36a9dc 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4248,7 +4248,6 @@ CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
 CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -5613,7 +5612,7 @@ CONFIG_TIPC=m
 CONFIG_TIPC_MEDIA_UDP=y
 # CONFIG_TI_SCI_CLK is not set
 CONFIG_TI_SCI_PROTOCOL=m
-CONFIG_TI_ST=m
+# CONFIG_TI_ST is not set
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TLAN is not set
 CONFIG_TLS=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index e83a8732a..2f7d9c727 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -4588,7 +4588,6 @@ CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
 CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -6137,7 +6136,7 @@ CONFIG_TI_PIPE3=m
 # CONFIG_TI_SCI_CLK is not set
 CONFIG_TI_SCI_PROTOCOL=m
 CONFIG_TI_SOC_THERMAL=m
-CONFIG_TI_ST=m
+# CONFIG_TI_ST is not set
 CONFIG_TI_THERMAL=y
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TLAN is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index af3e2a1da..caf7f36ed 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4316,7 +4316,6 @@ CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
 CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -5733,7 +5732,7 @@ CONFIG_TIPC_MEDIA_UDP=y
 # CONFIG_TI_SCI_CLK is not set
 CONFIG_TI_SCI_PROTOCOL=m
 CONFIG_TI_SOC_THERMAL=m
-CONFIG_TI_ST=m
+# CONFIG_TI_ST is not set
 CONFIG_TI_THERMAL=y
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TLAN is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 984e00189..c82577254 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4294,7 +4294,6 @@ CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
 CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -5710,7 +5709,7 @@ CONFIG_TIPC_MEDIA_UDP=y
 # CONFIG_TI_SCI_CLK is not set
 CONFIG_TI_SCI_PROTOCOL=m
 CONFIG_TI_SOC_THERMAL=m
-CONFIG_TI_ST=m
+# CONFIG_TI_ST is not set
 CONFIG_TI_THERMAL=y
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TLAN is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 73ff3c694..4a1da02ef 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -4566,7 +4566,6 @@ CONFIG_RADIO_TERRATEC=m
 CONFIG_RADIO_TRUST=m
 CONFIG_RADIO_TYPHOON=m
 CONFIG_RADIO_WL1273=m
-CONFIG_RADIO_WL128X=m
 CONFIG_RADIO_ZOLTRIX=m
 CONFIG_RAID_ATTRS=m
 # CONFIG_RANDOM32_SELFTEST is not set
@@ -6114,7 +6113,7 @@ CONFIG_TI_PIPE3=m
 # CONFIG_TI_SCI_CLK is not set
 CONFIG_TI_SCI_PROTOCOL=m
 CONFIG_TI_SOC_THERMAL=m
-CONFIG_TI_ST=m
+# CONFIG_TI_ST is not set
 CONFIG_TI_THERMAL=y
 # CONFIG_TI_TLC4541 is not set
 # CONFIG_TLAN is not set