Skip to content

Commit bf43102

Browse files
Xianwei Zhaoroxanan1996
authored andcommitted
arm64: dts: amlogic: fix format for s4 uart node
BugLink: https://bugs.launchpad.net/bugs/2059284 [ Upstream commit eb54ef3 ] Aliases use lowercase letters and place status in end. Signed-off-by: Xianwei Zhao <xianwei.zhao@amlogic.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20231215-s4-dts-v1-1-7831ab6972be@amlogic.com Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent c323a8a commit bf43102

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

arch/arm64/boot/dts/amlogic/meson-s4-s805x2-aq222.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#size-cells = <2>;
1616

1717
aliases {
18-
serial0 = &uart_B;
18+
serial0 = &uart_b;
1919
};
2020

2121
memory@0 {
@@ -25,6 +25,6 @@
2525

2626
};
2727

28-
&uart_B {
28+
&uart_b {
2929
status = "okay";
3030
};

arch/arm64/boot/dts/amlogic/meson-s4.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@
118118
<10 11 12 13 14 15 16 17 18 19 20 21>;
119119
};
120120

121-
uart_B: serial@7a000 {
121+
uart_b: serial@7a000 {
122122
compatible = "amlogic,meson-s4-uart",
123123
"amlogic,meson-ao-uart";
124124
reg = <0x0 0x7a000 0x0 0x18>;
125125
interrupts = <GIC_SPI 169 IRQ_TYPE_EDGE_RISING>;
126-
status = "disabled";
127126
clocks = <&xtal>, <&xtal>, <&xtal>;
128127
clock-names = "xtal", "pclk", "baud";
128+
status = "disabled";
129129
};
130130

131131
reset: reset-controller@2000 {

0 commit comments

Comments
 (0)