Commit 71bc1b42 authored by Brian Masney's avatar Brian Masney Committed by Bjorn Andersson
Browse files

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: default avatarBrian Masney <bmasney@redhat.com>
Link: https://lore.kernel.org/lkml/20221212182314.1902632-1-bmasney@redhat.com/


Reviewed-by: default avatarKonrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230103182229.37169-4-bmasney@redhat.com
parent 1d09705a

arch/arm64/boot/dts/qcom/sa8295p-adp.dts

+6 −6
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ / { 
	compatible = "qcom,sa8295p-adp", "qcom,sa8540p";



	aliases {

		serial0 = &qup2_uart17;

		serial0 = &uart17;

	};



	chosen {
@@ -480,11 +480,6 @@ &qup2 { 
	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 @@ &remoteproc_nsp1 { 
	status = "okay";

};



&uart17 {

	compatible = "qcom,geni-debug-uart";

	status = "okay";

};



&ufs_mem_hc {

	reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/qcom/sa8540p-ride.dts

+6 −6
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ / { 
	compatible = "qcom,sa8540p-ride", "qcom,sa8540p";



	aliases {

		serial0 = &qup2_uart17;

		serial0 = &uart17;

	};



	chosen {
@@ -192,11 +192,6 @@ &qup2 { 
	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 @@ &remoteproc_nsp1 { 
	status = "okay";

};



&uart17 {

	compatible = "qcom,geni-debug-uart";

	status = "okay";

};



&ufs_mem_hc {

	reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/qcom/sc8280xp-crd.dts

+7 −7
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ / { 
	compatible = "qcom,sc8280xp-crd", "qcom,sc8280xp";



	aliases {

		serial0 = &qup2_uart17;

		serial0 = &uart17;

	};



	backlight: backlight {
@@ -436,12 +436,6 @@ keyboard@68 { 
	};

};



&qup2_uart17 {

	compatible = "qcom,geni-debug-uart";



	status = "okay";

};



&remoteproc_adsp {

	firmware-name = "qcom/sc8280xp/qcadsp8280.mbn";
@@ -454,6 +448,12 @@ &remoteproc_nsp0 { 
	status = "okay";

};



&uart17 {

	compatible = "qcom,geni-debug-uart";



	status = "okay";

};



&ufs_mem_hc {

	reset-gpios = <&tlmm 228 GPIO_ACTIVE_LOW>;

arch/arm64/boot/dts/qcom/sc8280xp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ qup2: geniqup@8c0000 { 


			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>;