Commit 3375aa77 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Neil Armstrong
Browse files

ARM: dts: meson8b: Fix the UART device-tree schema validation 



The dt-bindings for the UART controller only allow the following values
for Meson8 SoCs:
- "amlogic,meson8b-uart", "amlogic,meson-ao-uart"
- "amlogic,meson8b-uart"

Use the correct fallback compatible string "amlogic,meson-ao-uart" for
AO UART. Drop the "amlogic,meson-uart" compatible string from the EE
domain UART controllers.

Also update the order of the clocks to match the order defined in the
yaml bindings.

Fixes: b02d6e73 ("ARM: dts: meson8b: use stable UART bindings with correct gate clock")
Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://lore.kernel.org/r/20211227180026.4068352-4-martin.blumenstingl@googlemail.com
parent 57007bfb

arch/arm/boot/dts/meson8b.dtsi

+12 −12
Original line number Diff line number Diff line
@@ -724,27 +724,27 @@ 
};



&uart_AO {

	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8b-uart", "amlogic,meson-ao-uart";

	clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_A {

	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8b-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_B {

	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8b-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&uart_C {

	compatible = "amlogic,meson8b-uart", "amlogic,meson-uart";

	clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>;

	clock-names = "baud", "xtal", "pclk";

	compatible = "amlogic,meson8b-uart";

	clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;

	clock-names = "xtal", "pclk", "baud";

};



&usb0 {