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

Commit 54f556dc authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Greg Kroah-Hartman
Browse files

ARM: dts: meson: Fix the UART compatible strings 



[ Upstream commit 5225e1b87432dcf0d0fc3440824b91d04c1d6cc1 ]

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


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7ae6c390

arch/arm/boot/dts/meson.dtsi

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



			uart_A: serial@84c0 {

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

				compatible = "amlogic,meson6-uart";

				reg = <0x84c0 0x18>;

				interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";

			};



			uart_B: serial@84dc {

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

				compatible = "amlogic,meson6-uart";

				reg = <0x84dc 0x18>;

				interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";
@@ -136,7 +136,7 @@ 
			};



			uart_C: serial@8700 {

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

				compatible = "amlogic,meson6-uart";

				reg = <0x8700 0x18>;

				interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";
@@ -219,7 +219,7 @@ 
			};



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

				interrupts = <GIC_SPI 90 IRQ_TYPE_EDGE_RISING>;

				status = "disabled";