Enable sound SoC on aarch64, Update some ARM patches to latest upstream, small cleanups

39 files changed, 13 insertions, 8 deletions

diff --git a/baseconfig/CONFIG_CM3605 b/baseconfig/CONFIG_CM3605
index be5dca2ea..138742e11 100644
--- a/baseconfig/CONFIG_CM3605
+++ b/baseconfig/CONFIG_CM3605
@@ -1 +1 @@
-# CONFIG_CM3605 is not set
+CONFIG_CM3605=m
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_NAU8540 b/baseconfig/CONFIG_SND_SOC_NAU8540
index 43355fa74..43355fa74 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_NAU8540
+++ b/baseconfig/CONFIG_SND_SOC_NAU8540
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X b/baseconfig/CONFIG_SND_SOC_TAS571X
index 5a0960c0f..5a0960c0f 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X
+++ b/baseconfig/CONFIG_SND_SOC_TAS571X
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO b/baseconfig/arm/CONFIG_LEDS_GPIO
index 65a807afb..65a807afb 100644
--- a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO
+++ b/baseconfig/arm/CONFIG_LEDS_GPIO
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER b/baseconfig/arm/CONFIG_LEDS_GPIO_REGISTER
index 101e4404f..101e4404f 100644
--- a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER
+++ b/baseconfig/arm/CONFIG_LEDS_GPIO_REGISTER
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_PWM b/baseconfig/arm/CONFIG_LEDS_PWM
index fc4cfe6f7..fc4cfe6f7 100644
--- a/baseconfig/arm/armv7/CONFIG_LEDS_PWM
+++ b/baseconfig/arm/CONFIG_LEDS_PWM
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_SYSCON b/baseconfig/arm/CONFIG_LEDS_SYSCON
index c458741b6..c458741b6 100644
--- a/baseconfig/arm/armv7/CONFIG_LEDS_SYSCON
+++ b/baseconfig/arm/CONFIG_LEDS_SYSCON
diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU b/baseconfig/arm/CONFIG_LEDS_TRIGGER_CPU
index b017fb086..b017fb086 100644
--- a/baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU
+++ b/baseconfig/arm/CONFIG_LEDS_TRIGGER_CPU
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC b/baseconfig/arm/CONFIG_SND_SOC_AC97_CODEC
index f2388a7c0..f2388a7c0 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC
+++ b/baseconfig/arm/CONFIG_SND_SOC_AC97_CODEC
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328 b/baseconfig/arm/CONFIG_SND_SOC_ES8328
index 806f698e1..806f698e1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328
+++ b/baseconfig/arm/CONFIG_SND_SOC_ES8328
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C b/baseconfig/arm/CONFIG_SND_SOC_ES8328_I2C
index 9f90cb7e0..9f90cb7e0 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C
+++ b/baseconfig/arm/CONFIG_SND_SOC_ES8328_I2C
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI b/baseconfig/arm/CONFIG_SND_SOC_ES8328_SPI
index 0eb8f755c..0eb8f755c 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI
+++ b/baseconfig/arm/CONFIG_SND_SOC_ES8328_SPI
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC5632 b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_ALC5632
index 63a5d40d0..63a5d40d0 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC5632
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_ALC5632
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_TRIMSLICE
index 23a6b3005..23a6b3005 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_TRIMSLICE
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8903 b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM8903
index ff10de901..ff10de901 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8903
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM8903
diff --git a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM9712 b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM9712
index 3ced427a6..3ced427a6 100644
--- a/baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM9712
+++ b/baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM9712
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E b/baseconfig/arm/CONFIG_SND_SOC_TS3A227E
index 1d3522517..1d3522517 100644
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E
+++ b/baseconfig/arm/CONFIG_SND_SOC_TS3A227E
diff --git a/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER b/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER
new file mode 100644
index 000000000..6d42a47fc
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER
@@ -0,0 +1 @@
+CONFIG_FORCE_MAX_ZONEORDER=13
diff --git a/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC b/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC
new file mode 100644
index 000000000..05e82f2e9
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC
@@ -0,0 +1 @@
+# CONFIG_SND_KIRKWOOD_SOC is not set
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC b/baseconfig/arm/arm64/CONFIG_SND_SOC
deleted file mode 100644
index a161b8e18..000000000
--- a/baseconfig/arm/arm64/CONFIG_SND_SOC
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC is not set
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC b/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC
new file mode 100644
index 000000000..dfe53b84d
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC
@@ -0,0 +1 @@
+CONFIG_SND_SOC_APQ8016_SBC=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM b/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM
new file mode 100644
index 000000000..719eb4e3d
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM
@@ -0,0 +1 @@
+CONFIG_SND_SOC_QCOM=m
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_SGTL5000 b/baseconfig/arm/arm64/CONFIG_SND_SOC_SGTL5000
index ea71dece1..ea71dece1 100644
--- a/baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_SGTL5000
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_SGTL5000
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM b/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM
new file mode 100644
index 000000000..adab3ae82
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_STORM
@@ -0,0 +1 @@
+# CONFIG_SND_SOC_STORM is not set
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA
new file mode 100644
index 000000000..b32a04ff3
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA
@@ -0,0 +1 @@
+CONFIG_SND_SOC_TEGRA=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090
new file mode 100644
index 000000000..55f327a38
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090
@@ -0,0 +1 @@
+CONFIG_SND_SOC_TEGRA_MAX98090=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640
new file mode 100644
index 000000000..3370b8ec2
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640
@@ -0,0 +1 @@
+CONFIG_SND_SOC_TEGRA_RT5640=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677
new file mode 100644
index 000000000..24298d93b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677
@@ -0,0 +1 @@
+CONFIG_SND_SOC_TEGRA_RT5677=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000
new file mode 100644
index 000000000..4706a31c1
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000
@@ -0,0 +1 @@
+CONFIG_SND_SOC_TEGRA_SGTL5000=m
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753 b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753
new file mode 100644
index 000000000..9039b1695
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753
@@ -0,0 +1 @@
+# CONFIG_SND_SOC_TEGRA_WM8753 is not set
diff --git a/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S
new file mode 100644
index 000000000..d9270e25b
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S
@@ -0,0 +1 @@
+CONFIG_SND_SUN4I_I2S=m
diff --git a/baseconfig/arm/CONFIG_FORCE_MAX_ZONEORDER b/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
index bdbd3377f..bdbd3377f 100644
--- a/baseconfig/arm/CONFIG_FORCE_MAX_ZONEORDER
+++ b/baseconfig/arm/armv7/CONFIG_FORCE_MAX_ZONEORDER
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_I2C b/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_I2C
deleted file mode 100644
index 4250a8ff6..000000000
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_I2C
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_ES8328_I2C is not set
diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_SPI b/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_SPI
deleted file mode 100644
index 4a841e5a3..000000000
--- a/baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_SPI
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_ES8328_SPI is not set
diff --git a/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_GPIO b/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_GPIO
deleted file mode 100644
index c45d222a9..000000000
--- a/baseconfig/powerpc/CONFIG_LEDS_TRIGGER_GPIO
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_LEDS_TRIGGER_GPIO=m
diff --git a/baseconfig/x86/CONFIG_SND_SOC_TAS571X b/baseconfig/x86/CONFIG_SND_SOC_TAS571X
deleted file mode 100644
index 5a0960c0f..000000000
--- a/baseconfig/x86/CONFIG_SND_SOC_TAS571X
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_SND_SOC_TAS571X is not set
diff --git a/baseconfig/x86/i686/CONFIG_SND_SOC_TS3A227E b/baseconfig/x86/CONFIG_SND_SOC_TS3A227E
index 1d3522517..1d3522517 100644
--- a/baseconfig/x86/i686/CONFIG_SND_SOC_TS3A227E
+++ b/baseconfig/x86/CONFIG_SND_SOC_TS3A227E
diff --git a/baseconfig/x86/i686PAE/CONFIG_SND_SOC_TS3A227E b/baseconfig/x86/i686PAE/CONFIG_SND_SOC_TS3A227E
deleted file mode 100644
index 1d3522517..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_SND_SOC_TS3A227E
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TS3A227E=m
diff --git a/baseconfig/x86/x86_64/CONFIG_SND_SOC_TS3A227E b/baseconfig/x86/x86_64/CONFIG_SND_SOC_TS3A227E
deleted file mode 100644
index 1d3522517..000000000
--- a/baseconfig/x86/x86_64/CONFIG_SND_SOC_TS3A227E
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_SND_SOC_TS3A227E=m