xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ Upstream commit 57007bfb5469ba31cacf69d52195e8b75f43e32d ]

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: 6ca7750205 ("ARM: dts: meson8: use stable UART bindings with correct gate clock")
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Link: https://lore.kernel.org/r/20211227180026.4068352-3-martin.blumenstingl@googlemail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Martin Blumenstingl
2021-12-27 19:00:25 +01:00
committed by Greg Kroah-Hartman
parent 210d70f081
commit 566b558e94
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/boot/dts/meson8.dtsi
View File

@@ -598,27 +598,27 @@
}; };
&uart_AO { &uart_AO {
compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; compatible = "amlogic,meson8-uart", "amlogic,meson-ao-uart";
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_CLK81>; clocks = <&xtal>, <&clkc CLKID_CLK81>, <&clkc CLKID_CLK81>;
clock-names = "baud", "xtal", "pclk"; clock-names = "xtal", "pclk", "baud";
}; };
&uart_A { &uart_A {
compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; compatible = "amlogic,meson8-uart";
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART0>; clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
clock-names = "baud", "xtal", "pclk"; clock-names = "xtal", "pclk", "baud";
}; };
&uart_B { &uart_B {
compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; compatible = "amlogic,meson8-uart";
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART1>; clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
clock-names = "baud", "xtal", "pclk"; clock-names = "xtal", "pclk", "baud";
}; };
&uart_C { &uart_C {
compatible = "amlogic,meson8-uart", "amlogic,meson-uart"; compatible = "amlogic,meson8-uart";
clocks = <&clkc CLKID_CLK81>, <&xtal>, <&clkc CLKID_UART2>; clocks = <&xtal>, <&clkc CLKID_UART0>, <&clkc CLKID_CLK81>;
clock-names = "baud", "xtal", "pclk"; clock-names = "xtal", "pclk", "baud";
}; };
&usb0 { &usb0 {