arch/arm/boot/dts/integrator.dtsi | 4 ++-- arch/arm/boot/dts/integratorap-im-pd1.dts | 4 ++-- arch/arm/boot/dts/integratorap.dts | 4 ++-- arch/arm/boot/dts/integratorcp.dts | 4 ++-- arch/arm/boot/dts/versatile-ab.dts | 6 +++--- arch/arm/boot/dts/versatile-pb.dts | 2 +- arch/arm/boot/dts/vexpress-v2m.dtsi | 8 ++++---- 7 files changed, 16 insertions(+), 16 deletions(-)
Bindings expect UART/serial node names to be "serial".
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
arch/arm/boot/dts/integrator.dtsi | 4 ++--
arch/arm/boot/dts/integratorap-im-pd1.dts | 4 ++--
arch/arm/boot/dts/integratorap.dts | 4 ++--
arch/arm/boot/dts/integratorcp.dts | 4 ++--
arch/arm/boot/dts/versatile-ab.dts | 6 +++---
arch/arm/boot/dts/versatile-pb.dts | 2 +-
arch/arm/boot/dts/vexpress-v2m.dtsi | 8 ++++----
7 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/integrator.dtsi b/arch/arm/boot/dts/integrator.dtsi
index ad868cfebc94..7f1c8ee9dd8a 100644
--- a/arch/arm/boot/dts/integrator.dtsi
+++ b/arch/arm/boot/dts/integrator.dtsi
@@ -88,12 +88,12 @@ rtc@15000000 {
interrupts = <8>;
};
- uart@16000000 {
+ serial@16000000 {
reg = <0x16000000 0x1000>;
interrupts = <1>;
};
- uart@17000000 {
+ serial@17000000 {
reg = <0x17000000 0x1000>;
interrupts = <2>;
};
diff --git a/arch/arm/boot/dts/integratorap-im-pd1.dts b/arch/arm/boot/dts/integratorap-im-pd1.dts
index cc514cf07bff..7072a70da00d 100644
--- a/arch/arm/boot/dts/integratorap-im-pd1.dts
+++ b/arch/arm/boot/dts/integratorap-im-pd1.dts
@@ -162,7 +162,7 @@ vga_con_in: endpoint {
};
};
- uart@100000 {
+ serial@100000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x00100000 0x1000>;
interrupts-extended = <&impd1_vic 1>;
@@ -170,7 +170,7 @@ uart@100000 {
clock-names = "uartclk", "apb_pclk";
};
- uart@200000 {
+ serial@200000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x00200000 0x1000>;
interrupts-extended = <&impd1_vic 2>;
diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts
index 9148287fa0a9..5b52d75bc6be 100644
--- a/arch/arm/boot/dts/integratorap.dts
+++ b/arch/arm/boot/dts/integratorap.dts
@@ -218,14 +218,14 @@ rtc: rtc@15000000 {
clock-names = "apb_pclk";
};
- uart0: uart@16000000 {
+ uart0: serial@16000000 {
compatible = "arm,pl010", "arm,primecell";
arm,primecell-periphid = <0x00041010>;
clocks = <&uartclk>, <&pclk>;
clock-names = "uartclk", "apb_pclk";
};
- uart1: uart@17000000 {
+ uart1: serial@17000000 {
compatible = "arm,pl010", "arm,primecell";
arm,primecell-periphid = <0x00041010>;
clocks = <&uartclk>, <&pclk>;
diff --git a/arch/arm/boot/dts/integratorcp.dts b/arch/arm/boot/dts/integratorcp.dts
index 38fc7e81bdb6..c011333eb165 100644
--- a/arch/arm/boot/dts/integratorcp.dts
+++ b/arch/arm/boot/dts/integratorcp.dts
@@ -244,13 +244,13 @@ rtc@15000000 {
clock-names = "apb_pclk";
};
- uart@16000000 {
+ serial@16000000 {
compatible = "arm,pl011", "arm,primecell";
clocks = <&uartclk>, <&pclk>;
clock-names = "uartclk", "apb_pclk";
};
- uart@17000000 {
+ serial@17000000 {
compatible = "arm,pl011", "arm,primecell";
clocks = <&uartclk>, <&pclk>;
clock-names = "uartclk", "apb_pclk";
diff --git a/arch/arm/boot/dts/versatile-ab.dts b/arch/arm/boot/dts/versatile-ab.dts
index a520615f4d8d..f31dcf7e5862 100644
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -237,7 +237,7 @@ dma@10130000 {
clock-names = "apb_pclk";
};
- uart0: uart@101f1000 {
+ uart0: serial@101f1000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101f1000 0x1000>;
interrupts = <12>;
@@ -245,7 +245,7 @@ uart0: uart@101f1000 {
clock-names = "uartclk", "apb_pclk";
};
- uart1: uart@101f2000 {
+ uart1: serial@101f2000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101f2000 0x1000>;
interrupts = <13>;
@@ -253,7 +253,7 @@ uart1: uart@101f2000 {
clock-names = "uartclk", "apb_pclk";
};
- uart2: uart@101f3000 {
+ uart2: serial@101f3000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101f3000 0x1000>;
interrupts = <14>;
diff --git a/arch/arm/boot/dts/versatile-pb.dts b/arch/arm/boot/dts/versatile-pb.dts
index e7e751a858d8..fc21ce54b33a 100644
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -85,7 +85,7 @@ mmc@5000 {
*/
interrupts-extended = <&sic 22 &sic 23>;
};
- uart@9000 {
+ serial@9000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x9000 0x1000>;
interrupt-parent = <&sic>;
diff --git a/arch/arm/boot/dts/vexpress-v2m.dtsi b/arch/arm/boot/dts/vexpress-v2m.dtsi
index def538ce8769..c5e92f6d2fcd 100644
--- a/arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/arch/arm/boot/dts/vexpress-v2m.dtsi
@@ -216,7 +216,7 @@ kmi@7000 {
clock-names = "KMIREFCLK", "apb_pclk";
};
- v2m_serial0: uart@9000 {
+ v2m_serial0: serial@9000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x09000 0x1000>;
interrupts = <5>;
@@ -224,7 +224,7 @@ v2m_serial0: uart@9000 {
clock-names = "uartclk", "apb_pclk";
};
- v2m_serial1: uart@a000 {
+ v2m_serial1: serial@a000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0a000 0x1000>;
interrupts = <6>;
@@ -232,7 +232,7 @@ v2m_serial1: uart@a000 {
clock-names = "uartclk", "apb_pclk";
};
- v2m_serial2: uart@b000 {
+ v2m_serial2: serial@b000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0b000 0x1000>;
interrupts = <7>;
@@ -240,7 +240,7 @@ v2m_serial2: uart@b000 {
clock-names = "uartclk", "apb_pclk";
};
- v2m_serial3: uart@c000 {
+ v2m_serial3: serial@c000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x0c000 0x1000>;
interrupts = <8>;
--
2.34.1On Mon, 23 Jan 2023 16:15:33 +0100, Krzysztof Kozlowski wrote:
> Bindings expect UART/serial node names to be "serial".
>
>
Applied, thanks!
[1/1] ARM: dts: arm: align UART node name with bindings
https://git.kernel.org/krzk/linux-dt/c/cba9e7dbf1119e9f11cef0379a88c42a92029bde
Best regards,
--
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
On Mon, Jan 23, 2023 at 4:15 PM Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > Bindings expect UART/serial node names to be "serial". > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Whoa! This traces back to things like commit 3ba7222ac992d24d09ccd0b55940b54849eef752 "arm/versatile: Add device tree support" Grant Likely june 2011 :D Nice that we put things in order finally. Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Do you have a way to queue this to the SoC tree for v6.3? Yours, Linus Walleij
On 26/01/2023 11:02, Linus Walleij wrote: > On Mon, Jan 23, 2023 at 4:15 PM Krzysztof Kozlowski > <krzysztof.kozlowski@linaro.org> wrote: > >> Bindings expect UART/serial node names to be "serial". >> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > Whoa! This traces back to things like > commit 3ba7222ac992d24d09ccd0b55940b54849eef752 > "arm/versatile: Add device tree support" > Grant Likely june 2011 :D > > Nice that we put things in order finally. > > Reviewed-by: Linus Walleij <linus.walleij@linaro.org> > > Do you have a way to queue this to the SoC tree for v6.3? Yes, I can grab it and send it with few other cleanups. So far my cleanup-pulls were not rejected. But if any other or respective SoC maintainer can pick it up, this would be preferred (less conflicts, less work for me...). Best regards, Krzysztof
On Mon, Jan 23, 2023 at 04:15:33PM +0100, Krzysztof Kozlowski wrote: > Bindings expect UART/serial node names to be "serial". > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- [...] > arch/arm/boot/dts/vexpress-v2m.dtsi | 8 ++++---- For the above file: Acked-by: Sudeep Holla <sudeep.holla@arm.com> -- Regards, Sudeep
© 2016 - 2025 Red Hat, Inc.