summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2017-09-11 19:17:30 +0100
committerPeter Robinson <pbrobinson@gmail.com>2017-09-11 19:17:30 +0100
commit27e72a600eab71a85d45600314ff789e99fc6c6d (patch)
tree0e353767cf7e0450c529377e6cd874ae0a3d133d
parent21e4b83380d4419b3d5c2ce01553807b3dcd2321 (diff)
downloadkernel-27e72a600eab71a85d45600314ff789e99fc6c6d.tar.gz
kernel-27e72a600eab71a85d45600314ff789e99fc6c6d.tar.xz
kernel-27e72a600eab71a85d45600314ff789e99fc6c6d.zip
Raspberry Pi serial console fixes, minor other Pi improvements, Various ARM cleanups, build mmc/pwrseq non modular
-rw-r--r--Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch105
-rw-r--r--baseconfig/CONFIG_MMC_SDHCI_OF1
-rw-r--r--baseconfig/CONFIG_PWRSEQ_SD87872
-rw-r--r--baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE1
-rw-r--r--baseconfig/arm/CONFIG_MMC1
-rw-r--r--baseconfig/arm/CONFIG_MMC_QCOM_DML1
-rw-r--r--baseconfig/arm/CONFIG_PWRSEQ_EMMC1
-rw-r--r--baseconfig/arm/CONFIG_PWRSEQ_SIMPLE1
-rw-r--r--baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML1
-rw-r--r--baseconfig/arm/armv7/CONFIG_CRYPTO_GHASH_ARM_CE1
-rw-r--r--baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI (renamed from baseconfig/arm/CONFIG_DRM_SUN4I_HDMI)0
-rw-r--r--baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM not set1
-rw-r--r--baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC1
-rw-r--r--baseconfig/powerpc/CONFIG_MMC_SDHCI_OF1
-rw-r--r--baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK (renamed from baseconfig/powerpc/CONFIG_ADB_PMU_LED_DISK)0
-rw-r--r--baseconfig/x86/i686/CONFIG_MMC_SDHCI_OF1
-rw-r--r--baseconfig/x86/i686PAE/CONFIG_MMC_SDHCI_OF1
-rw-r--r--bcm2837-bluetooth-support.patch86
-rw-r--r--kernel-aarch64-debug.config13
-rw-r--r--kernel-aarch64.config13
-rw-r--r--kernel-armv7hl-debug.config13
-rw-r--r--kernel-armv7hl-lpae-debug.config12
-rw-r--r--kernel-armv7hl-lpae.config12
-rw-r--r--kernel-armv7hl.config13
-rw-r--r--kernel-i686-PAE.config3
-rw-r--r--kernel-i686-PAEdebug.config3
-rw-r--r--kernel-i686-debug.config3
-rw-r--r--kernel-i686.config3
-rw-r--r--kernel-ppc64-debug.config3
-rw-r--r--kernel-ppc64.config3
-rw-r--r--kernel-ppc64le-debug.config4
-rw-r--r--kernel-ppc64le.config4
-rw-r--r--kernel-ppc64p7-debug.config4
-rw-r--r--kernel-ppc64p7.config4
-rw-r--r--kernel-s390x-debug.config3
-rw-r--r--kernel-s390x.config3
-rw-r--r--kernel-x86_64-debug.config3
-rw-r--r--kernel-x86_64.config3
-rw-r--r--kernel.spec10
39 files changed, 148 insertions, 190 deletions
diff --git a/Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch b/Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch
deleted file mode 100644
index 235c39162..000000000
--- a/Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 7d9e74c53a4376245b4f05006f42184a1540dee8 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Tue, 18 Jul 2017 23:21:50 +0100
-Subject: [PATCH] Revert "ARM: dts: bcm2835: Add the DSI module nodes and
- clocks."
-
-This reverts commit 4aba4cf820545ca8ec23785c7bac40bba7e505c5.
----
- arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 -------
- arch/arm/boot/dts/bcm283x.dtsi | 48 +++-----------------------------------
- 2 files changed, 3 insertions(+), 53 deletions(-)
-
-diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index a7b5ce133784..e99bb149065f 100644
---- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
-+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-@@ -98,11 +98,3 @@
- power-domains = <&power RPI_POWER_DOMAIN_VEC>;
- status = "okay";
- };
--
--&dsi0 {
-- power-domains = <&power RPI_POWER_DOMAIN_DSI0>;
--};
--
--&dsi1 {
-- power-domains = <&power RPI_POWER_DOMAIN_DSI1>;
--};
-diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 9444a9a9ba10..ce14c9ddf574 100644
---- a/arch/arm/boot/dts/bcm283x.dtsi
-+++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -98,13 +98,10 @@
- #clock-cells = <1>;
- reg = <0x7e101000 0x2000>;
-
-- /* CPRMAN derives almost everything from the
-- * platform's oscillator. However, the DSI
-- * pixel clocks come from the DSI analog PHY.
-+ /* CPRMAN derives everything from the platform's
-+ * oscillator.
- */
-- clocks = <&clk_osc>,
-- <&dsi0 0>, <&dsi0 1>, <&dsi0 2>,
-- <&dsi1 0>, <&dsi1 1>, <&dsi1 2>;
-+ clocks = <&clk_osc>;
- };
-
- rng@7e104000 {
-@@ -412,25 +409,6 @@
- interrupts = <2 14>; /* pwa1 */
- };
-
-- dsi0: dsi@7e209000 {
-- compatible = "brcm,bcm2835-dsi0";
-- reg = <0x7e209000 0x78>;
-- interrupts = <2 4>;
-- #address-cells = <1>;
-- #size-cells = <0>;
-- #clock-cells = <1>;
--
-- clocks = <&clocks BCM2835_PLLA_DSI0>,
-- <&clocks BCM2835_CLOCK_DSI0E>,
-- <&clocks BCM2835_CLOCK_DSI0P>;
-- clock-names = "phy", "escape", "pixel";
--
-- clock-output-names = "dsi0_byte",
-- "dsi0_ddr2",
-- "dsi0_ddr";
--
-- };
--
- thermal: thermal@7e212000 {
- compatible = "brcm,bcm2835-thermal";
- reg = <0x7e212000 0x8>;
-@@ -497,26 +475,6 @@
- interrupts = <2 1>;
- };
-
-- dsi1: dsi@7e700000 {
-- compatible = "brcm,bcm2835-dsi1";
-- reg = <0x7e700000 0x8c>;
-- interrupts = <2 12>;
-- #address-cells = <1>;
-- #size-cells = <0>;
-- #clock-cells = <1>;
--
-- clocks = <&clocks BCM2835_PLLD_DSI1>,
-- <&clocks BCM2835_CLOCK_DSI1E>,
-- <&clocks BCM2835_CLOCK_DSI1P>;
-- clock-names = "phy", "escape", "pixel";
--
-- clock-output-names = "dsi1_byte",
-- "dsi1_ddr2",
-- "dsi1_ddr";
--
-- status = "disabled";
-- };
--
- i2c1: i2c@7e804000 {
- compatible = "brcm,bcm2835-i2c";
- reg = <0x7e804000 0x1000>;
---
-2.13.3
-
diff --git a/baseconfig/CONFIG_MMC_SDHCI_OF b/baseconfig/CONFIG_MMC_SDHCI_OF
deleted file mode 100644
index 2e588649a..000000000
--- a/baseconfig/CONFIG_MMC_SDHCI_OF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MMC_SDHCI_OF is not set
diff --git a/baseconfig/CONFIG_PWRSEQ_SD8787 b/baseconfig/CONFIG_PWRSEQ_SD8787
index 243dba034..820984327 100644
--- a/baseconfig/CONFIG_PWRSEQ_SD8787
+++ b/baseconfig/CONFIG_PWRSEQ_SD8787
@@ -1 +1 @@
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
diff --git a/baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE b/baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE
new file mode 100644
index 000000000..5c70cb19a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_CRYPTO_GHASH_ARM_CE
@@ -0,0 +1 @@
+CONFIG_CRYPTO_GHASH_ARM_CE=m
diff --git a/baseconfig/arm/CONFIG_MMC b/baseconfig/arm/CONFIG_MMC
new file mode 100644
index 000000000..7c2be178c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MMC
@@ -0,0 +1 @@
+CONFIG_MMC=y
diff --git a/baseconfig/arm/CONFIG_MMC_QCOM_DML b/baseconfig/arm/CONFIG_MMC_QCOM_DML
deleted file mode 100644
index 11f7e7eba..000000000
--- a/baseconfig/arm/CONFIG_MMC_QCOM_DML
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MMC_QCOM_DML is not set
diff --git a/baseconfig/arm/CONFIG_PWRSEQ_EMMC b/baseconfig/arm/CONFIG_PWRSEQ_EMMC
new file mode 100644
index 000000000..29e883d93
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PWRSEQ_EMMC
@@ -0,0 +1 @@
+CONFIG_PWRSEQ_EMMC=y
diff --git a/baseconfig/arm/CONFIG_PWRSEQ_SIMPLE b/baseconfig/arm/CONFIG_PWRSEQ_SIMPLE
new file mode 100644
index 000000000..7c8ad9b8a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PWRSEQ_SIMPLE
@@ -0,0 +1 @@
+CONFIG_PWRSEQ_SIMPLE=y
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML b/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML
new file mode 100644
index 000000000..48facf367
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MMC_QCOM_DML
@@ -0,0 +1 @@
+CONFIG_MMC_QCOM_DML=y
diff --git a/baseconfig/arm/armv7/CONFIG_CRYPTO_GHASH_ARM_CE b/baseconfig/arm/armv7/CONFIG_CRYPTO_GHASH_ARM_CE
deleted file mode 100644
index e2ffa82ef..000000000
--- a/baseconfig/arm/armv7/CONFIG_CRYPTO_GHASH_ARM_CE
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
diff --git a/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI
index cda1f60f8..cda1f60f8 100644
--- a/baseconfig/arm/CONFIG_DRM_SUN4I_HDMI
+++ b/baseconfig/arm/armv7/CONFIG_DRM_SUN4I_HDMI
diff --git a/baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM not set b/baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM not set
deleted file mode 100644
index d161874fe..000000000
--- a/baseconfig/arm/armv7/CONFIG_EXYNOS5420_MCPM not set
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_EXYNOS5420_MCPM not set
diff --git a/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC
new file mode 100644
index 000000000..40e2f68cb
--- /dev/null
+++ b/baseconfig/arm/armv7/armv7/CONFIG_MMC_SDHCI_OF_ESDHC
@@ -0,0 +1 @@
+CONFIG_MMC_SDHCI_OF_ESDHC=m
diff --git a/baseconfig/powerpc/CONFIG_MMC_SDHCI_OF b/baseconfig/powerpc/CONFIG_MMC_SDHCI_OF
deleted file mode 100644
index d2e2790aa..000000000
--- a/baseconfig/powerpc/CONFIG_MMC_SDHCI_OF
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MMC_SDHCI_OF=m
diff --git a/baseconfig/powerpc/CONFIG_ADB_PMU_LED_DISK b/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK
index 74be3ced5..74be3ced5 100644
--- a/baseconfig/powerpc/CONFIG_ADB_PMU_LED_DISK
+++ b/baseconfig/powerpc/powerpc64/CONFIG_ADB_PMU_LED_DISK
diff --git a/baseconfig/x86/i686/CONFIG_MMC_SDHCI_OF b/baseconfig/x86/i686/CONFIG_MMC_SDHCI_OF
deleted file mode 100644
index 2e588649a..000000000
--- a/baseconfig/x86/i686/CONFIG_MMC_SDHCI_OF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MMC_SDHCI_OF is not set
diff --git a/baseconfig/x86/i686PAE/CONFIG_MMC_SDHCI_OF b/baseconfig/x86/i686PAE/CONFIG_MMC_SDHCI_OF
deleted file mode 100644
index 2e588649a..000000000
--- a/baseconfig/x86/i686PAE/CONFIG_MMC_SDHCI_OF
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_MMC_SDHCI_OF is not set
diff --git a/bcm2837-bluetooth-support.patch b/bcm2837-bluetooth-support.patch
new file mode 100644
index 000000000..3f57583db
--- /dev/null
+++ b/bcm2837-bluetooth-support.patch
@@ -0,0 +1,86 @@
+From a92507095467d77f4fd05f54ae8d299459c2c3a3 Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sun, 10 Sep 2017 19:29:23 +0100
+Subject: [PATCH 1/2] ARM: dts: bcm283x: Use stdout-path instead of console
+ bootarg
+
+Add the serial port config to "chosen/stdout-path".
+Create serial0/1 aliases referring to uart0 ant uart1 paths.
+Remove unneeded earlyprintk.
+
+Signed-off-by: Loic Poulain <loic.poulain@xxxxxxxxx>
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ arch/arm/boot/dts/bcm283x.dtsi | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
+index 431dcfc900c0..013431e3d7c3 100644
+--- a/arch/arm/boot/dts/bcm283x.dtsi
++++ b/arch/arm/boot/dts/bcm283x.dtsi
+@@ -20,8 +20,13 @@
+ #address-cells = <1>;
+ #size-cells = <1>;
+
++ aliases {
++ serial0 = &uart0;
++ serial1 = &uart1;
++ };
++
+ chosen {
+- bootargs = "earlyprintk console=ttyAMA0";
++ stdout-path = "serial0:115200n8";
+ };
+
+ thermal-zones {
+--
+2.13.5
+
+From 50252c318fe2fcfcbd0832fa835e7fd1fafd7d2d Mon Sep 17 00:00:00 2001
+From: Peter Robinson <pbrobinson@gmail.com>
+Date: Sun, 10 Sep 2017 19:30:02 +0100
+Subject: [PATCH 2/2] ARM: dts: bcm2837-rpi-3-b: Add bcm43438 serial slave
+
+Add BCM43438 (bluetooth) as a slave device of uart0 (pl011/ttyAMA0).
+This allows to automatically insert the bcm43438 to the bluetooth
+subsystem instead of relying on userspace helpers (hciattach).
+
+Overwrite chosen/stdout-path to use 8250 aux uart as console.
+
+Signed-off-by: Loic Poulain <loic.poulain@xxxxxxxxx>
+Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
+---
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+index 20725ca487f3..e4488cb3067e 100644
+--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+@@ -8,6 +8,11 @@
+ compatible = "raspberrypi,3-model-b", "brcm,bcm2837";
+ model = "Raspberry Pi 3 Model B";
+
++ chosen {
++ /* 8250 auxiliar UART instead of pl011 */
++ stdout-path = "serial1:115200n8";
++ };
++
+ memory {
+ reg = <0 0x40000000>;
+ };
+@@ -24,6 +29,11 @@
+ pinctrl-names = "default";
+ pinctrl-0 = <&uart0_gpio32 &gpclk2_gpio43>;
+ status = "okay";
++
++ bluetooth {
++ compatible = "brcm,bcm43438-bt";
++ max-speed = <2000000>;
++ };
+ };
+
+ /* uart1 is mapped to the pin header */
+--
+2.13.5
+
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index d5af292ab..69327ce34 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1024,6 +1024,7 @@ CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GF128MUL=y
CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM_CE=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
@@ -1330,7 +1331,6 @@ CONFIG_DRM_SIL_SII8620=m
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_STM is not set
CONFIG_DRM_SUN4I_BACKEND=m
-CONFIG_DRM_SUN4I_HDMI=m
CONFIG_DRM_SUN8I_MIXER=m
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_TEGRA_DEBUG is not set
@@ -3131,11 +3131,10 @@ CONFIG_MMC_DW=m
CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC=m
CONFIG_MMC_MESON_GX=m
# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
-# CONFIG_MMC_QCOM_DML is not set
+CONFIG_MMC_QCOM_DML=y
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3148,7 +3147,6 @@ CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_PXAV3=m
@@ -3165,6 +3163,7 @@ CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_WBSD=m
+CONFIG_MMC=y
CONFIG_MMIOTRACE=y
CONFIG_MMU=y
# CONFIG_MODULE_COMPRESS is not set
@@ -4210,9 +4209,9 @@ CONFIG_PWM_SUN4I=m
CONFIG_PWM_SYSFS=y
CONFIG_PWM_TEGRA=m
CONFIG_PWM=y
-CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=y
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
# CONFIG_QCA7000_UART is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 22d833528..69ddd0309 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -1023,6 +1023,7 @@ CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GF128MUL=y
CONFIG_CRYPTO_GHASH_ARM64_CE=m
+CONFIG_CRYPTO_GHASH_ARM_CE=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
@@ -1320,7 +1321,6 @@ CONFIG_DRM_SIL_SII8620=m
# CONFIG_DRM_SIS is not set
# CONFIG_DRM_STM is not set
CONFIG_DRM_SUN4I_BACKEND=m
-CONFIG_DRM_SUN4I_HDMI=m
CONFIG_DRM_SUN8I_MIXER=m
# CONFIG_DRM_TDFX is not set
# CONFIG_DRM_TEGRA_DEBUG is not set
@@ -3111,11 +3111,10 @@ CONFIG_MMC_DW=m
CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC=m
CONFIG_MMC_MESON_GX=m
# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
-# CONFIG_MMC_QCOM_DML is not set
+CONFIG_MMC_QCOM_DML=y
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3128,7 +3127,6 @@ CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_PXAV3=m
@@ -3145,6 +3143,7 @@ CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_WBSD=m
+CONFIG_MMC=y
CONFIG_MMU=y
# CONFIG_MODULE_COMPRESS is not set
# CONFIG_MODULE_FORCE_LOAD is not set
@@ -4188,9 +4187,9 @@ CONFIG_PWM_SUN4I=m
CONFIG_PWM_SYSFS=y
CONFIG_PWM_TEGRA=m
CONFIG_PWM=y
-CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=y
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
# CONFIG_QCA7000_UART is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index a0111561a..f76e02ec8 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1078,7 +1078,7 @@ CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GF128MUL=y
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+CONFIG_CRYPTO_GHASH_ARM_CE=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
@@ -3333,7 +3333,6 @@ CONFIG_MMC_DW=m
CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC=m
# CONFIG_MMC_MESON_GX is not set
# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
@@ -3354,8 +3353,7 @@ CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_PXAV2=m
@@ -3377,6 +3375,7 @@ CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_WBSD=m
+CONFIG_MMC=y
CONFIG_MMIOTRACE=y
CONFIG_MMP_PDMA=y
CONFIG_MMP_TDMA=y
@@ -4531,9 +4530,9 @@ CONFIG_PWM_TIPWMSS=y
CONFIG_PWM_TWL_LED=m
CONFIG_PWM_TWL=m
CONFIG_PWM=y
-CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=y
CONFIG_PXA_DMA=y
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index c17711cb0..cf5dd219b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1026,7 +1026,7 @@ CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GF128MUL=y
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+CONFIG_CRYPTO_GHASH_ARM_CE=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
@@ -3185,12 +3185,10 @@ CONFIG_MMC_DW=m
CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC=m
# CONFIG_MMC_MESON_GX is not set
# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
CONFIG_MMC_OMAP_HS=m
-# CONFIG_MMC_QCOM_DML is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3203,7 +3201,6 @@ CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_PXAV3=m
@@ -3223,6 +3220,7 @@ CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_WBSD=m
+CONFIG_MMC=y
CONFIG_MMIOTRACE=y
CONFIG_MMU=y
# CONFIG_MODULE_COMPRESS is not set
@@ -4280,9 +4278,9 @@ CONFIG_PWM_SUN4I=m
CONFIG_PWM_SYSFS=y
CONFIG_PWM_TEGRA=m
CONFIG_PWM=y
-CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=y
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
# CONFIG_QCA7000_UART is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0ea4179f6..6593c07c5 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -1024,7 +1024,7 @@ CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GF128MUL=y
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+CONFIG_CRYPTO_GHASH_ARM_CE=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
@@ -3165,12 +3165,10 @@ CONFIG_MMC_DW=m
CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC=m
# CONFIG_MMC_MESON_GX is not set
# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
CONFIG_MMC_OMAP_HS=m
-# CONFIG_MMC_QCOM_DML is not set
CONFIG_MMC_REALTEK_PCI=m
CONFIG_MMC_REALTEK_USB=m
CONFIG_MMC_RICOH_MMC=y
@@ -3183,7 +3181,6 @@ CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_PXAV3=m
@@ -3203,6 +3200,7 @@ CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_WBSD=m
+CONFIG_MMC=y
CONFIG_MMU=y
# CONFIG_MODULE_COMPRESS is not set
# CONFIG_MODULE_FORCE_LOAD is not set
@@ -4258,9 +4256,9 @@ CONFIG_PWM_SUN4I=m
CONFIG_PWM_SYSFS=y
CONFIG_PWM_TEGRA=m
CONFIG_PWM=y
-CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=y
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
# CONFIG_QCA7000_UART is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 3480c6d15..29ff65b8c 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -1076,7 +1076,7 @@ CONFIG_CRYPTO_FCRYPT=m
CONFIG_CRYPTO_FIPS=y
CONFIG_CRYPTO_GCM=m
CONFIG_CRYPTO_GF128MUL=y
-# CONFIG_CRYPTO_GHASH_ARM_CE is not set
+CONFIG_CRYPTO_GHASH_ARM_CE=m
CONFIG_CRYPTO_GHASH=m
CONFIG_CRYPTO_HMAC=y
CONFIG_CRYPTO_HW=y
@@ -3313,7 +3313,6 @@ CONFIG_MMC_DW=m
CONFIG_MMC_DW_PCI=m
CONFIG_MMC_DW_PLTFM=m
CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC=m
# CONFIG_MMC_MESON_GX is not set
# CONFIG_MMC_MTK is not set
CONFIG_MMC_MVSDIO=m
@@ -3334,8 +3333,7 @@ CONFIG_MMC_SDHCI=m
CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_SDHCI_OF_ARASAN=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
-# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
+CONFIG_MMC_SDHCI_OF_ESDHC=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_PXAV2=m
@@ -3357,6 +3355,7 @@ CONFIG_MMC_USHC=m
CONFIG_MMC_VIA_SDMMC=m
CONFIG_MMC_VUB300=m
CONFIG_MMC_WBSD=m
+CONFIG_MMC=y
CONFIG_MMP_PDMA=y
CONFIG_MMP_TDMA=y
CONFIG_MMU=y
@@ -4509,9 +4508,9 @@ CONFIG_PWM_TIPWMSS=y
CONFIG_PWM_TWL_LED=m
CONFIG_PWM_TWL=m
CONFIG_PWM=y
-CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
-CONFIG_PWRSEQ_SIMPLE=m
+CONFIG_PWRSEQ_EMMC=y
+CONFIG_PWRSEQ_SD8787=m
+CONFIG_PWRSEQ_SIMPLE=y
CONFIG_PXA_DMA=y
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 798bd6292..392fd9f2f 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -3026,7 +3026,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -4035,7 +4034,7 @@ CONFIG_PWM_LPSS_PLATFORM=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index b1db7c7fd..4b5e4f37d 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -3046,7 +3046,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -4056,7 +4055,7 @@ CONFIG_PWM_LPSS_PLATFORM=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index ada04656a..9d7808e34 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3046,7 +3046,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -4056,7 +4055,7 @@ CONFIG_PWM_LPSS_PLATFORM=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index 1d2538336..4a3bcfa3c 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3026,7 +3026,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -4035,7 +4034,7 @@ CONFIG_PWM_LPSS_PLATFORM=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index 4042ba2d5..2ed9e936a 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2887,7 +2887,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
# CONFIG_MMC_SDHCI_OF_HLWD is not set
-CONFIG_MMC_SDHCI_OF=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -3870,7 +3869,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index ac0201de7..87631d0a8 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2866,7 +2866,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
# CONFIG_MMC_SDHCI_OF_HLWD is not set
-CONFIG_MMC_SDHCI_OF=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -3847,7 +3846,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 52999a8de..9d32a0b6e 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -92,7 +92,6 @@ CONFIG_AD7766=m
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADB_PMU_LED_DISK=y
# CONFIG_ADE7753 is not set
# CONFIG_ADE7754 is not set
# CONFIG_ADE7758 is not set
@@ -2833,7 +2832,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
# CONFIG_MMC_SDHCI_OF_HLWD is not set
-CONFIG_MMC_SDHCI_OF=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -3810,7 +3808,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index 17204633b..5f1d889a7 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -92,7 +92,6 @@ CONFIG_AD7766=m
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADB_PMU_LED_DISK=y
# CONFIG_ADE7753 is not set
# CONFIG_ADE7754 is not set
# CONFIG_ADE7758 is not set
@@ -2812,7 +2811,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
# CONFIG_MMC_SDHCI_OF_HLWD is not set
-CONFIG_MMC_SDHCI_OF=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -3787,7 +3785,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index fe9581075..37e9e2b46 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -92,7 +92,6 @@ CONFIG_AD7766=m
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADB_PMU_LED_DISK=y
# CONFIG_ADE7753 is not set
# CONFIG_ADE7754 is not set
# CONFIG_ADE7758 is not set
@@ -2832,7 +2831,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
# CONFIG_MMC_SDHCI_OF_HLWD is not set
-CONFIG_MMC_SDHCI_OF=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -3809,7 +3807,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index c7558a6b8..bee9d15be 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -92,7 +92,6 @@ CONFIG_AD7766=m
# CONFIG_AD9832 is not set
# CONFIG_AD9834 is not set
CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_ADB_PMU_LED_DISK=y
# CONFIG_ADE7753 is not set
# CONFIG_ADE7754 is not set
# CONFIG_ADE7758 is not set
@@ -2811,7 +2810,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
# CONFIG_MMC_SDHCI_OF_HLWD is not set
-CONFIG_MMC_SDHCI_OF=m
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -3786,7 +3784,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index e3f0f23f2..a53549703 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2772,7 +2772,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -3699,7 +3698,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM is not set
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 5fa7c8333..b216e689e 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2751,7 +2751,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -3676,7 +3675,7 @@ CONFIG_PWM_HIBVT=m
# CONFIG_PWM is not set
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index f407e4b7c..2383f778c 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3097,7 +3097,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -4097,7 +4096,7 @@ CONFIG_PWM_LPSS_PLATFORM=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index e1562e1e6..5790b9f29 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3077,7 +3077,6 @@ CONFIG_MMC_SDHCI=m
# CONFIG_MMC_SDHCI_OF_ARASAN is not set
# CONFIG_MMC_SDHCI_OF_AT91 is not set
# CONFIG_MMC_SDHCI_OF_ESDHC is not set
-# CONFIG_MMC_SDHCI_OF is not set
CONFIG_MMC_SDHCI_PCI=m
CONFIG_MMC_SDHCI_PLTFM=m
CONFIG_MMC_SDHCI_XENON=m
@@ -4076,7 +4075,7 @@ CONFIG_PWM_LPSS_PLATFORM=m
# CONFIG_PWM_PCA9685 is not set
CONFIG_PWM=y
CONFIG_PWRSEQ_EMMC=m
-# CONFIG_PWRSEQ_SD8787 is not set
+CONFIG_PWRSEQ_SD8787=m
CONFIG_PWRSEQ_SIMPLE=m
# CONFIG_QCA7000 is not set
# CONFIG_QCA7000_SPI is not set
diff --git a/kernel.spec b/kernel.spec
index 392f1a94f..f7a466ae3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -614,9 +614,9 @@ Patch320: bcm283x-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO
# Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/
Patch321: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch
-# This breaks RPi booting with a LPAE kernel, we don't support the DSI ports currently
-# Revert it while I engage upstream to work out what's going on
-Patch322: Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch
+# bcm2837 bluetooth support
+#
+Patch323: bcm2837-bluetooth-support.patch
# 400 - IBM (ppc/s390x) patches
@@ -2189,6 +2189,10 @@ fi
#
#
%changelog
+* Mon Sep 11 2017 Peter Robinson <pbrobinson@fedoraproject.org>
+- Raspberry Pi serial console fixes, minor other Pi improvements
+- Various ARM cleanups, build mmc/pwrseq non modular
+
* Mon Sep 11 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc0.git4.1
- Linux v4.13-11197-gf007cad159e9