lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH v4 6/7] ARM: dts: meson8: switch to new bindings for UART nodes
From
Date
On Fri, 2017-06-09 at 11:49 +0200, Neil Armstrong wrote:
> Switch to the stable UART bindings by adding a XTAL node and using the
> proper compatible strings.
>
> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
> ---
>  arch/arm/boot/dts/meson8.dtsi | 23 +++++++++++++++++++----
>  1 file changed, 19 insertions(+), 4 deletions(-)

I think this is clashing with the recent change from Martin on meson8 clock
driver. Kevin just applied it : 

https://lkml.kernel.org/r/m2d1ad9g38.fsf@baylibre.com

<&clk81> no longer exists ...

>
> diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi
> index 6993077..a2ea112 100644
> --- a/arch/arm/boot/dts/meson8.dtsi
> +++ b/arch/arm/boot/dts/meson8.dtsi
> @@ -83,6 +83,13 @@
>   };
>   };
>  
> + xtal: xtal-clk {
> + compatible = "fixed-clock";
> + clock-frequency = <24000000>;
> + clock-output-names = "xtal";
> + #clock-cells = <0>;
> + };
> +
>   clk81: clk@0 {
>   #clock-cells = <0>;
>   compatible = "fixed-clock";
> @@ -199,17 +206,25 @@
>  };
>  
>  &uart_AO {
> - clocks = <&clk81>;
> + compatible = "amlogic,meson8-uart", "amlogic,meson-ao-uart";
> + clocks = <&xtal>, <&clk81>, <&clk81>;
> + clock-names = "xtal", "pclk", "baud";
>  };
>  
>  &uart_A {
> - clocks = <&clk81>;
> + compatible = "amlogic,meson8-uart";
> + clocks = <&xtal>, <&clk81>, <&clk81>;
> + clock-names = "xtal", "pclk", "baud";
>  };
>  
>  &uart_B {
> - clocks = <&clk81>;
> + compatible = "amlogic,meson8-uart";
> + clocks = <&xtal>, <&clk81>, <&clk81>;
> + clock-names = "xtal", "pclk", "baud";
>  };
>  
>  &uart_C {
> - clocks = <&clk81>;
> + compatible = "amlogic,meson8-uart";
> + clocks = <&xtal>, <&clk81>, <&clk81>;
> + clock-names = "xtal", "pclk", "baud";
>  };

\
 
 \ /
  Last update: 2017-06-12 11:14    [W:0.800 / U:0.016 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site