shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 10:58:48 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230525-msm8916-labels-v1-2-bec0f5fb46fb@gerhold.net
This commit is contained in:
Stephan Gerhold
2023-05-29 14:46:59 +02:00
committed by Bjorn Andersson
parent 41e22c2ff3
commit c310ca82e2
20 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm64/boot/dts/qcom/apq8016-sbc.dts
View File

@@ -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 @@
label = "LS-SPI0";
};
&blsp1_uart1 {
&blsp_uart1 {
status = "okay";
label = "LS-UART0";
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
label = "LS-UART1";
};

12
arch/arm64/boot/dts/qcom/apq8039-t2.dts
View File

@@ -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 @@
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";
};

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

@@ -22,7 +22,7 @@
chassis-type = "tablet";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -105,7 +105,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
View File

@@ -13,7 +13,7 @@
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -56,7 +56,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
View File

@@ -13,7 +13,7 @@
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -124,7 +124,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
View File

@@ -14,7 +14,7 @@
chassis-type = "tablet";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -105,7 +105,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
View File

@@ -26,7 +26,7 @@
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -210,7 +210,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
View File

@@ -14,7 +14,7 @@
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -214,7 +214,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
View File

@@ -13,7 +13,7 @@
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -101,7 +101,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-mtp.dts
View File

@@ -12,7 +12,7 @@
compatible = "qcom,msm8916-mtp", "qcom,msm8916-mtp/1", "qcom,msm8916";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
usid0 = &pm8916_0;
};
@@ -21,6 +21,6 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

8
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
View File

@@ -5,7 +5,7 @@
&tlmm {
blsp1_uart1_default: blsp1-uart1-default-state {
blsp_uart1_default: blsp-uart1-default-state {
/* TX, RX, CTS_N, RTS_N */
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "blsp_uart1";
@@ -14,7 +14,7 @@
bias-disable;
};
blsp1_uart1_sleep: blsp1-uart1-sleep-state {
blsp_uart1_sleep: blsp-uart1-sleep-state {
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "gpio";
@@ -22,7 +22,7 @@
bias-pull-down;
};
blsp1_uart2_default: blsp1-uart2-default-state {
blsp_uart2_default: blsp-uart2-default-state {
pins = "gpio4", "gpio5";
function = "blsp_uart2";
@@ -30,7 +30,7 @@
bias-disable;
};
blsp1_uart2_sleep: blsp1-uart2-sleep-state {
blsp_uart2_sleep: blsp-uart2-sleep-state {
pins = "gpio4", "gpio5";
function = "gpio";

4
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
View File

@@ -8,7 +8,7 @@
/ {
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -233,7 +233,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
View File

@@ -9,7 +9,7 @@
/ {
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -111,7 +111,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
View File

@@ -7,7 +7,7 @@
/ {
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -84,7 +84,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
View File

@@ -28,7 +28,7 @@
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -259,7 +259,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
View File

@@ -9,7 +9,7 @@
chassis-type = "embedded";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -82,7 +82,7 @@
status = "okay";
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

4
arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
View File

@@ -16,7 +16,7 @@
chassis-type = "handset";
aliases {
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {
@@ -140,7 +140,7 @@
};
};
&blsp1_uart2 {
&blsp_uart2 {
status = "okay";
};

12
arch/arm64/boot/dts/qcom/msm8916.dtsi
View File

@@ -1598,7 +1598,7 @@
qcom,ee = <0>;
};
blsp1_uart1: serial@78af000 {
blsp_uart1: serial@78af000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0x078af000 0x200>;
interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
@@ -1607,12 +1607,12 @@
dmas = <&blsp_dma 0>, <&blsp_dma 1>;
dma-names = "tx", "rx";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&blsp1_uart1_default>;
pinctrl-1 = <&blsp1_uart1_sleep>;
pinctrl-0 = <&blsp_uart1_default>;
pinctrl-1 = <&blsp_uart1_sleep>;
status = "disabled";
};
blsp1_uart2: serial@78b0000 {
blsp_uart2: serial@78b0000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0x078b0000 0x200>;
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -1621,8 +1621,8 @@
dmas = <&blsp_dma 2>, <&blsp_dma 3>;
dma-names = "tx", "rx";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&blsp1_uart2_default>;
pinctrl-1 = <&blsp1_uart2_sleep>;
pinctrl-0 = <&blsp_uart2_default>;
pinctrl-1 = <&blsp_uart2_sleep>;
status = "disabled";
};

2
arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
View File

@@ -23,7 +23,7 @@
aliases {
mmc0 = &sdhc_1; /* SDC1 eMMC slot */
mmc1 = &sdhc_2; /* SDC2 SD card slot */
serial0 = &blsp1_uart2;
serial0 = &blsp_uart2;
};
chosen {

20
arch/arm64/boot/dts/qcom/msm8939.dtsi
View File

@@ -660,28 +660,28 @@
interrupt-controller;
#interrupt-cells = <2>;
blsp1_uart1_default: blsp1-uart1-default-state {
blsp_uart1_default: blsp-uart1-default-state {
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "blsp_uart1";
drive-strength = <16>;
bias-disable;
};
blsp1_uart1_sleep: blsp1-uart1-sleep-state {
blsp_uart1_sleep: blsp-uart1-sleep-state {
pins = "gpio0", "gpio1", "gpio2", "gpio3";
function = "gpio";
drive-strength = <2>;
bias-pull-down;
};
blsp1_uart2_default: blsp1-uart2-default-state {
blsp_uart2_default: blsp-uart2-default-state {
pins = "gpio4", "gpio5";
function = "blsp_uart2";
drive-strength = <16>;
bias-disable;
};
blsp1_uart2_sleep: blsp1-uart2-sleep-state {
blsp_uart2_sleep: blsp-uart2-sleep-state {
pins = "gpio4", "gpio5";
function = "gpio";
drive-strength = <2>;
@@ -1679,7 +1679,7 @@
qcom,ee = <0>;
};
blsp1_uart1: serial@78af000 {
blsp_uart1: serial@78af000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0x078af000 0x200>;
interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
@@ -1687,13 +1687,13 @@
clock-names = "core", "iface";
dmas = <&blsp_dma 0>, <&blsp_dma 1>;
dma-names = "tx", "rx";
pinctrl-0 = <&blsp1_uart1_default>;
pinctrl-1 = <&blsp1_uart1_sleep>;
pinctrl-0 = <&blsp_uart1_default>;
pinctrl-1 = <&blsp_uart1_sleep>;
pinctrl-names = "default", "sleep";
status = "disabled";
};
blsp1_uart2: serial@78b0000 {
blsp_uart2: serial@78b0000 {
compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm";
reg = <0x078b0000 0x200>;
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
@@ -1701,8 +1701,8 @@
clock-names = "core", "iface";
dmas = <&blsp_dma 2>, <&blsp_dma 3>;
dma-names = "tx", "rx";
pinctrl-0 = <&blsp1_uart2_default>;
pinctrl-1 = <&blsp1_uart2_sleep>;
pinctrl-0 = <&blsp_uart2_default>;
pinctrl-1 = <&blsp_uart2_sleep>;
pinctrl-names = "default", "sleep";
status = "disabled";
};