From 4768e6b2a1a0afe8fd8325dd110cd7c0b2cae229 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 26 Apr 2017 11:33:46 +0100 Subject: [PATCH] Enable sound SoC on aarch64, Update some ARM patches to latest upstream, small cleanups --- ...option-of-13-for-FORCE_MAX_ZONEORDER.patch | 29 ++++++++++ baseconfig/CONFIG_CM3605 | 2 +- .../{arm/armv7 => }/CONFIG_SND_SOC_NAU8540 | 0 .../{arm/armv7 => }/CONFIG_SND_SOC_TAS571X | 0 baseconfig/arm/{armv7 => }/CONFIG_LEDS_GPIO | 0 .../arm/{armv7 => }/CONFIG_LEDS_GPIO_REGISTER | 0 baseconfig/arm/{armv7 => }/CONFIG_LEDS_PWM | 0 baseconfig/arm/{armv7 => }/CONFIG_LEDS_SYSCON | 0 .../arm/{armv7 => }/CONFIG_LEDS_TRIGGER_CPU | 0 .../arm/{armv7 => }/CONFIG_SND_SOC_AC97_CODEC | 0 .../{armv7/armv7 => }/CONFIG_SND_SOC_ES8328 | 0 .../armv7 => }/CONFIG_SND_SOC_ES8328_I2C | 0 .../armv7 => }/CONFIG_SND_SOC_ES8328_SPI | 0 .../lpae => }/CONFIG_SND_SOC_TEGRA_ALC5632 | 0 .../lpae => }/CONFIG_SND_SOC_TEGRA_TRIMSLICE | 0 .../lpae => }/CONFIG_SND_SOC_TEGRA_WM8903 | 0 .../lpae => }/CONFIG_SND_SOC_TEGRA_WM9712 | 0 .../arm/{armv7 => }/CONFIG_SND_SOC_TS3A227E | 0 .../arm/arm64/CONFIG_FORCE_MAX_ZONEORDER | 1 + baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC | 1 + baseconfig/arm/arm64/CONFIG_SND_SOC | 1 - .../arm/arm64/CONFIG_SND_SOC_APQ8016_SBC | 1 + baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM | 1 + .../armv7 => arm64}/CONFIG_SND_SOC_SGTL5000 | 0 baseconfig/arm/arm64/CONFIG_SND_SOC_STORM | 1 + baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA | 1 + .../arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090 | 1 + .../arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640 | 1 + .../arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677 | 1 + .../arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000 | 1 + .../arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753 | 1 + baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S | 1 + .../{ => armv7}/CONFIG_FORCE_MAX_ZONEORDER | 0 .../arm/armv7/CONFIG_SND_SOC_ES8328_I2C | 1 - .../arm/armv7/CONFIG_SND_SOC_ES8328_SPI | 1 - baseconfig/powerpc/CONFIG_LEDS_TRIGGER_GPIO | 1 - baseconfig/x86/CONFIG_SND_SOC_TAS571X | 1 - .../x86/{i686 => }/CONFIG_SND_SOC_TS3A227E | 0 .../x86/i686PAE/CONFIG_SND_SOC_TS3A227E | 1 - baseconfig/x86/x86_64/CONFIG_SND_SOC_TS3A227E | 1 - bcm2837-initial-support.patch | 54 +++++++------------ kernel-aarch64-debug.config | 41 ++++++++++---- kernel-aarch64.config | 41 ++++++++++---- kernel-armv7hl-debug.config | 2 +- kernel-armv7hl-lpae-debug.config | 8 +-- kernel-armv7hl-lpae.config | 8 +-- kernel-armv7hl.config | 2 +- kernel-i686-PAE.config | 2 +- kernel-i686-PAEdebug.config | 2 +- kernel-i686-debug.config | 2 +- kernel-i686.config | 2 +- kernel-ppc64-debug.config | 4 +- kernel-ppc64.config | 4 +- kernel-ppc64le-debug.config | 4 +- kernel-ppc64le.config | 4 +- kernel-ppc64p7-debug.config | 4 +- kernel-ppc64p7.config | 4 +- kernel-s390x-debug.config | 4 +- kernel-s390x.config | 4 +- kernel-x86_64-debug.config | 2 +- kernel-x86_64.config | 2 +- kernel.spec | 6 +++ 62 files changed, 168 insertions(+), 88 deletions(-) create mode 100644 arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch rename baseconfig/{arm/armv7 => }/CONFIG_SND_SOC_NAU8540 (100%) rename baseconfig/{arm/armv7 => }/CONFIG_SND_SOC_TAS571X (100%) rename baseconfig/arm/{armv7 => }/CONFIG_LEDS_GPIO (100%) rename baseconfig/arm/{armv7 => }/CONFIG_LEDS_GPIO_REGISTER (100%) rename baseconfig/arm/{armv7 => }/CONFIG_LEDS_PWM (100%) rename baseconfig/arm/{armv7 => }/CONFIG_LEDS_SYSCON (100%) rename baseconfig/arm/{armv7 => }/CONFIG_LEDS_TRIGGER_CPU (100%) rename baseconfig/arm/{armv7 => }/CONFIG_SND_SOC_AC97_CODEC (100%) rename baseconfig/arm/{armv7/armv7 => }/CONFIG_SND_SOC_ES8328 (100%) rename baseconfig/arm/{armv7/armv7 => }/CONFIG_SND_SOC_ES8328_I2C (100%) rename baseconfig/arm/{armv7/armv7 => }/CONFIG_SND_SOC_ES8328_SPI (100%) rename baseconfig/arm/{armv7/lpae => }/CONFIG_SND_SOC_TEGRA_ALC5632 (100%) rename baseconfig/arm/{armv7/lpae => }/CONFIG_SND_SOC_TEGRA_TRIMSLICE (100%) rename baseconfig/arm/{armv7/lpae => }/CONFIG_SND_SOC_TEGRA_WM8903 (100%) rename baseconfig/arm/{armv7/lpae => }/CONFIG_SND_SOC_TEGRA_WM9712 (100%) rename baseconfig/arm/{armv7 => }/CONFIG_SND_SOC_TS3A227E (100%) create mode 100644 baseconfig/arm/arm64/CONFIG_FORCE_MAX_ZONEORDER create mode 100644 baseconfig/arm/arm64/CONFIG_SND_KIRKWOOD_SOC delete mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_APQ8016_SBC create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_QCOM rename baseconfig/arm/{armv7/armv7 => arm64}/CONFIG_SND_SOC_SGTL5000 (100%) create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_STORM create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_MAX98090 create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5640 create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_RT5677 create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_SGTL5000 create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SOC_TEGRA_WM8753 create mode 100644 baseconfig/arm/arm64/CONFIG_SND_SUN4I_I2S rename baseconfig/arm/{ => armv7}/CONFIG_FORCE_MAX_ZONEORDER (100%) delete mode 100644 baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_I2C delete mode 100644 baseconfig/arm/armv7/CONFIG_SND_SOC_ES8328_SPI delete mode 100644 baseconfig/powerpc/CONFIG_LEDS_TRIGGER_GPIO delete mode 100644 baseconfig/x86/CONFIG_SND_SOC_TAS571X rename baseconfig/x86/{i686 => }/CONFIG_SND_SOC_TS3A227E (100%) delete mode 100644 baseconfig/x86/i686PAE/CONFIG_SND_SOC_TS3A227E delete mode 100644 baseconfig/x86/x86_64/CONFIG_SND_SOC_TS3A227E diff --git a/arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch b/arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch new file mode 100644 index 000000000..6417bc29a --- /dev/null +++ b/arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch @@ -0,0 +1,29 @@ +From 487ff7b0e537506057960a0c2d9482d19f2acf4a Mon Sep 17 00:00:00 2001 +From: Peter Robinson +Date: Wed, 26 Apr 2017 11:12:54 +0100 +Subject: [PATCH] Add option of 13 for FORCE_MAX_ZONEORDER + +This is a hack, but it's what the other distros currently use +for aarch64 with 4K pages so we'll do the same while upstream +decides what the best outcome is (which isn't this). + +Signed-off-by: Peter Robinson +--- + arch/arm64/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig +index 3741859765cf..deec9511f1d3 100644 +--- a/arch/arm64/Kconfig ++++ b/arch/arm64/Kconfig +@@ -751,6 +751,7 @@ config XEN + config FORCE_MAX_ZONEORDER + int + default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) ++ default "13" if (ARCH_THUNDER && !ARM64_64K_PAGES) + default "12" if (ARM64_16K_PAGES && TRANSPARENT_HUGEPAGE) + default "11" + help +-- +2.12.2 + 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 similarity index 100% rename from baseconfig/arm/armv7/CONFIG_SND_SOC_NAU8540 rename to baseconfig/CONFIG_SND_SOC_NAU8540 diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X b/baseconfig/CONFIG_SND_SOC_TAS571X similarity index 100% rename from baseconfig/arm/armv7/CONFIG_SND_SOC_TAS571X rename to baseconfig/CONFIG_SND_SOC_TAS571X diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO b/baseconfig/arm/CONFIG_LEDS_GPIO similarity index 100% rename from baseconfig/arm/armv7/CONFIG_LEDS_GPIO rename to baseconfig/arm/CONFIG_LEDS_GPIO diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER b/baseconfig/arm/CONFIG_LEDS_GPIO_REGISTER similarity index 100% rename from baseconfig/arm/armv7/CONFIG_LEDS_GPIO_REGISTER rename to baseconfig/arm/CONFIG_LEDS_GPIO_REGISTER diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_PWM b/baseconfig/arm/CONFIG_LEDS_PWM similarity index 100% rename from baseconfig/arm/armv7/CONFIG_LEDS_PWM rename to baseconfig/arm/CONFIG_LEDS_PWM diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_SYSCON b/baseconfig/arm/CONFIG_LEDS_SYSCON similarity index 100% rename from baseconfig/arm/armv7/CONFIG_LEDS_SYSCON rename to baseconfig/arm/CONFIG_LEDS_SYSCON diff --git a/baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU b/baseconfig/arm/CONFIG_LEDS_TRIGGER_CPU similarity index 100% rename from baseconfig/arm/armv7/CONFIG_LEDS_TRIGGER_CPU rename to 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 similarity index 100% rename from baseconfig/arm/armv7/CONFIG_SND_SOC_AC97_CODEC rename to 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 similarity index 100% rename from baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328 rename to 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 similarity index 100% rename from baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_I2C rename to 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 similarity index 100% rename from baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_ES8328_SPI rename to 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 similarity index 100% rename from baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_ALC5632 rename to 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 similarity index 100% rename from baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_TRIMSLICE rename to 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 similarity index 100% rename from baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM8903 rename to 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 similarity index 100% rename from baseconfig/arm/armv7/lpae/CONFIG_SND_SOC_TEGRA_WM9712 rename to baseconfig/arm/CONFIG_SND_SOC_TEGRA_WM9712 diff --git a/baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E b/baseconfig/arm/CONFIG_SND_SOC_TS3A227E similarity index 100% rename from baseconfig/arm/armv7/CONFIG_SND_SOC_TS3A227E rename to 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 similarity index 100% rename from baseconfig/arm/armv7/armv7/CONFIG_SND_SOC_SGTL5000 rename to 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 similarity index 100% rename from baseconfig/arm/CONFIG_FORCE_MAX_ZONEORDER rename to 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 similarity index 100% rename from baseconfig/x86/i686/CONFIG_SND_SOC_TS3A227E rename to 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 diff --git a/bcm2837-initial-support.patch b/bcm2837-initial-support.patch index d18446d2c..0fdd11b96 100644 --- a/bcm2837-initial-support.patch +++ b/bcm2837-initial-support.patch @@ -1,19 +1,19 @@ -From patchwork Wed Feb 8 22:40:24 2017 +From patchwork Tue Apr 25 16:45:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit -Subject: ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v3) +Subject: ARM: dts: Add devicetree for the Raspberry Pi 3, for arm32 (v6) From: Eric Anholt -X-Patchwork-Id: 9563699 -Message-Id: <20170208224024.30415-1-eric@anholt.net> -To: Florian Fainelli , Rob Herring , +X-Patchwork-Id: 9698781 +Message-Id: <20170425164508.32242-1-eric@anholt.net> +To: Lee Jones , Florian Fainelli , + Olof Johansson , Rob Herring , Mark Rutland , devicetree@vger.kernel.org -Cc: Stephen Warren , Lee Jones , - linux-kernel@vger.kernel.org, Eric Anholt , - bcm-kernel-feedback-list@broadcom.com, - linux-rpi-kernel@lists.infradead.org, - linux-arm-kernel@lists.infradead.org, Gerd Hoffmann -Date: Wed, 8 Feb 2017 14:40:24 -0800 +Cc: Stefan Wahren , linux-kernel@vger.kernel.org, + Eric Anholt , bcm-kernel-feedback-list@broadcom.com, + Gerd Hoffmann , linux-arm-kernel@lists.infradead.org, + linux-rpi-kernel@lists.infradead.org +Date: Tue, 25 Apr 2017 09:45:08 -0700 Raspbian and Fedora have decided to support the Pi3 in 32-bit mode for now, so it's useful to be able to test that mode on an upstream @@ -22,25 +22,16 @@ and 64-bit development. Signed-off-by: Eric Anholt --- - -v1: Gerd's patch that put the ../../../arm64/... link in the Makefile -v2: Michael's patch that #included from ../../../arm64/... in a new - bcm2837-rpi-3-b.dts. -v3: Mine, using symlinks to make sure that we don't break the split DT - tree. - arch/arm/boot/dts/Makefile | 1 + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 1 + - arch/arm/boot/dts/bcm2837.dtsi | 1 + - 3 files changed, 3 insertions(+) - create mode 120000 arch/arm/boot/dts/bcm2837-rpi-3-b.dts - create mode 120000 arch/arm/boot/dts/bcm2837.dtsi + 2 files changed, 2 insertions(+) + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 6576e3f000c9..416fdcedf5a1 100644 +index 011808490fed..eded842d9978 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -70,6 +70,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ +@@ -72,6 +72,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \ bcm2835-rpi-b-plus.dtb \ bcm2835-rpi-a-plus.dtb \ bcm2836-rpi-2-b.dtb \ @@ -49,18 +40,9 @@ index 6576e3f000c9..416fdcedf5a1 100644 dtb-$(CONFIG_ARCH_BCM_5301X) += \ bcm4708-asus-rt-ac56u.dtb \ diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts -new file mode 120000 -index 000000000000..ceebc0e163fb +new file mode 100644 +index 000000000000..c72a27d908b6 --- /dev/null +++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts @@ -0,0 +1 @@ -+../../../arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts -\ No newline at end of file -diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi -new file mode 120000 -index 000000000000..53f1cd2bba47 ---- /dev/null -+++ b/arch/arm/boot/dts/bcm2837.dtsi -@@ -0,0 +1 @@ -+../../../arm64/boot/dts/broadcom/bcm2837.dtsi -\ No newline at end of file ++#include "arm64/broadcom/bcm2837-rpi-3-b.dts" diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 8020192da..e2b91c159 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -827,7 +827,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -1573,7 +1573,7 @@ CONFIG_FMC_TRIVIAL=m CONFIG_FMC_WRITE_EEPROM=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m -CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_FORCE_MAX_ZONEORDER=13 # CONFIG_FPGA is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y @@ -2587,7 +2587,8 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLEVO_MAIL=m # CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_DELL_NETBOOKS=m -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO_REGISTER=y # CONFIG_LEDS_IS31FL319X is not set # CONFIG_LEDS_IS31FL32XX is not set # CONFIG_LEDS_KTD2692 is not set @@ -2611,15 +2612,15 @@ CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set -# CONFIG_LEDS_PWM is not set +CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m # CONFIG_LEDS_S3C24XX is not set -# CONFIG_LEDS_SYSCON is not set +CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TLC591XX is not set CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CAMERA=m -# CONFIG_LEDS_TRIGGER_CPU is not set +CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_TRIGGER_GPIO=m @@ -4955,6 +4956,7 @@ CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_ISIGHT=m CONFIG_SND_JACK=y +# CONFIG_SND_KIRKWOOD_SOC is not set CONFIG_SND_KORG1212=m CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m @@ -4995,6 +4997,7 @@ CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m +CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set # CONFIG_SND_SOC_AK4104 is not set @@ -5005,6 +5008,7 @@ CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_ALL_CODECS=m CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_SOC_APQ8016_SBC=m # CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5024,7 +5028,9 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=m -# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set @@ -5039,11 +5045,12 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -5054,6 +5061,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_PCM512x_I2C=m CONFIG_SND_SOC_PCM512x=m CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_ROCKCHIP_I2S=m @@ -5063,7 +5071,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set -# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SGTL5000=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2602_I2C is not set @@ -5072,16 +5080,28 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STA32X is not set # CONFIG_SND_SOC_STA350 is not set # CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_STORM is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TEGRA_ALC5632 is not set +CONFIG_SND_SOC_TEGRA=m +CONFIG_SND_SOC_TEGRA_MAX98090=m +CONFIG_SND_SOC_TEGRA_RT5640=m +CONFIG_SND_SOC_TEGRA_RT5677=m +CONFIG_SND_SOC_TEGRA_SGTL5000=m +# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set +# CONFIG_SND_SOC_TEGRA_WM8753 is not set +# CONFIG_SND_SOC_TEGRA_WM8903 is not set +# CONFIG_SND_SOC_TEGRA_WM9712 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set # CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC31XX is not set # CONFIG_SND_SOC_TLV320AIC3X is not set CONFIG_SND_SOC_TPA6130A2=m -# CONFIG_SND_SOC_TS3A227E is not set +CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8580 is not set @@ -5107,6 +5127,7 @@ CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set CONFIG_SND_SUN4I_CODEC=m +CONFIG_SND_SUN4I_I2S=m CONFIG_SND_SUN4I_SPDIF=m CONFIG_SND_SUN8I_CODEC_ANALOG=m CONFIG_SND_SUN8I_CODEC=m diff --git a/kernel-aarch64.config b/kernel-aarch64.config index 83c8072e0..4cedf372e 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -827,7 +827,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -1556,7 +1556,7 @@ CONFIG_FMC_TRIVIAL=m CONFIG_FMC_WRITE_EEPROM=m # CONFIG_FONTS is not set CONFIG_FORCEDETH=m -CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_FORCE_MAX_ZONEORDER=13 # CONFIG_FPGA is not set CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y @@ -2568,7 +2568,8 @@ CONFIG_LEDS_CLASS=y CONFIG_LEDS_CLEVO_MAIL=m # CONFIG_LEDS_DAC124S085 is not set CONFIG_LEDS_DELL_NETBOOKS=m -# CONFIG_LEDS_GPIO is not set +CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO_REGISTER=y # CONFIG_LEDS_IS31FL319X is not set # CONFIG_LEDS_IS31FL32XX is not set # CONFIG_LEDS_KTD2692 is not set @@ -2592,15 +2593,15 @@ CONFIG_LEDS_NIC78BX=m # CONFIG_LEDS_PCA9532 is not set # CONFIG_LEDS_PCA955X is not set # CONFIG_LEDS_PCA963X is not set -# CONFIG_LEDS_PWM is not set +CONFIG_LEDS_PWM=m CONFIG_LEDS_REGULATOR=m # CONFIG_LEDS_S3C24XX is not set -# CONFIG_LEDS_SYSCON is not set +CONFIG_LEDS_SYSCON=y # CONFIG_LEDS_TCA6507 is not set # CONFIG_LEDS_TLC591XX is not set CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CAMERA=m -# CONFIG_LEDS_TRIGGER_CPU is not set +CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_TRIGGER_GPIO=m @@ -4933,6 +4934,7 @@ CONFIG_SND_INTEL8X0=m CONFIG_SND_INTEL8X0M=m CONFIG_SND_ISIGHT=m CONFIG_SND_JACK=y +# CONFIG_SND_KIRKWOOD_SOC is not set CONFIG_SND_KORG1212=m CONFIG_SND_LAYLA20=m CONFIG_SND_LAYLA24=m @@ -4972,6 +4974,7 @@ CONFIG_SND_SERIAL_U16550=m CONFIG_SND_SIMPLE_CARD=m CONFIG_SND_SIMPLE_SCU_CARD=m CONFIG_SND_SIS7019=m +CONFIG_SND_SOC_AC97_CODEC=m # CONFIG_SND_SOC_ADAU1701 is not set # CONFIG_SND_SOC_ADAU7002 is not set # CONFIG_SND_SOC_AK4104 is not set @@ -4982,6 +4985,7 @@ CONFIG_SND_SIS7019=m # CONFIG_SND_SOC_ALC5623 is not set CONFIG_SND_SOC_ALL_CODECS=m CONFIG_SND_SOC_AMD_ACP=m +CONFIG_SND_SOC_APQ8016_SBC=m # CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631 is not set # CONFIG_SND_SOC_BT_SCO is not set # CONFIG_SND_SOC_CS35L32 is not set @@ -5001,7 +5005,9 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=m -# CONFIG_SND_SOC_ES8328 is not set +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set @@ -5016,11 +5022,12 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_IMX_AUDMUX is not set # CONFIG_SND_SOC_IMX_ES8328 is not set # CONFIG_SND_SOC_INNO_RK3036 is not set -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX98504 is not set # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -5031,6 +5038,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m CONFIG_SND_SOC_PCM512x_I2C=m CONFIG_SND_SOC_PCM512x=m CONFIG_SND_SOC_PCM512x_SPI=m +CONFIG_SND_SOC_QCOM=m CONFIG_SND_SOC_RK3288_HDMI_ANALOG=m CONFIG_SND_SOC_RK3399_GRU_SOUND=m CONFIG_SND_SOC_ROCKCHIP_I2S=m @@ -5040,7 +5048,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m CONFIG_SND_SOC_ROCKCHIP_SPDIF=m # CONFIG_SND_SOC_RT5616 is not set # CONFIG_SND_SOC_RT5631 is not set -# CONFIG_SND_SOC_SGTL5000 is not set +CONFIG_SND_SOC_SGTL5000=m # CONFIG_SND_SOC_SIRF_AUDIO_CODEC is not set CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2602_I2C is not set @@ -5049,16 +5057,28 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STA32X is not set # CONFIG_SND_SOC_STA350 is not set # CONFIG_SND_SOC_STI_SAS is not set +# CONFIG_SND_SOC_STORM is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set +# CONFIG_SND_SOC_TEGRA_ALC5632 is not set +CONFIG_SND_SOC_TEGRA=m +CONFIG_SND_SOC_TEGRA_MAX98090=m +CONFIG_SND_SOC_TEGRA_RT5640=m +CONFIG_SND_SOC_TEGRA_RT5677=m +CONFIG_SND_SOC_TEGRA_SGTL5000=m +# CONFIG_SND_SOC_TEGRA_TRIMSLICE is not set +# CONFIG_SND_SOC_TEGRA_WM8753 is not set +# CONFIG_SND_SOC_TEGRA_WM8903 is not set +# CONFIG_SND_SOC_TEGRA_WM9712 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set # CONFIG_SND_SOC_TLV320AIC23_SPI is not set # CONFIG_SND_SOC_TLV320AIC31XX is not set # CONFIG_SND_SOC_TLV320AIC3X is not set CONFIG_SND_SOC_TPA6130A2=m -# CONFIG_SND_SOC_TS3A227E is not set +CONFIG_SND_SOC_TS3A227E=m # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set # CONFIG_SND_SOC_WM8580 is not set @@ -5084,6 +5104,7 @@ CONFIG_SND_SOC_WM8804_SPI=m CONFIG_SND_SONICVIBES=m # CONFIG_SND_SPI is not set CONFIG_SND_SUN4I_CODEC=m +CONFIG_SND_SUN4I_I2S=m CONFIG_SND_SUN4I_SPDIF=m CONFIG_SND_SUN8I_CODEC_ANALOG=m CONFIG_SND_SUN8I_CODEC=m diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index 8eecd2d9f..718c4837a 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -877,7 +877,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m CONFIG_CM36651=m CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index b0d06be87..98a039144 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -852,7 +852,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -5138,9 +5138,9 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=m -# CONFIG_SND_SOC_ES8328_I2C is not set -# CONFIG_SND_SOC_ES8328 is not set -# CONFIG_SND_SOC_ES8328_SPI is not set +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index f966875ff..5a8cf9c48 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -851,7 +851,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 @@ -5115,9 +5115,9 @@ CONFIG_SND_SOC_CS42L42=m # CONFIG_SND_SOC_CS4349 is not set # CONFIG_SND_SOC_CS53L30 is not set CONFIG_SND_SOC_DMIC=m -# CONFIG_SND_SOC_ES8328_I2C is not set -# CONFIG_SND_SOC_ES8328 is not set -# CONFIG_SND_SOC_ES8328_SPI is not set +CONFIG_SND_SOC_ES8328_I2C=m +CONFIG_SND_SOC_ES8328=m +CONFIG_SND_SOC_ES8328_SPI=m # CONFIG_SND_SOC_FSL_ASOC_CARD is not set # CONFIG_SND_SOC_FSL_ASRC is not set # CONFIG_SND_SOC_FSL_ESAI is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index af1764d58..4d3b2fcff 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -876,7 +876,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m CONFIG_CM36651=m CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config index 30f78e312..4a24bc6a4 100644 --- a/kernel-i686-PAE.config +++ b/kernel-i686-PAE.config @@ -735,7 +735,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_BOOL is not set diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config index 4afb87e89..03e610d3f 100644 --- a/kernel-i686-PAEdebug.config +++ b/kernel-i686-PAEdebug.config @@ -736,7 +736,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_BOOL is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 88ac94c56..2d2ddcf4d 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -736,7 +736,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_BOOL is not set diff --git a/kernel-i686.config b/kernel-i686.config index 5a939da26..2b640d3e3 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -735,7 +735,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_BOOL is not set diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index d33e0c60a..c59901132 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -720,7 +720,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -4652,6 +4652,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4674,6 +4675,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64.config b/kernel-ppc64.config index 7949b0186..af2f8af93 100644 --- a/kernel-ppc64.config +++ b/kernel-ppc64.config @@ -719,7 +719,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -4628,6 +4628,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4650,6 +4651,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index aa2f98cfb..47fadbda3 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -677,7 +677,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -4581,6 +4581,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4603,6 +4604,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index 8501337fa..ebfead87c 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -676,7 +676,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -4557,6 +4557,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4579,6 +4580,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config index b1f69ae94..896b8132b 100644 --- a/kernel-ppc64p7-debug.config +++ b/kernel-ppc64p7-debug.config @@ -677,7 +677,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -4580,6 +4580,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4602,6 +4603,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config index 9977f4a2e..a3cb93cdc 100644 --- a/kernel-ppc64p7.config +++ b/kernel-ppc64p7.config @@ -676,7 +676,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set @@ -4556,6 +4556,7 @@ CONFIG_SND_SOC_HDMI_CODEC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4578,6 +4579,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 05407025a..49c17079c 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -677,7 +677,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_PARTITION is not set @@ -4474,6 +4474,7 @@ CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4496,6 +4497,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-s390x.config b/kernel-s390x.config index de1e04fe0..afaecb425 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -676,7 +676,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set # CONFIG_CMA is not set # CONFIG_CMDLINE_PARTITION is not set @@ -4450,6 +4450,7 @@ CONFIG_SND_SOC=m # CONFIG_SND_SOC_MAX9860 is not set # CONFIG_SND_SOC_MSM8916_WCD_ANALOG is not set # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set +# CONFIG_SND_SOC_NAU8540 is not set # CONFIG_SND_SOC_NAU8810 is not set # CONFIG_SND_SOC_PCM1681 is not set # CONFIG_SND_SOC_PCM179X_I2C is not set @@ -4472,6 +4473,7 @@ CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_STI_SAS is not set # CONFIG_SND_SOC_TAS2552 is not set # CONFIG_SND_SOC_TAS5086 is not set +# CONFIG_SND_SOC_TAS571X is not set # CONFIG_SND_SOC_TAS5720 is not set # CONFIG_SND_SOC_TFA9879 is not set # CONFIG_SND_SOC_TLV320AIC23_I2C is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 3a1cec95a..905bb6af4 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -740,7 +740,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 8f85048ac..4c24a5330 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -739,7 +739,7 @@ CONFIG_CLS_U32_PERF=y CONFIG_CM32181=m # CONFIG_CM3232 is not set # CONFIG_CM3323 is not set -# CONFIG_CM3605 is not set +CONFIG_CM3605=m # CONFIG_CM36651 is not set CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUGFS is not set diff --git a/kernel.spec b/kernel.spec index 933976991..c0069fbe3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -554,6 +554,8 @@ Patch437: bcm283x-hdmi-audio.patch # https://www.spinics.net/lists/arm-kernel/msg554183.html Patch438: arm-imx6-hummingboard2.patch +Patch440: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch + Patch460: lib-cpumask-Make-CPUMASK_OFFSTACK-usable-without-deb.patch Patch466: input-kill-stupid-messages.patch @@ -2181,6 +2183,10 @@ fi # # %changelog +* Wed Apr 26 2017 Peter Robinson +- Enable sound SoC on aarch64 +- Update some ARM patches to latest upstream + * Tue Apr 25 2017 Laura Abbott - 4.11.0-0.rc8.git1.1 - Linux v4.11-rc8-14-g8f9cedc