Skip to contentSkip to conversation

ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection

PATCH New Aaro Koskinen 4 participants 7 messages Jan 12, 2016 – Jan 25, 2016 Device tree bindings

lore
Share & tools
lore

Aaro Koskinen

author
#0 lore raw

PATCH 1/2 ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection

The UART/SD pin names are swapped, fix that.

Signed-off-by Aaro Koskinen <[email protected]>
---
 arch/arm/boot/dts/kirkwood-openrd.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/kirkwood-openrd.dtsi +2 -2
index d3330da..2a3dafd 100644
@@ -40,7 +40,7 @@
 			pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
 			pinctrl-names = "default";
 
-			pmx_select28: pmx-select-uart-sd {
+			pmx_select28: pmx-select-rs232-rs484 {
 				marvell,pins = "mpp28";
 				marvell,function = "gpio";
 			};

@@ -48,7 +48,7 @@
 				marvell,pins = "mpp29";
 				marvell,function = "gpio";
 			};
-			pmx_select34: pmx-select-rs232-rs484 {
+			pmx_select34: pmx-select-uart-sd {
 				marvell,pins = "mpp34";
 				marvell,function = "gpio";
 			};
Signature · 1 line
2.4.0
author
#1 lore raw

PATCH 2/2 ARM: DTS: kirkwood-openrd: fix SD slot default configuration

The SD card slot was enabled by default with legacy booting. It does not work anymore with DT boot. Fix by providing GPIO configuration that matches the old default.

Signed-off-by Aaro Koskinen <[email protected]>
---
 arch/arm/boot/dts/kirkwood-openrd.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/kirkwood-openrd.dtsi +8 -0
index 2a3dafd..f65b727 100644
@@ -65,6 +65,14 @@
 			status = "okay";
 			cd-gpios = <&gpio0 29 9>;
 		};
+		gpio at 10140 {
+			p2 {
+				gpio-hog;
+				gpios = <2 GPIO_ACTIVE_HIGH>;
+				output-high; /* Select SD by default */
+				line-name = "SelUARTorSD";
+			};
+		};
 	};
 };
Signature · 1 line
2.4.0
#2 lore raw

PATCH 2/2 ARM: DTS: kirkwood-openrd: fix SD slot default configuration

Quoted 3 lines · Aaro Koskinen

The SD card slot was enabled by default with legacy booting. It does not work anymore with DT boot. Fix by providing GPIO configuration that matches the old default.

Tested-by Rick Thomas <[email protected]>
Reviewed-by Martin Michlmayr <[email protected]>
Signature · 2 lines
Martin Michlmayr
http://www.cyrius.com/
#3 lore raw

PATCH 2/2 ARM: DTS: kirkwood-openrd: fix SD slot default configuration

In reply to Aaro Koskinen

Hi Aaro,

Quoted 5 lines · Aaro Koskinen

The SD card slot was enabled by default with legacy booting. It does not work anymore with DT boot. Fix by providing GPIO configuration that matches the old default.

Signed-off-by Aaro Koskinen <[email protected]>

Applied on mvebu/dt with Andrew Reviewed-by

Thanks,

Gregory

Quoted 31 lines
---
 arch/arm/boot/dts/kirkwood-openrd.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/boot/dts/kirkwood-openrd.dtsi +8 -0
index 2a3dafd..f65b727 100644
@@ -65,6 +65,14 @@
 			status = "okay";
 			cd-gpios = <&gpio0 29 9>;
 		};
+		gpio at 10140 {
+			p2 {
+				gpio-hog;
+				gpios = <2 GPIO_ACTIVE_HIGH>;
+				output-high; /* Select SD by default */
+				line-name = "SelUARTorSD";
+			};
+		};
 	};
 };
Signature · 7 lines
2.4.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#5 lore raw

PATCH 1/2 ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection

In reply to Aaro Koskinen
Quoted 3 lines · Aaro Koskinen

The UART/SD pin names are swapped, fix that.

Signed-off-by Aaro Koskinen <[email protected]>

This, and 2/2:

Reviewed-by Andrew Lunn <[email protected]>

Thanks
Andrew

Quoted 29 lines
---
 arch/arm/boot/dts/kirkwood-openrd.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/kirkwood-openrd.dtsi +2 -2
index d3330da..2a3dafd 100644
@@ -40,7 +40,7 @@
 			pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
 			pinctrl-names = "default";
 
-			pmx_select28: pmx-select-uart-sd {
+			pmx_select28: pmx-select-rs232-rs484 {
 				marvell,pins = "mpp28";
 				marvell,function = "gpio";
 			};

@@ -48,7 +48,7 @@
 				marvell,pins = "mpp29";
 				marvell,function = "gpio";
 			};
-			pmx_select34: pmx-select-rs232-rs484 {
+			pmx_select34: pmx-select-uart-sd {
 				marvell,pins = "mpp34";
 				marvell,function = "gpio";
 			};
Signature · 1 line
2.4.0
#6 lore raw

PATCH 1/2 ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection

In reply to Aaro Koskinen

Hi Aaro,

Quoted 3 lines · Aaro Koskinen

The UART/SD pin names are swapped, fix that.

Signed-off-by Aaro Koskinen <[email protected]>

Applied on mvebu/dt with Andrew's reviewed-by

Thanks,

Gregory

Quoted 34 lines
---
 arch/arm/boot/dts/kirkwood-openrd.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/kirkwood-openrd.dtsi +2 -2
index d3330da..2a3dafd 100644
@@ -40,7 +40,7 @@
 			pinctrl-0 = <&pmx_select28 &pmx_sdio_cd &pmx_select34>;
 			pinctrl-names = "default";
 
-			pmx_select28: pmx-select-uart-sd {
+			pmx_select28: pmx-select-rs232-rs484 {
 				marvell,pins = "mpp28";
 				marvell,function = "gpio";
 			};

@@ -48,7 +48,7 @@
 				marvell,pins = "mpp29";
 				marvell,function = "gpio";
 			};
-			pmx_select34: pmx-select-rs232-rs484 {
+			pmx_select34: pmx-select-uart-sd {
 				marvell,pins = "mpp34";
 				marvell,function = "gpio";
 			};
Signature · 7 lines
2.4.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 4 lines
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com