arm64: dts: qcom: sc8280xp: rename qup2_uart17 to uart17

In preparation for adding the missing SPI and I2C nodes to
sc8280xp.dtsi, it was decided to rename all of the existing qupX_
uart, spi, and i2c nodes to drop the qupX_ prefix. Let's go ahead
and rename qup2_uart17 to uart17. Note that some nodes are moved in the
file by this patch to preserve the expected sort order in the file.

Signed-off-by: Brian Masney <bmasney@redhat.com>
Link: https://lore.kernel.org/lkml/20221212182314.1902632-1-bmasney@redhat.com/
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Johan Hovold <johan+linaro@kernel.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230103182229.37169-4-bmasney@redhat.com

diff --git a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
index 80cb18d..bb4270e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
+++ b/arch/arm64/boot/dts/qcom/sa8295p-adp.dts
@@ -18,7 +18,7 @@
        compatible = "qcom,sa8295p-adp", "qcom,sa8540p";
 
        aliases {
-               serial0 = &qup2_uart17;
+               serial0 = &uart17;
        };
 
        chosen {
@@ -480,11 +480,6 @@
        status = "okay";
 };
 
-&qup2_uart17 {
-       compatible = "qcom,geni-debug-uart";
-       status = "okay";
-};
-
 &remoteproc_adsp {
        firmware-name = "qcom/sa8540p/adsp.mbn";
        status = "okay";
@@ -500,6 +495,11 @@
        status = "okay";
 };
 
+&uart17 {
+       compatible = "qcom,geni-debug-uart";
+       status = "okay";
+};
+
 &ufs_mem_hc {
        reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;
 

diff --git a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts
index 455e295..b2d5dea 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sa8540p-ride.dts
+++ b/arch/arm64/boot/dts/qcom/sa8540p-ride.dts
@@ -17,7 +17,7 @@
        compatible = "qcom,sa8540p-ride", "qcom,sa8540p";
 
        aliases {
-               serial0 = &qup2_uart17;
+               serial0 = &uart17;
        };
 
        chosen {
@@ -192,11 +192,6 @@
        status = "okay";
 };
 
-&qup2_uart17 {
-       compatible = "qcom,geni-debug-uart";
-       status = "okay";
-};
-
 &remoteproc_nsp0 {
        firmware-name = "qcom/sa8540p/cdsp.mbn";
        status = "okay";
@@ -207,6 +202,11 @@
        status = "okay";
 };
 
+&uart17 {
+       compatible = "qcom,geni-debug-uart";
+       status = "okay";
+};
+
 &ufs_mem_hc {
        reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;
 

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
index 6f68637..19dbc5f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-crd.dts
@@ -17,7 +17,7 @@
        compatible = "qcom,sc8280xp-crd", "qcom,sc8280xp";
 
        aliases {
-               serial0 = &qup2_uart17;
+               serial0 = &uart17;
        };
 
        backlight: backlight {
@@ -436,12 +436,6 @@
        };
 };
 
-&qup2_uart17 {
-       compatible = "qcom,geni-debug-uart";
-
-       status = "okay";
-};
-
 &remoteproc_adsp {
        firmware-name = "qcom/sc8280xp/qcadsp8280.mbn";
 
@@ -454,6 +448,12 @@
        status = "okay";
 };
 
+&uart17 {
+       compatible = "qcom,geni-debug-uart";
+
+       status = "okay";
+};
+
 &ufs_mem_hc {
        reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;
 

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index abc45d1..29dd60d 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -826,7 +826,7 @@
 
                        status = "disabled";
 
-                       qup2_uart17: serial@884000 {
+                       uart17: serial@884000 {
                                compatible = "qcom,geni-uart";
                                reg = <0 0x00884000 0 0x4000>;
                                clocks = <&gcc GCC_QUPV3_WRAP2_S1_CLK>;