Commit 5225e1b8 authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Neil Armstrong

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: ec9b5916 ("ARM: dts: meson6: use stable UART bindings")
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-2-martin.blumenstingl@googlemail.com
parent 72ccc373
...@@ -59,7 +59,7 @@ hwrng: rng@8100 { ...@@ -59,7 +59,7 @@ hwrng: rng@8100 {
}; };
uart_A: serial@84c0 { uart_A: serial@84c0 {
compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; compatible = "amlogic,meson6-uart";
reg = <0x84c0 0x18>; reg = <0x84c0 0x18>;
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
fifo-size = <128>; fifo-size = <128>;
...@@ -67,7 +67,7 @@ uart_A: serial@84c0 { ...@@ -67,7 +67,7 @@ uart_A: serial@84c0 {
}; };
uart_B: serial@84dc { uart_B: serial@84dc {
compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; compatible = "amlogic,meson6-uart";
reg = <0x84dc 0x18>; reg = <0x84dc 0x18>;
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
...@@ -105,7 +105,7 @@ saradc: adc@8680 { ...@@ -105,7 +105,7 @@ saradc: adc@8680 {
}; };
uart_C: serial@8700 { uart_C: serial@8700 {
compatible = "amlogic,meson6-uart", "amlogic,meson-uart"; compatible = "amlogic,meson6-uart";
reg = <0x8700 0x18>; reg = <0x8700 0x18>;
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
...@@ -228,7 +228,7 @@ ir_receiver: ir-receiver@480 { ...@@ -228,7 +228,7 @@ ir_receiver: ir-receiver@480 {
}; };
uart_AO: serial@4c0 { uart_AO: serial@4c0 {
compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart", "amlogic,meson-uart"; compatible = "amlogic,meson6-uart", "amlogic,meson-ao-uart";
reg = <0x4c0 0x18>; reg = <0x4c0 0x18>;
interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>; interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;
status = "disabled"; status = "disabled";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment