| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20230123151519.369158-1-krzysztof.kozlowski@linaro.org>
Date: Mon, 23 Jan 2023 16:15:18 +0100
From: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
To: Linus Walleij <linus.walleij@...aro.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
linux-arm-kernel@...ts.infradead.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org
Cc: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
Subject: [PATCH] ARM: dts: ste: align UART node name with bindings
Bindings expect UART/serial node names to be "serial".
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
---
arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 +++---
arch/arm/boot/dts/ste-href.dtsi | 6 +++---
arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +-
arch/arm/boot/dts/ste-nomadik-nhk15.dts | 2 +-
arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +-
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 6 +++---
arch/arm/boot/dts/ste-snowball.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-codina.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-gavini.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-golden.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-janice.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-kyle.dts | 6 +++---
arch/arm/boot/dts/ste-ux500-samsung-skomer.dts | 6 +++---
14 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/arch/arm/boot/dts/ste-dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index a42a4fd69299..ecfaf5a70403 100644
--- a/arch/arm/boot/dts/ste-dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -846,7 +846,7 @@ spi3: spi@...29000 {
status = "disabled";
};
- serial0: uart@...20000 {
+ serial0: serial@...20000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x80120000 0x1000>;
interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
@@ -862,7 +862,7 @@ serial0: uart@...20000 {
status = "disabled";
};
- serial1: uart@...21000 {
+ serial1: serial@...21000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x80121000 0x1000>;
interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -878,7 +878,7 @@ serial1: uart@...21000 {
status = "disabled";
};
- serial2: uart@...07000 {
+ serial2: serial@...07000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x80007000 0x1000>;
interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/ste-href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 8f1bb78fc1e4..2def50da9eb6 100644
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -45,7 +45,7 @@ bat_therm: thermistor {
};
soc {
- uart@...20000 {
+ serial@...20000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
@@ -53,13 +53,13 @@ uart@...20000 {
};
/* This UART is unused and thus left disabled */
- uart@...21000 {
+ serial@...21000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default>;
pinctrl-1 = <&u1rxtx_a_1_sleep>;
};
- uart@...07000 {
+ serial@...07000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
pinctrl-1 = <&u2rxtx_c_1_sleep>;
diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi
index 29b67abfc461..9859ee91a15e 100644
--- a/arch/arm/boot/dts/ste-hrefprev60.dtsi
+++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi
@@ -17,7 +17,7 @@ button@1 {
soc {
/* Enable UART1 on this board */
- uart@...21000 {
+ serial@...21000 {
status = "okay";
};
diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index 8142c017882c..d4bbe9729ced 100644
--- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@ -190,7 +190,7 @@ nomadik_clcd: endpoint {
};
/* Activate RX/TX and CTS/RTS on UART 0 */
- uart0: uart@...fd000 {
+ uart0: serial@...fd000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_nhk_mode>;
status = "okay";
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index f16314ffbf4b..c905c2643a12 100644
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -133,7 +133,7 @@ stw4811@2d {
amba {
/* Activate RXTX on UART 0 */
- uart0: uart@...fd000 {
+ uart0: serial@...fd000 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_s8815_mode>;
status = "okay";
diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index 1815361fe73c..6816eef39d45 100644
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -769,7 +769,7 @@ vicb: interrupt-controller@...40020 {
reg = <0x10140020 0x20>;
};
- uart0: uart@...fd000 {
+ uart0: serial@...fd000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101fd000 0x1000>;
interrupt-parent = <&vica>;
@@ -782,7 +782,7 @@ uart0: uart@...fd000 {
dma-names = "rx", "tx";
};
- uart1: uart@...fb000 {
+ uart1: serial@...fb000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101fb000 0x1000>;
interrupt-parent = <&vica>;
@@ -796,7 +796,7 @@ uart1: uart@...fb000 {
dma-names = "rx", "tx";
};
- uart2: uart@...f2000 {
+ uart2: serial@...f2000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x101f2000 0x1000>;
interrupt-parent = <&vica>;
diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index e2f0cdacba7d..9a3d6546399d 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -308,7 +308,7 @@ mmc@...14000 {
status = "okay";
};
- uart@...20000 {
+ serial@...20000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
@@ -316,13 +316,13 @@ uart@...20000 {
};
/* This UART is unused and thus left disabled */
- uart@...21000 {
+ serial@...21000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default>;
pinctrl-1 = <&u1rxtx_a_1_sleep>;
};
- uart@...07000 {
+ serial@...07000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
pinctrl-1 = <&u2rxtx_c_1_sleep>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts b/arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts
index e036393d5415..463942ae755e 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts
@@ -369,7 +369,7 @@ mmc@...05000 {
};
/* GBF (Bluetooth) UART */
- uart@...20000 {
+ serial@...20000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
@@ -393,7 +393,7 @@ bluetooth {
};
/* GPS UART */
- uart@...21000 {
+ serial@...21000 {
status = "okay";
pinctrl-names = "default", "sleep";
/* CTS/RTS is not used, CTS is repurposed as GPIO */
@@ -403,7 +403,7 @@ uart@...21000 {
};
/* Debugging console UART connected to AB8505 */
- uart@...07000 {
+ serial@...07000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-codina.dts b/arch/arm/boot/dts/ste-ux500-samsung-codina.dts
index 1a6d24a7ccb8..c1ae0e23fe45 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-codina.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-codina.dts
@@ -462,7 +462,7 @@ mmc@...05000 {
};
/* GBF (Bluetooth) UART */
- uart@...20000 {
+ serial@...20000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
@@ -485,7 +485,7 @@ bluetooth {
};
/* GPS UART */
- uart@...21000 {
+ serial@...21000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default &u1ctsrts_a_1_default>;
@@ -505,7 +505,7 @@ gnss {
};
/* Debugging console UART connected to TSU6111RSVR (FSA880) */
- uart@...07000 {
+ serial@...07000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts b/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
index 5b445fa4c8c0..b21e40da3dfd 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-gavini.dts
@@ -417,7 +417,7 @@ mmc@...05000 {
};
/* GBF (Bluetooth) UART */
- uart@...20000 {
+ serial@...20000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
@@ -439,7 +439,7 @@ bluetooth {
};
/* GPS UART */
- uart@...21000 {
+ serial@...21000 {
status = "okay";
pinctrl-names = "default", "sleep";
/* CTS/RTS is not used, CTS is repurposed as GPIO */
@@ -449,7 +449,7 @@ uart@...21000 {
};
/* Debugging console UART connected to TSU6111RSVR (FSA880) */
- uart@...07000 {
+ serial@...07000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
index 9604695edf53..f736888474e7 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-golden.dts
@@ -186,7 +186,7 @@ mmc@...05000 {
};
/* BT UART */
- uart@...20000 {
+ serial@...20000 {
status = "okay";
pinctrl-names = "default", "sleep";
@@ -209,7 +209,7 @@ bluetooth {
};
/* GPF UART */
- uart@...21000 {
+ serial@...21000 {
status = "okay";
pinctrl-names = "default", "sleep";
@@ -218,7 +218,7 @@ uart@...21000 {
};
/* Debugging console UART */
- uart@...07000 {
+ serial@...07000 {
status = "okay";
pinctrl-names = "default", "sleep";
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
index e901cb76b899..6e586e875565 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-janice.dts
@@ -467,7 +467,7 @@ mmc@...05000 {
};
/* GBF (Bluetooth) UART */
- uart@...20000 {
+ serial@...20000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
@@ -491,7 +491,7 @@ bluetooth {
};
/* GPS UART */
- uart@...21000 {
+ serial@...21000 {
status = "okay";
pinctrl-names = "default", "sleep";
/* CTS/RTS is not used, CTS is repurposed as GPIO */
@@ -520,7 +520,7 @@ gnss {
};
/* Debugging console UART connected to TSU6111RSVR (FSA880) */
- uart@...07000 {
+ serial@...07000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-kyle.dts b/arch/arm/boot/dts/ste-ux500-samsung-kyle.dts
index 45fab5283a9d..ba4421080b2a 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-kyle.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-kyle.dts
@@ -292,7 +292,7 @@ mmc@...05000 {
};
/* GBF (Bluetooth) UART */
- uart@...20000 {
+ serial@...20000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
@@ -310,7 +310,7 @@ bluetooth {
};
/* GPF UART */
- uart@...21000 {
+ serial@...21000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default &u1ctsrts_a_1_default>;
@@ -333,7 +333,7 @@ gnss {
};
/* Debugging console UART connected to AB8505 USB */
- uart@...07000 {
+ serial@...07000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
diff --git a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
index 93e5f5ed888d..064d6fee8821 100644
--- a/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
+++ b/arch/arm/boot/dts/ste-ux500-samsung-skomer.dts
@@ -271,7 +271,7 @@ mmc@...05000 {
};
/* GBF (Bluetooth) UART */
- uart@...20000 {
+ serial@...20000 {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u0_a_1_default>;
pinctrl-1 = <&u0_a_1_sleep>;
@@ -290,7 +290,7 @@ bluetooth {
};
/* GPS UART */
- uart@...21000 {
+ serial@...21000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u1rxtx_a_1_default &u1ctsrts_a_1_default>;
@@ -313,7 +313,7 @@ gnss {
};
/* Debugging console UART connected to AB8505 USB */
- uart@...07000 {
+ serial@...07000 {
status = "okay";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&u2rxtx_c_1_default>;
--
2.34.1
Powered by blists - more mailing lists