Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec9b5916 authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman
Browse files

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: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 45631ea8

arch/arm/boot/dts/meson.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -86,14 +86,14 @@ 
			};



			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 @@ 
			};



			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 @@ 
			};



			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";

arch/arm/boot/dts/meson6.dtsi

+28 −0
Original line number Diff line number Diff line
@@ -70,9 +70,37 @@ 
		};

	};



	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";

};