[PATCH 1/2] ARM: dts: kirkwood: lsxl: fix serial line

[PATCH 1/2] ARM: dts: kirkwood: lsxl: fix serial line

[Michael Walle]

Commit 327e15428977 ("ARM: dts: kirkwood: consolidate common pinctrl
settings") unknowingly broke the serial output on this board. Before
this commit, the pinmux was still configured by the bootloader and the
kernel didn't reconfigured it again. This was an oversight by the
initial board support where the pinmux for the serial line was never
configured by the kernel. But with this commit, the serial line will be
reconfigured to the wrong pins. This is especially confusing, because
the output still works, but the input doesn't. Presumingly, the input is
reconfigured to MPP10, but the output is connected to both MPP11 and
MPP5.

Override the pinmux in the board device tree.

Fixes: 327e15428977 ("ARM: dts: kirkwood: consolidate common pinctrl settings")
Signed-off-by: Michael Walle <michael@walle.cc>
---
 arch/arm/boot/dts/kirkwood-lsxl.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 7b151acb9984..321a40a98ed2 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -10,6 +10,11 @@ chosen {
 
 	ocp@f1000000 {
 		pinctrl: pin-controller@10000 {
+			/* Non-default UART pins */
+			pmx_uart0: pmx-uart0 {
+				marvell,pins = "mpp4", "mpp5";
+			};
+
 			pmx_power_hdd: pmx-power-hdd {
 				marvell,pins = "mpp10";
 				marvell,function = "gpo";
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH 2/2] ARM: dts: kirkwood: lsxl: remove first ethernet port

[Michael Walle]

Both the Linkstation LS-CHLv2 and the LS-XHL have only one ethernet
port. This has always been wrong, i.e. the board code used to set up
both ports, but the driver will play nice and return -ENODEV if the
assiciated PHY is not found. Nevertheless, it is wrong. Remove it.

Fixes: 876e23333511 ("ARM: kirkwood: add gigabit ethernet and mvmdio device tree nodes")
Signed-off-by: Michael Walle <michael@walle.cc>
---
 arch/arm/boot/dts/kirkwood-lsxl.dtsi | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 321a40a98ed2..88b70ba1c8fe 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -218,22 +218,11 @@ hdd_power: regulator@2 {
 &mdio {
 	status = "okay";
 
-	ethphy0: ethernet-phy@0 {
-		reg = <0>;
-	};
-
 	ethphy1: ethernet-phy@8 {
 		reg = <8>;
 	};
 };
 
-&eth0 {
-	status = "okay";
-	ethernet0-port@0 {
-		phy-handle = <&ethphy0>;
-	};
-};
-
 &eth1 {
 	status = "okay";
 	ethernet1-port@0 {
-- 
2.30.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/2] ARM: dts: kirkwood: lsxl: remove first ethernet port

[Andrew Lunn]

On Tue, Aug 16, 2022 at 02:10:25AM +0200, Michael Walle wrote:
> Both the Linkstation LS-CHLv2 and the LS-XHL have only one ethernet
> port. This has always been wrong, i.e. the board code used to set up
> both ports, but the driver will play nice and return -ENODEV if the
> assiciated PHY is not found. Nevertheless, it is wrong. Remove it.
> 
> Fixes: 876e23333511 ("ARM: kirkwood: add gigabit ethernet and mvmdio device tree nodes")
> Signed-off-by: Michael Walle <michael@walle.cc>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 1/2] ARM: dts: kirkwood: lsxl: fix serial line

[Andrew Lunn]

On Tue, Aug 16, 2022 at 02:10:24AM +0200, Michael Walle wrote:
> Commit 327e15428977 ("ARM: dts: kirkwood: consolidate common pinctrl
> settings") unknowingly broke the serial output on this board. Before
> this commit, the pinmux was still configured by the bootloader and the
> kernel didn't reconfigured it again. This was an oversight by the
> initial board support where the pinmux for the serial line was never
> configured by the kernel. But with this commit, the serial line will be
> reconfigured to the wrong pins. This is especially confusing, because
> the output still works, but the input doesn't. Presumingly, the input is
> reconfigured to MPP10, but the output is connected to both MPP11 and
> MPP5.
> 
> Override the pinmux in the board device tree.
> 
> Fixes: 327e15428977 ("ARM: dts: kirkwood: consolidate common pinctrl settings")
> Signed-off-by: Michael Walle <michael@walle.cc>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/2] ARM: dts: kirkwood: lsxl: remove first ethernet port

[Gregory CLEMENT]

Michael Walle <michael@walle.cc> writes:

> Both the Linkstation LS-CHLv2 and the LS-XHL have only one ethernet
> port. This has always been wrong, i.e. the board code used to set up
> both ports, but the driver will play nice and return -ENODEV if the
> assiciated PHY is not found. Nevertheless, it is wrong. Remove it.
>
> Fixes: 876e23333511 ("ARM: kirkwood: add gigabit ethernet and mvmdio device tree nodes")
> Signed-off-by: Michael Walle <michael@walle.cc>

Applied on mvebu/dt

Thanks,

Gregory
> ---
>  arch/arm/boot/dts/kirkwood-lsxl.dtsi | 11 -----------
>  1 file changed, 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> index 321a40a98ed2..88b70ba1c8fe 100644
> --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
> @@ -218,22 +218,11 @@ hdd_power: regulator@2 {
>  &mdio {
>  	status = "okay";
>  
> -	ethphy0: ethernet-phy@0 {
> -		reg = <0>;
> -	};
> -
>  	ethphy1: ethernet-phy@8 {
>  		reg = <8>;
>  	};
>  };
>  
> -&eth0 {
> -	status = "okay";
> -	ethernet0-port@0 {
> -		phy-handle = <&ethphy0>;
> -	};
> -};
> -
>  &eth1 {
>  	status = "okay";
>  	ethernet1-port@0 {
> -- 
> 2.30.2
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel