Messages in this thread | | | Subject | Re: [PATCH v4 6/7] ARM: dts: meson8: switch to new bindings for UART nodes | From | Jerome Brunet <> | Date | Mon, 12 Jun 2017 11:13:43 +0200 |
| |
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"; > };
| |