Message ID | 1452629253-21748-1-git-send-email-aaro.koskinen@iki.fi (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
* 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>
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 >
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@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
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"; };
The UART/SD pin names are swapped, fix that. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> --- arch/arm/boot/dts/kirkwood-openrd.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)