2023-05-10 21:41:37

by Martin Blumenstingl

Subject: [PATCH] ARM: dts: meson8: correct uart_B and uart_C clock references

On Meson8 uart_B and uart_C do not work, because they are relying on
incorrect clocks. Change the references of pclk to the correct CLKID
(UART1 for uart_B and UART2 for uart_C), to allow use of the two uarts.

Fixes: 57007bfb5469 ("ARM: dts: meson8: Fix the UART device-tree schema validation")
Reported-by: Hans-Frieder Vogt <[email protected]> # for meson8b.dtsi
Link: https://lore.kernel.org/linux-amlogic/trinity-bf20bcb9-790b-4ab9-99e3-0831ef8257f4-1680878185420@3c-app-gmx-bap55/
Signed-off-by: Martin Blumenstingl <[email protected]>
---
arch/arm/boot/dts/meson8.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
index 4f22ab451aae..1054297fa69f 100644
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -769,13 +769,13 @@ &uart_A {

&uart_B {
compatible = "amlogic,meson8-uart";
- clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
+ clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
clock-names = "xtal", "pclk", "baud";
};

&uart_C {
compatible = "amlogic,meson8-uart";
- clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
+ clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
clock-names = "xtal", "pclk", "baud";
};

--
2.40.1

2023-05-11 08:39:56

by Neil Armstrong

Subject: Re: [PATCH] ARM: dts: meson8: correct uart_B and uart_C clock references

On 10/05/2023 23:08, Martin Blumenstingl wrote:
> On Meson8 uart_B and uart_C do not work, because they are relying on
> incorrect clocks. Change the references of pclk to the correct CLKID
> (UART1 for uart_B and UART2 for uart_C), to allow use of the two uarts.
>
> Fixes: 57007bfb5469 ("ARM: dts: meson8: Fix the UART device-tree schema validation")
> Reported-by: Hans-Frieder Vogt <[email protected]> # for meson8b.dtsi
> Link: https://lore.kernel.org/linux-amlogic/trinity-bf20bcb9-790b-4ab9-99e3-0831ef8257f4-1680878185420@3c-app-gmx-bap55/

This is confusing, please move this link to the commit message instead, I'll add
the Link to reference the patch from Lore.

With that changes:
Reviewed-by: Neil Armstrong <[email protected]>

> Signed-off-by: Martin Blumenstingl <[email protected]>
> ---
> arch/arm/boot/dts/meson8.dtsi | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
> index 4f22ab451aae..1054297fa69f 100644
> --- a/arch/arm/boot/dts/meson8.dtsi
> +++ b/arch/arm/boot/dts/meson8.dtsi
> @@ -769,13 +769,13 @@ &uart_A {
>
> &uart_B {
> compatible = "amlogic,meson8-uart";
> - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
> + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
> clock-names = "xtal", "pclk", "baud";
> };
>
> &uart_C {
> compatible = "amlogic,meson8-uart";
> - clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
> + clocks = <&xtal>, <&clkc CLKID_UART2>, <&clkc CLKID_CLK81>;
> clock-names = "xtal", "pclk", "baud";
> };
>