Skip to content

Commit 5225e1b

Browse files
xdarklightsuperna9999
authored andcommitted
ARM: dts: meson: Fix the UART compatible strings
The dt-bindings for the UART controller only allow the following values for Meson6 SoCs: - "amlogic,meson6-uart", "amlogic,meson-ao-uart" - "amlogic,meson6-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. Fixes: ec9b591 ("ARM: dts: meson6: use stable UART bindings") Signed-off-by: Martin Blumenstingl <[email protected]> Signed-off-by: Neil Armstrong <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 72ccc37 commit 5225e1b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/arm/boot/dts/meson.dtsi

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@
5959
};
6060

6161
uart_A: serial@84c0 {
62-
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
62+
compatible = "amlogic,meson6-uart";
6363
reg = <0x84c0 0x18>;
6464
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
6565
fifo-size = <128>;
6666
status = "disabled";
6767
};
6868

6969
uart_B: serial@84dc {
70-
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
70+
compatible = "amlogic,meson6-uart";
7171
reg = <0x84dc 0x18>;
7272
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
7373
status = "disabled";
@@ -105,7 +105,7 @@
105105
};
106106

107107
uart_C: serial@8700 {
108-
compatible = "amlogic,meson6-uart", "amlogic,meson-uart";
108+
compatible = "amlogic,meson6-uart";
109109
reg = <0x8700 0x18>;
110110
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
111111
status = "disabled";
@@ -228,7 +228,7 @@
228228
};
229229

230230
uart_AO: serial@4c0 {
231-
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart";
231+
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart";
232232
reg = <0x4c0 0x18>;
233233
interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
234234
status = "disabled";

0 commit comments

Comments
 (0)