Commit c310ca82 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: msm8916/39: Rename &blsp1_uartN -> &blsp_uartN 



For some reason the BLSP UART controllers have a label with a number
behind blsp (&blsp1_uartN) while I2C/SPI are named without (&blsp_i2cN).
This is confusing, especially for proper node ordering in board DTs.

Right now all board DTs are ordered as if the number behind blsp does
not exist (&blsp_i2cN comes before &blsp1_uartN). Strictly speaking
correct ordering would be the other way around ('1' comes before '_').

End this confusion by giving the UART controllers consistent labels.
There is just one BLSP on MSM8916/39 so the number is redundant.

Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Reviewed-by: default avatarBryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230525-msm8916-labels-v1-2-bec0f5fb46fb@gerhold.net
parent 41e22c2f

arch/arm64/boot/dts/qcom/apq8016-sbc.dts

+4 −4
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ / { 
	compatible = "qcom,apq8016-sbc", "qcom,apq8016";



	aliases {

		serial0 = &blsp1_uart2;

		serial1 = &blsp1_uart1;

		serial0 = &blsp_uart2;

		serial1 = &blsp_uart1;

		usid0 = &pm8916_0;

		i2c0 = &blsp_i2c2;

		i2c1 = &blsp_i2c6;
@@ -243,12 +243,12 @@ &blsp_spi5 { 
	label = "LS-SPI0";

};



&blsp1_uart1 {

&blsp_uart1 {

	status = "okay";

	label = "LS-UART0";

};



&blsp1_uart2 {

&blsp_uart2 {

	status = "okay";

	label = "LS-UART1";

};

arch/arm64/boot/dts/qcom/apq8039-t2.dts

+6 −6
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ / { 
	aliases {

		mmc0 = &sdhc_1;

		mmc1 = &sdhc_2;

		serial0 = &blsp1_uart1;

		serial1 = &blsp1_uart2;

		serial0 = &blsp_uart1;

		serial1 = &blsp_uart2;

	};



	bl: backlight {
@@ -115,19 +115,19 @@ &blsp_i2c5 { 
	status = "okay";

};



&blsp1_uart1 {

&blsp_uart1 {

	status = "okay";

};



&blsp1_uart1_default {

&blsp_uart1_default {

	pins = "gpio0", "gpio1";

};



&blsp1_uart1_sleep {

&blsp_uart1_sleep {

	pins = "gpio0", "gpio1";

};



&blsp1_uart2 {

&blsp_uart2 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ / { 
	chassis-type = "tablet";



	aliases {

		serial0 = &blsp1_uart2;

		serial0 = &blsp_uart2;

	};



	chosen {
@@ -105,7 +105,7 @@ touchscreen@38 { 
	};

};



&blsp1_uart2 {

&blsp_uart2 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ / { 
	chassis-type = "handset";



	aliases {

		serial0 = &blsp1_uart2;

		serial0 = &blsp_uart2;

	};



	chosen {
@@ -56,7 +56,7 @@ usb_id: usb-id { 
	};

};



&blsp1_uart2 {

&blsp_uart2 {

	status = "okay";

};

arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ / { 
	chassis-type = "handset";



	aliases {

		serial0 = &blsp1_uart2;

		serial0 = &blsp_uart2;

	};



	chosen {
@@ -124,7 +124,7 @@ touchscreen@38 { 
	};

};



&blsp1_uart2 {

&blsp_uart2 {

	status = "okay";

};