* [PATCH 2/2] ARM: DTS: kirkwood-openrd: fix SD slot default configuration
2016-01-12 20:07 [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection Aaro Koskinen
@ 2016-01-12 20:07 ` Aaro Koskinen
2016-01-17 22:43 ` Martin Michlmayr
2016-01-25 13:41 ` Gregory CLEMENT
2016-01-17 23:03 ` [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection Martin Michlmayr
` (2 subsequent siblings)
3 siblings, 2 replies; 7+ messages in thread
From: Aaro Koskinen @ 2016-01-12 20:07 UTC (permalink / raw)
To: linux-arm-kernel
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 <aaro.koskinen@iki.fi>
---
arch/arm/boot/dts/kirkwood-openrd.dtsi | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
index 2a3dafd..f65b727 100644
--- a/arch/arm/boot/dts/kirkwood-openrd.dtsi
+++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
@@ -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";
+ };
+ };
};
};
--
2.4.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/2] ARM: DTS: kirkwood-openrd: fix SD slot default configuration
2016-01-12 20:07 ` [PATCH 2/2] ARM: DTS: kirkwood-openrd: fix SD slot default configuration Aaro Koskinen
@ 2016-01-17 22:43 ` Martin Michlmayr
2016-01-25 13:41 ` Gregory CLEMENT
1 sibling, 0 replies; 7+ messages in thread
From: Martin Michlmayr @ 2016-01-17 22:43 UTC (permalink / raw)
To: linux-arm-kernel
* Aaro Koskinen <aaro.koskinen@iki.fi> [2016-01-12 22:07]:
> 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 <rbthomas@pobox.com>
Reviewed-by: Martin Michlmayr <tbm@cyrius.com>
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/2] ARM: DTS: kirkwood-openrd: fix SD slot default configuration
2016-01-12 20:07 ` [PATCH 2/2] ARM: DTS: kirkwood-openrd: fix SD slot default configuration Aaro Koskinen
2016-01-17 22:43 ` Martin Michlmayr
@ 2016-01-25 13:41 ` Gregory CLEMENT
1 sibling, 0 replies; 7+ messages in thread
From: Gregory CLEMENT @ 2016-01-25 13:41 UTC (permalink / raw)
To: linux-arm-kernel
Hi Aaro,
On mar., janv. 12 2016, Aaro Koskinen <aaro.koskinen@iki.fi> wrote:
> 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 <aaro.koskinen@iki.fi>
Applied on mvebu/dt with Andrew Reviewed-by
Thanks,
Gregory
> ---
> arch/arm/boot/dts/kirkwood-openrd.dtsi | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
> index 2a3dafd..f65b727 100644
> --- a/arch/arm/boot/dts/kirkwood-openrd.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
> @@ -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";
> + };
> + };
> };
> };
>
> --
> 2.4.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection
2016-01-12 20:07 [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection Aaro Koskinen
2016-01-12 20:07 ` [PATCH 2/2] ARM: DTS: kirkwood-openrd: fix SD slot default configuration Aaro Koskinen
@ 2016-01-17 23:03 ` Martin Michlmayr
2016-01-24 17:30 ` Andrew Lunn
2016-01-25 13:39 ` Gregory CLEMENT
3 siblings, 0 replies; 7+ messages in thread
From: Martin Michlmayr @ 2016-01-17 23:03 UTC (permalink / raw)
To: linux-arm-kernel
* Aaro Koskinen <aaro.koskinen@iki.fi> [2016-01-12 22:07]:
> The UART/SD pin names are swapped, fix that.
Reviewed-by: Martin Michlmayr <tbm@cyrius.com>
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection
2016-01-12 20:07 [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection Aaro Koskinen
2016-01-12 20:07 ` [PATCH 2/2] ARM: DTS: kirkwood-openrd: fix SD slot default configuration Aaro Koskinen
2016-01-17 23:03 ` [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection Martin Michlmayr
@ 2016-01-24 17:30 ` Andrew Lunn
2016-01-25 13:39 ` Gregory CLEMENT
3 siblings, 0 replies; 7+ messages in thread
From: Andrew Lunn @ 2016-01-24 17:30 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 12, 2016 at 10:07:32PM +0200, Aaro Koskinen wrote:
> The UART/SD pin names are swapped, fix that.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
This, and 2/2:
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Thanks
Andrew
> ---
> arch/arm/boot/dts/kirkwood-openrd.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
> index d3330da..2a3dafd 100644
> --- a/arch/arm/boot/dts/kirkwood-openrd.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
> @@ -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";
> };
> --
> 2.4.0
>
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection
2016-01-12 20:07 [PATCH 1/2] ARM: DTS: kirkwood-openrd: fix pin names for UART/SD selection Aaro Koskinen
` (2 preceding siblings ...)
2016-01-24 17:30 ` Andrew Lunn
@ 2016-01-25 13:39 ` Gregory CLEMENT
3 siblings, 0 replies; 7+ messages in thread
From: Gregory CLEMENT @ 2016-01-25 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Hi Aaro,
On mar., janv. 12 2016, Aaro Koskinen <aaro.koskinen@iki.fi> wrote:
> The UART/SD pin names are swapped, fix that.
>
> Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Applied on mvebu/dt with Andrew's reviewed-by
Thanks,
Gregory
> ---
> arch/arm/boot/dts/kirkwood-openrd.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/kirkwood-openrd.dtsi b/arch/arm/boot/dts/kirkwood-openrd.dtsi
> index d3330da..2a3dafd 100644
> --- a/arch/arm/boot/dts/kirkwood-openrd.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-openrd.dtsi
> @@ -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";
> };
> --
> 2.4.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 7+ messages in thread