Skip to content

Commit 57007bf

Browse files
xdarklightsuperna9999
authored andcommitted
ARM: dts: meson8: Fix the UART device-tree schema validation
The dt-bindings for the UART controller only allow the following values for Meson8 SoCs: - "amlogic,meson8-uart", "amlogic,meson-ao-uart" - "amlogic,meson8-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 schema. Fixes: 6ca7750 ("ARM: dts: meson8: use stable UART bindings with correct gate clock") Signed-off-by: Martin Blumenstingl <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 5225e1b commit 57007bf

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

arch/arm/boot/dts/meson8.dtsi

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -736,27 +736,27 @@
736736
};
737737

738738
&uart_AO {
739-
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
740-
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>;
741-
clock-names = "baud", "xtal", "pclk";
739+
compatible = "amlogic,meson8-uart", "amlogic,meson-ao-uart";
740+
clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
741+
clock-names = "xtal", "pclk", "baud";
742742
};
743743

744744
&uart_A {
745-
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
746-
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>;
747-
clock-names = "baud", "xtal", "pclk";
745+
compatible = "amlogic,meson8-uart";
746+
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
747+
clock-names = "xtal", "pclk", "baud";
748748
};
749749

750750
&uart_B {
751-
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
752-
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>;
753-
clock-names = "baud", "xtal", "pclk";
751+
compatible = "amlogic,meson8-uart";
752+
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
753+
clock-names = "xtal", "pclk", "baud";
754754
};
755755

756756
&uart_C {
757-
compatible = "amlogic,meson8-uart", "amlogic,meson-uart";
758-
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>;
759-
clock-names = "baud", "xtal", "pclk";
757+
compatible = "amlogic,meson8-uart";
758+
clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
759+
clock-names = "xtal", "pclk", "baud";
760760
};
761761

762762
&usb0 {

0 commit comments

Comments
 (0)