From: Greg Kroah-Hartman Date: Mon, 11 Mar 2019 22:19:07 +0000 (-0700) Subject: 5.0-stable patches X-Git-Tag: v5.0.2~30 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88e13812628ff06fc74cb283f431dfad418cf598;p=thirdparty%2Fkernel%2Fstable-queue.git 5.0-stable patches added patches: arm-dts-exynos-add-minimal-clkout-parameters-to-exynos3250-pmu.patch arm-dts-exynos-fix-max-voltage-for-buck8-regulator-on-odroid-xu3-xu4.patch arm-dts-exynos-fix-pinctrl-definition-for-emmc-rtsn-line-on-odroid-x2-u3.patch arm64-dts-hikey-give-wifi-some-time-after-power-on.patch arm64-dts-hikey-revert-enable-hs200-mode-on-emmc.patch arm64-dts-zcu100-revc-give-wifi-some-time-after-power-on.patch --- diff --git a/queue-5.0/arm-dts-exynos-add-minimal-clkout-parameters-to-exynos3250-pmu.patch b/queue-5.0/arm-dts-exynos-add-minimal-clkout-parameters-to-exynos3250-pmu.patch new file mode 100644 index 00000000000..bf84ee2e651 --- /dev/null +++ b/queue-5.0/arm-dts-exynos-add-minimal-clkout-parameters-to-exynos3250-pmu.patch @@ -0,0 +1,36 @@ +From a66352e005488ecb4b534ba1af58a9f671eba9b8 Mon Sep 17 00:00:00 2001 +From: Marek Szyprowski +Date: Fri, 15 Feb 2019 11:36:50 +0100 +Subject: ARM: dts: exynos: Add minimal clkout parameters to Exynos3250 PMU + +From: Marek Szyprowski + +commit a66352e005488ecb4b534ba1af58a9f671eba9b8 upstream. + +Add minimal parameters needed by the Exynos CLKOUT driver to Exynos3250 +PMU node. This fixes the following warning on boot: + +exynos_clkout_init: failed to register clkout clock + +Fixes: d19bb397e19e ("ARM: dts: exynos: Update PMU node with CLKOUT related data") +Cc: +Signed-off-by: Marek Szyprowski +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/exynos3250.dtsi | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/arch/arm/boot/dts/exynos3250.dtsi ++++ b/arch/arm/boot/dts/exynos3250.dtsi +@@ -168,6 +168,9 @@ + interrupt-controller; + #interrupt-cells = <3>; + interrupt-parent = <&gic>; ++ clock-names = "clkout8"; ++ clocks = <&cmu CLK_FIN_PLL>; ++ #clock-cells = <1>; + }; + + mipi_phy: video-phy { diff --git a/queue-5.0/arm-dts-exynos-fix-max-voltage-for-buck8-regulator-on-odroid-xu3-xu4.patch b/queue-5.0/arm-dts-exynos-fix-max-voltage-for-buck8-regulator-on-odroid-xu3-xu4.patch new file mode 100644 index 00000000000..795609c3d83 --- /dev/null +++ b/queue-5.0/arm-dts-exynos-fix-max-voltage-for-buck8-regulator-on-odroid-xu3-xu4.patch @@ -0,0 +1,44 @@ +From a3238924a820c1d7c977b632b769f3b5690cba09 Mon Sep 17 00:00:00 2001 +From: Marek Szyprowski +Date: Mon, 25 Feb 2019 19:42:52 +0100 +Subject: ARM: dts: exynos: Fix max voltage for buck8 regulator on Odroid XU3/XU4 + +From: Marek Szyprowski + +commit a3238924a820c1d7c977b632b769f3b5690cba09 upstream. + +The maximum voltage value for buck8 regulator on Odroid XU3/XU4 boards is +set too low. Increase it to the 2000mV as specified on the board schematic. +So far the board worked fine, because of the bug in the PMIC driver, which +used incorrect step value for that regulator. It interpreted the voltage +value set by the bootloader as 1225mV and kept it unchanged. The regulator +driver has been however fixed recently in the commit 56b5d4ea778c +("regulator: s2mps11: Fix steps for buck7, buck8 and LDO35"), what results +in reading the proper buck8 value and forcing it to 1500mV on boot. This +is not enough for proper board operation and results in eMMC errors during +heavy IO traffic. Increasing maximum voltage value for buck8 restores +original driver behavior and fixes eMMC issues. + +Signed-off-by: Marek Szyprowski +Fixes: 86a2d2ac5e5d ("ARM: dts: Add dts file for Odroid XU3 board") +Fixes: 56b5d4ea778c ("regulator: s2mps11: Fix steps for buck7, buck8 and LDO35") +Cc: +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Arnd Bergmann +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi ++++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi +@@ -468,7 +468,7 @@ + buck8_reg: BUCK8 { + regulator-name = "vdd_1.8v_ldo"; + regulator-min-microvolt = <800000>; +- regulator-max-microvolt = <1500000>; ++ regulator-max-microvolt = <2000000>; + regulator-always-on; + regulator-boot-on; + }; diff --git a/queue-5.0/arm-dts-exynos-fix-pinctrl-definition-for-emmc-rtsn-line-on-odroid-x2-u3.patch b/queue-5.0/arm-dts-exynos-fix-pinctrl-definition-for-emmc-rtsn-line-on-odroid-x2-u3.patch new file mode 100644 index 00000000000..303e584b2c8 --- /dev/null +++ b/queue-5.0/arm-dts-exynos-fix-pinctrl-definition-for-emmc-rtsn-line-on-odroid-x2-u3.patch @@ -0,0 +1,72 @@ +From ec33745bccc8f336957c751f4153421cc9ef5a54 Mon Sep 17 00:00:00 2001 +From: Marek Szyprowski +Date: Thu, 24 Jan 2019 13:22:57 +0100 +Subject: ARM: dts: exynos: Fix pinctrl definition for eMMC RTSN line on Odroid X2/U3 + +From: Marek Szyprowski + +commit ec33745bccc8f336957c751f4153421cc9ef5a54 upstream. + +Commit 225da7e65a03 ("ARM: dts: add eMMC reset line for +exynos4412-odroid-common") added MMC power sequence for eMMC card of +Odroid X2/U3. It reused generic sd1_cd pin control configuration node +and only disabled pull-up. However that time the pinctrl configuration +was not applied during MMC power sequence driver initialization. This +has been changed later by commit d97a1e5d7cd2 ("mmc: pwrseq: convert to +proper platform device"). + +It turned out then, that the provided pinctrl configuration is not +correct, because the eMMC_RTSN line is being re-configured as 'special +function/card detect function for mmc1 controller' not the simple +'output', thus the power sequence driver doesn't really set the pin +value. This in effect broke the reboot of Odroid X2/U3 boards. Fix this +by providing separate node with eMMC_RTSN pin configuration. + +Cc: +Reported-by: Markus Reichl +Suggested-by: Ulf Hansson +Fixes: 225da7e65a03 ("ARM: dts: add eMMC reset line for exynos4412-odroid-common") +Signed-off-by: Marek Szyprowski +Signed-off-by: Krzysztof Kozlowski +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) + +--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi ++++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +@@ -49,7 +49,7 @@ + }; + + emmc_pwrseq: pwrseq { +- pinctrl-0 = <&sd1_cd>; ++ pinctrl-0 = <&emmc_rstn>; + pinctrl-names = "default"; + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpk1 2 GPIO_ACTIVE_LOW>; +@@ -165,12 +165,6 @@ + cpu0-supply = <&buck2_reg>; + }; + +-/* RSTN signal for eMMC */ +-&sd1_cd { +- samsung,pin-pud = ; +- samsung,pin-drv = ; +-}; +- + &pinctrl_1 { + gpio_power_key: power_key { + samsung,pins = "gpx1-3"; +@@ -188,6 +182,11 @@ + samsung,pins = "gpx3-7"; + samsung,pin-pud = ; + }; ++ ++ emmc_rstn: emmc-rstn { ++ samsung,pins = "gpk1-2"; ++ samsung,pin-pud = ; ++ }; + }; + + &ehci { diff --git a/queue-5.0/arm64-dts-hikey-give-wifi-some-time-after-power-on.patch b/queue-5.0/arm64-dts-hikey-give-wifi-some-time-after-power-on.patch new file mode 100644 index 00000000000..995d007f8dd --- /dev/null +++ b/queue-5.0/arm64-dts-hikey-give-wifi-some-time-after-power-on.patch @@ -0,0 +1,42 @@ +From 83b944174ad79825ae84a47af1a0354485b24602 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Thu, 24 Jan 2019 08:52:33 +0100 +Subject: arm64: dts: hikey: Give wifi some time after power-on + +From: Jan Kiszka + +commit 83b944174ad79825ae84a47af1a0354485b24602 upstream. + +Somewhere along recent changes to power control of the wl1835, power-on +became very unreliable on the hikey, failing like this: + +wl1271_sdio: probe of mmc2:0001:1 failed with error -16 +wl1271_sdio: probe of mmc2:0001:2 failed with error -16 + +After playing with some dt parameters and comparing to other users of +this chip, it turned out we need some power-on delay to make things +stable again. In contrast to those other users which define 200 ms, the +hikey would already be happy with 1 ms. Still, we use the safer 10 ms, +like on the Ultra96. + +Fixes: ea452678734e ("arm64: dts: hikey: Fix WiFi support") +Cc: #4.12+ +Signed-off-by: Jan Kiszka +Acked-by: Ulf Hansson +Signed-off-by: Wei Xu +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts ++++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +@@ -118,6 +118,7 @@ + reset-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; + clocks = <&pmic>; + clock-names = "ext_clock"; ++ post-power-on-delay-ms = <10>; + power-off-delay-us = <10>; + }; + diff --git a/queue-5.0/arm64-dts-hikey-revert-enable-hs200-mode-on-emmc.patch b/queue-5.0/arm64-dts-hikey-revert-enable-hs200-mode-on-emmc.patch new file mode 100644 index 00000000000..997635b3b03 --- /dev/null +++ b/queue-5.0/arm64-dts-hikey-revert-enable-hs200-mode-on-emmc.patch @@ -0,0 +1,43 @@ +From 8d26c1390aec795d492b8de5e4437751e8805a1d Mon Sep 17 00:00:00 2001 +From: Alistair Strachan +Date: Wed, 23 Jan 2019 12:06:06 -0800 +Subject: arm64: dts: hikey: Revert "Enable HS200 mode on eMMC" + +From: Alistair Strachan + +commit 8d26c1390aec795d492b8de5e4437751e8805a1d upstream. + +This reverts commit abd7d0972a192ee653efc7b151a6af69db58f2bb. This +change was already partially reverted by John Stultz in +commit 9c6d26df1fae ("arm64: dts: hikey: Fix eMMC corruption regression"). + +This change appears to cause controller resets and block read failures +which prevents successful booting on some hikey boards. + +Cc: Ryan Grachek +Cc: Wei Xu +Cc: Manivannan Sadhasivam +Cc: Rob Herring +Cc: Mark Rutland +Cc: linux-arm-kernel@lists.infradead.org +Cc: devicetree@vger.kernel.org +Cc: stable #4.17+ +Signed-off-by: Alistair Strachan +Signed-off-by: John Stultz +Signed-off-by: Wei Xu +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 - + 1 file changed, 1 deletion(-) + +--- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts ++++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +@@ -301,7 +301,6 @@ + + dwmmc_0: dwmmc0@f723d000 { + cap-mmc-highspeed; +- mmc-hs200-1_8v; + non-removable; + bus-width = <0x8>; + vmmc-supply = <&ldo19>; diff --git a/queue-5.0/arm64-dts-zcu100-revc-give-wifi-some-time-after-power-on.patch b/queue-5.0/arm64-dts-zcu100-revc-give-wifi-some-time-after-power-on.patch new file mode 100644 index 00000000000..35b45dc07ae --- /dev/null +++ b/queue-5.0/arm64-dts-zcu100-revc-give-wifi-some-time-after-power-on.patch @@ -0,0 +1,40 @@ +From 35a4f89cd4731ac6ec985cd29ddc1630903006b7 Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Thu, 24 Jan 2019 09:28:59 +0100 +Subject: arm64: dts: zcu100-revC: Give wifi some time after power-on + +From: Jan Kiszka + +commit 35a4f89cd4731ac6ec985cd29ddc1630903006b7 upstream. + +Somewhere along recent changes to power control of the wl1831, power-on +became very unreliable on the Ultra96, failing like this: + +wl1271_sdio: probe of mmc2:0001:1 failed with error -16 +wl1271_sdio: probe of mmc2:0001:2 failed with error -16 + +After playing with some dt parameters and comparing to other users of +this chip, it turned out we need some power-on delay to make things +stable again. In contrast to those other users which define 200 ms, +Ultra96 is already happy with 10 ms. + +Fixes: 5869ba0653b9 ("arm64: zynqmp: Add support for Xilinx zcu100-revC") +Signed-off-by: Jan Kiszka +Acked-by: Ulf Hansson +Signed-off-by: Michal Simek +Signed-off-by: Greg Kroah-Hartman + +--- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts ++++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts +@@ -101,6 +101,7 @@ + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */ ++ post-power-on-delay-ms = <10>; + }; + }; + diff --git a/queue-5.0/series b/queue-5.0/series index 96a37367148..9278e33e01e 100644 --- a/queue-5.0/series +++ b/queue-5.0/series @@ -4,3 +4,9 @@ input-elan_i2c-add-id-for-touchpad-found-in-lenovo-s21e-20.patch iscsi_ibft-fix-missing-break-in-switch-statement.patch scsi-aacraid-fix-missing-break-in-switch-statement.patch x86-pci-fixup-rtit_bar-of-intel-denverton-trace-hub.patch +arm64-dts-zcu100-revc-give-wifi-some-time-after-power-on.patch +arm64-dts-hikey-give-wifi-some-time-after-power-on.patch +arm64-dts-hikey-revert-enable-hs200-mode-on-emmc.patch +arm-dts-exynos-fix-pinctrl-definition-for-emmc-rtsn-line-on-odroid-x2-u3.patch +arm-dts-exynos-add-minimal-clkout-parameters-to-exynos3250-pmu.patch +arm-dts-exynos-fix-max-voltage-for-buck8-regulator-on-odroid-xu3-xu4.patch