4.11-stable patches

added patches:
	arm-dts-am335x-sl50-fix-cannot-claim-requested-pins-for-spi0.patch
	arm-dts-am335x-sl50-fix-card-detect-pin-for-mmc1.patch

diff --git a/queue-4.11/arm-dts-am335x-sl50-fix-cannot-claim-requested-pins-for-spi0.patch b/queue-4.11/arm-dts-am335x-sl50-fix-cannot-claim-requested-pins-for-spi0.patch
new file mode 100644 (file)
index 0000000..cff240c
--- /dev/null
+++ b/queue-4.11/arm-dts-am335x-sl50-fix-cannot-claim-requested-pins-for-spi0.patch
@@ -0,0 +1,39 @@
+From db145db99f5bf30acc12d7450b9ad0707072a7be Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Mon, 22 May 2017 11:01:53 +0200
+Subject: ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
+
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+
+commit db145db99f5bf30acc12d7450b9ad0707072a7be upstream.
+
+We don't need to bitbang these pins anymore, instead we muxed these
+pins as SPI, after this change, done in commit 6c69f726, we introduced
+the following error:
+
+ pinctrl-single 44e10800.pinmux: pin PIN85 already requested \
+ by 44e10800.pinmux; cannot claim for 48030000.spi
+ pinctrl-single 44e10800.pinmux: pin-85 (48030000.spi) status -22
+
+Fixes: 6c69f726 ("ARM: dts: am335x-sl50: Enable SPI0 interface and Flash Memory")
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/am335x-sl50.dts |    4 ----
+ 1 file changed, 4 deletions(-)
+
+--- a/arch/arm/boot/dts/am335x-sl50.dts
++++ b/arch/arm/boot/dts/am335x-sl50.dts
+@@ -280,10 +280,6 @@
+                       AM33XX_IOPAD(0x834, PIN_INPUT_PULLUP | MUX_MODE7)       /* nKbdReset - gpmc_ad13.gpio1_13 */
+                       AM33XX_IOPAD(0x838, PIN_INPUT_PULLUP | MUX_MODE7)       /* nDispReset - gpmc_ad14.gpio1_14 */
+                       AM33XX_IOPAD(0x844, PIN_INPUT_PULLUP | MUX_MODE7)       /* USB1_enPower - gpmc_a1.gpio1_17 */
+-                      /* AVR Programming - SPI Bus (bit bang) - Screen and Keyboard */
+-                      AM33XX_IOPAD(0x954, PIN_INPUT_PULLUP | MUX_MODE7)       /* Kbd/Disp/BattMOSI spi0_d0.gpio0_3 */
+-                      AM33XX_IOPAD(0x958, PIN_INPUT_PULLUP | MUX_MODE7)       /* Kbd/Disp/BattMISO spi0_d1.gpio0_4 */
+-                      AM33XX_IOPAD(0x950, PIN_INPUT_PULLUP | MUX_MODE7)       /* Kbd/Disp/BattSCLK spi0_clk.gpio0_2 */
+                       /* PDI Bus - Battery system */
+                       AM33XX_IOPAD(0x840, PIN_INPUT_PULLUP | MUX_MODE7)       /* nBattReset  gpmc_a0.gpio1_16 */
+                       AM33XX_IOPAD(0x83c, PIN_INPUT_PULLUP | MUX_MODE7)       /* BattPDIData gpmc_ad15.gpio1_15 */

diff --git a/queue-4.11/arm-dts-am335x-sl50-fix-card-detect-pin-for-mmc1.patch b/queue-4.11/arm-dts-am335x-sl50-fix-card-detect-pin-for-mmc1.patch
new file mode 100644 (file)
index 0000000..edbb1d4
--- /dev/null
+++ b/queue-4.11/arm-dts-am335x-sl50-fix-card-detect-pin-for-mmc1.patch
@@ -0,0 +1,42 @@
+From 56b74ed9c1e8050408b9beeee25888a49a458997 Mon Sep 17 00:00:00 2001
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Date: Mon, 22 May 2017 11:01:52 +0200
+Subject: ARM: dts: am335x-sl50: Fix card detect pin for mmc1
+
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+
+commit 56b74ed9c1e8050408b9beeee25888a49a458997 upstream.
+
+The second version of the hardware moved the card detect pin from gpio0_6
+to gpio1_9, as we won't support the first hardware version fix the pinmux
+configuration of this pin.
+
+Fixes: 8584d4fc ("ARM: dts: am335x-sl50: Add Toby-Churchill SL50 board support.")
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ arch/arm/boot/dts/am335x-sl50.dts |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/arch/arm/boot/dts/am335x-sl50.dts
++++ b/arch/arm/boot/dts/am335x-sl50.dts
+@@ -220,7 +220,7 @@
+ 
+       mmc1_pins: pinmux_mmc1_pins {
+               pinctrl-single,pins = <
+-                      AM33XX_IOPAD(0x960, PIN_INPUT | MUX_MODE7)              /* spi0_cs1.gpio0_6 */
++                      AM33XX_IOPAD(0x96c, PIN_INPUT | MUX_MODE7)              /* uart0_rtsn.gpio1_9 */
+               >;
+       };
+ 
+@@ -384,7 +384,7 @@
+       pinctrl-names = "default";
+       pinctrl-0 = <&mmc1_pins>;
+       bus-width = <4>;
+-      cd-gpios = <&gpio0 6 GPIO_ACTIVE_LOW>;
++      cd-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
+       vmmc-supply = <&vmmcsd_fixed>;
+ };
+ 

diff --git a/queue-4.11/series b/queue-4.11/series
index 861dbda3bce9fd2077dbe939911171cc405f20f3..ef6612b37ce1f7399cb99beb2f8f6ad7a17cdb3e 100644 (file)
--- a/queue-4.11/series
+++ b/queue-4.11/series
@@ -73,3 +73,5 @@ virtio_balloon-disable-viommu-support.patch
 mips-fix-bnezc-jialc-return-address-calculation.patch
 mips-.its-targets-depend-on-vmlinux.patch
 crypto-work-around-deallocated-stack-frame-reference-gcc-bug-on-sparc.patch
+arm-dts-am335x-sl50-fix-card-detect-pin-for-mmc1.patch
+arm-dts-am335x-sl50-fix-cannot-claim-requested-pins-for-spi0.patch