linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ARM: dts: am335x-sl50: Fix card detect pin for mmc1
@ 2017-05-19 16:51 Enric Balletbo i Serra
  2017-05-19 16:51 ` [PATCH 2/2] ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0 Enric Balletbo i Serra
  2017-05-20  8:45 ` [PATCH 1/2] ARM: dts: am335x-sl50: Fix card detect pin for mmc1 Greg KH
  0 siblings, 2 replies; 4+ messages in thread
From: Enric Balletbo i Serra @ 2017-05-19 16:51 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 arch/arm/boot/dts/am335x-sl50.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index c5d2589..da4f8e3 100644
--- 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>;
 };
 
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 2/2] ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
  2017-05-19 16:51 [PATCH 1/2] ARM: dts: am335x-sl50: Fix card detect pin for mmc1 Enric Balletbo i Serra
@ 2017-05-19 16:51 ` Enric Balletbo i Serra
  2017-05-20  8:45   ` Greg KH
  2017-05-20  8:45 ` [PATCH 1/2] ARM: dts: am335x-sl50: Fix card detect pin for mmc1 Greg KH
  1 sibling, 1 reply; 4+ messages in thread
From: Enric Balletbo i Serra @ 2017-05-19 16:51 UTC (permalink / raw)
  To: linux-arm-kernel

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>
---
 arch/arm/boot/dts/am335x-sl50.dts | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/arm/boot/dts/am335x-sl50.dts b/arch/arm/boot/dts/am335x-sl50.dts
index da4f8e3..fc864a8 100644
--- 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 */
-- 
2.9.3

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 1/2] ARM: dts: am335x-sl50: Fix card detect pin for mmc1
  2017-05-19 16:51 [PATCH 1/2] ARM: dts: am335x-sl50: Fix card detect pin for mmc1 Enric Balletbo i Serra
  2017-05-19 16:51 ` [PATCH 2/2] ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0 Enric Balletbo i Serra
@ 2017-05-20  8:45 ` Greg KH
  1 sibling, 0 replies; 4+ messages in thread
From: Greg KH @ 2017-05-20  8:45 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, May 19, 2017 at 06:51:43PM +0200, Enric Balletbo i Serra wrote:
> 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>
> ---
>  arch/arm/boot/dts/am335x-sl50.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read:
    https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH 2/2] ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0
  2017-05-19 16:51 ` [PATCH 2/2] ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0 Enric Balletbo i Serra
@ 2017-05-20  8:45   ` Greg KH
  0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2017-05-20  8:45 UTC (permalink / raw)
  To: linux-arm-kernel

On Fri, May 19, 2017 at 06:51:44PM +0200, Enric Balletbo i Serra wrote:
> 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>
> ---
>  arch/arm/boot/dts/am335x-sl50.dts | 4 ----
>  1 file changed, 4 deletions(-)

<formletter>

This is not the correct way to submit patches for inclusion in the
stable kernel tree.  Please read:
    https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
for how to do this properly.

</formletter>

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-05-20  8:45 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-19 16:51 [PATCH 1/2] ARM: dts: am335x-sl50: Fix card detect pin for mmc1 Enric Balletbo i Serra
2017-05-19 16:51 ` [PATCH 2/2] ARM: dts: am335x-sl50: Fix cannot claim requested pins for spi0 Enric Balletbo i Serra
2017-05-20  8:45   ` Greg KH
2017-05-20  8:45 ` [PATCH 1/2] ARM: dts: am335x-sl50: Fix card detect pin for mmc1 Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).