ARM: dts: meson6: use stable UART bindings

The UART bindings needs specifying a SoC family, use the meson6 family
for the UART nodes like the other nodes.
Switch to the stable UART bindings for meson6 by adding a XTAL node and
using the proper compatible strings.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>

diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi
index 7e136991a4b939a3681cbe65855472bfe473e6fa..cd6ad072e72c17ebe287b72d3f26657a402a97ba 100644 (file)
--- a/arch/arm/boot/dts/meson.dtsi
+++ b/arch/arm/boot/dts/meson.dtsi
@@ -86,14 +86,14 @@ hwrng: rng@8100 {
                        };
 
                        uart_A: serial@84c0 {
-                               compatible = "amlogic,meson-uart";
+                               compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
                                reg = <0x84c0 0x18>;
                                interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
                                status = "disabled";
                        };
 
                        uart_B: serial@84dc {
-                               compatible = "amlogic,meson-uart";
+                               compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
                                reg = <0x84dc 0x18>;
                                interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
                                status = "disabled";
@@ -131,7 +131,7 @@ saradc: adc@8680 {
                        };
 
                        uart_C: serial@8700 {
-                               compatible = "amlogic,meson-uart";
+                               compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
                                reg = <0x8700 0x18>;
                                interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
                                status = "disabled";
@@ -196,7 +196,7 @@ ir_receiver: ir-receiver@480 {
                        };
 
                        uart_AO: serial@4c0 {
-                               compatible = "amlogic,meson-uart";
+                               compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";
                                reg = <0x4c0 0x18>;
                                interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
                                status = "disabled";

diff --git a/arch/arm/boot/dts/meson6.dtsi b/arch/arm/boot/dts/meson6.dtsi
index 8557b6117a4b97f23bf2359d585d1e6c2c787d49..ef281d2900527703af28b49f425df50415d1bd2d 100644 (file)
--- a/arch/arm/boot/dts/meson6.dtsi
+++ b/arch/arm/boot/dts/meson6.dtsi
@@ -70,9 +70,37 @@ cpu@201 {
                };
        };
 
+       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";
                clock-frequency = <200000000>;
        };
 }; /* end of / */
+
+
+&uart_AO {
+       clocks = <&xtal>, <&clk81>, <&clk81>;
+       clock-names = "xtal", "pclk", "baud";
+};
+
+&uart_A {
+       clocks = <&xtal>, <&clk81>, <&clk81>;
+       clock-names = "xtal", "pclk", "baud";
+};
+
+&uart_B {
+       clocks = <&xtal>, <&clk81>, <&clk81>;
+       clock-names = "xtal", "pclk", "baud";
+};
+
+&uart_C {
+       clocks = <&xtal>, <&clk81>, <&clk81>;
+       clock-names = "xtal", "pclk", "baud";
+};