| Message ID | 20220816001026.830127-1-michael@walle.cc (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] ARM: dts: kirkwood: lsxl: fix serial line | expand |
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
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";
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(+)