MSM8916 and MSM8939 are very similar and almost fully "pin-compatible",
so there are some devices that exist in very similar variants with both
MSM8916 and MSM8939. To allow sharing definitions for such devices the
SoCs should be set up as similar as possible, e.g. using the same
labels. At least for me this will also simplify maintenance and review
because board DTs do not behave and/or look subtly different.
This series is the first part to clean up some old inconsistencies for
those SoCs to bring MSM8916 and MSM8939 closer together and also closer
to newer SoCs. The changes here are very minor and just focused on
labels. I'll have some more interesting changes (including fixes) later
but the series would have become too large.
There is no functional changes in any patch of this series.
Signed-off-by: Stephan Gerhold <[email protected]>
---
Stephan Gerhold (6):
arm64: dts: qcom: msm8916: Rename &msmgpio -> &tlmm
arm64: dts: qcom: msm8916/39: Rename &blsp1_uartN -> &blsp_uartN
arm64: dts: qcom: msm8916/39: Use consistent name for I2C/SPI pinctrl
arm64: dts: qcom: msm8916/39: Clean up MDSS labels
arm64: dts: qcom: pm8916: Rename &wcd_codec -> &pm8916_codec
arm64: dts: qcom: msm8916: Move aliases to boards
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 72 +--
arch/arm64/boot/dts/qcom/apq8039-t2.dts | 30 +-
arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 20 +-
.../boot/dts/qcom/msm8916-alcatel-idol347.dts | 30 +-
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 26 +-
arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 26 +-
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 60 +--
.../boot/dts/qcom/msm8916-longcheer-l8150.dts | 26 +-
.../boot/dts/qcom/msm8916-longcheer-l8910.dts | 22 +-
arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 4 +-
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 58 +--
arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 16 +-
.../dts/qcom/msm8916-samsung-a2015-common.dtsi | 56 +-
.../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 18 +-
.../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 +-
.../dts/qcom/msm8916-samsung-e2015-common.dtsi | 6 +-
.../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 +-
.../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 20 +-
arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 12 +-
arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 8 +-
.../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 22 +-
.../boot/dts/qcom/msm8916-samsung-serranove.dts | 48 +-
arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts | 8 +-
arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts | 10 +-
arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 9 +-
.../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 22 +-
.../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts | 8 +-
arch/arm64/boot/dts/qcom/msm8916.dtsi | 95 ++--
arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi | 10 +-
.../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8939.dtsi | 570 ++++++++++-----------
arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 +-
32 files changed, 675 insertions(+), 653 deletions(-)
---
base-commit: 048ca08c07e7be8b8df79af2d49a621fc69f7c3b
change-id: 20230525-msm8916-labels-2abf5d4074ce
Best regards,
--
Stephan Gerhold <[email protected]>
MSM8939 has the aliases defined separately for each board (because
there could be (theoretically) a board where the slots are numbered
differently. To make MSM8916 and MSM8939 more consistent do the same
for all MSM8916 boards and move aliases there.
Signed-off-by: Stephan Gerhold <[email protected]>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 2 ++
arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 2 ++
arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 2 ++
arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 1 +
arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts | 2 ++
arch/arm64/boot/dts/qcom/msm8916.dtsi | 5 -----
15 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 923646766ef1..56dfca61253e 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -18,6 +18,8 @@ / {
compatible = "qcom,apq8016-sbc", "qcom,apq8016";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
serial1 = &blsp_uart1;
usid0 = &pm8916_0;
diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index c864ce12c1f1..5025c08e4817 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -22,6 +22,8 @@ / {
chassis-type = "tablet";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index 47580bd243eb..7b629243ef0d 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -13,6 +13,8 @@ / {
chassis-type = "handset";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index ad71695652c2..b8c217b04a3b 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -13,6 +13,8 @@ / {
chassis-type = "handset";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
index a2be985052a5..56c42b0c9733 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
@@ -14,6 +14,8 @@ / {
chassis-type = "tablet";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index 1334bfcf3cee..175ca011998c 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -26,6 +26,8 @@ / {
chassis-type = "handset";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index facb44892dd5..9560ba632c6f 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -14,6 +14,8 @@ / {
chassis-type = "handset";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index 707288b7eca8..f23cfb2bf793 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -13,6 +13,8 @@ / {
chassis-type = "handset";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index b1af9c5d07b2..895036fb6eb8 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -8,6 +8,8 @@
/ {
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index 82d94d62fbe6..94cfb3200496 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -9,6 +9,8 @@
/ {
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
index 78935205ea9d..f2a5800f1605 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
@@ -7,6 +7,8 @@
/ {
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index bd1e1e1153c0..3637e7d80d0a 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -28,6 +28,8 @@ / {
chassis-type = "handset";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
index ac39ac6a21c1..dafa5bd82328 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
@@ -9,6 +9,7 @@ / {
chassis-type = "embedded";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 930318a443a8..733917531218 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -16,6 +16,8 @@ / {
chassis-type = "handset";
aliases {
+ mmc0 = &sdhc_1; /* eMMC */
+ mmc1 = &sdhc_2; /* SD card */
serial0 = &blsp_uart2;
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 0028a405e3ec..9494b6512d87 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -18,11 +18,6 @@ / {
#address-cells = <2>;
#size-cells = <2>;
- aliases {
- mmc0 = &sdhc_1; /* SDC1 eMMC slot */
- mmc1 = &sdhc_2; /* SDC2 SD card slot */
- };
-
chosen { };
memory@80000000 {
--
2.40.1
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 <[email protected]>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 8 ++++----
arch/arm64/boot/dts/qcom/apq8039-t2.dts | 12 ++++++------
arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 8 ++++----
.../boot/dts/qcom/msm8916-samsung-a2015-common.dtsi | 4 ++--
.../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 4 ++--
.../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 4 ++--
.../boot/dts/qcom/msm8916-samsung-serranove.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 4 ++--
.../arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts | 4 ++--
arch/arm64/boot/dts/qcom/msm8916.dtsi | 12 ++++++------
.../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 2 +-
arch/arm64/boot/dts/qcom/msm8939.dtsi | 20 ++++++++++----------
20 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 82f141b55eb3..19bf429a973e 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -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";
};
diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
index e75ee34cb014..07f4c6398b41 100644
--- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts
+++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
@@ -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";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
index 7b77a80f049c..c864ce12c1f1 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts
@@ -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";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
index d2abbdec5fe6..47580bd243eb 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-alcatel-idol347.dts
@@ -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";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
index c58a70fdf36f..ad71695652c2 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts
@@ -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";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
index 221db7edec5e..a2be985052a5 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts
@@ -14,7 +14,7 @@ / {
chassis-type = "tablet";
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -105,7 +105,7 @@ touchscreen@38 {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index b02e8f9a8ca0..cbf53de44ef3 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -26,7 +26,7 @@ / {
chassis-type = "handset";
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -210,7 +210,7 @@ nfc@28 {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
index 56f74a892764..facb44892dd5 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts
@@ -14,7 +14,7 @@ / {
chassis-type = "handset";
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -214,7 +214,7 @@ rmi4-f12@12 {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
index a1208c8e0620..707288b7eca8 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8910.dts
@@ -13,7 +13,7 @@ / {
chassis-type = "handset";
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -101,7 +101,7 @@ imu@68 {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
index 7c0ceb3cff45..438eb1faee1d 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-mtp.dts
@@ -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 @@ chosen {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
index 1e07f70768f4..3539d9029bed 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pins.dtsi
@@ -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 @@ blsp1_uart1_default: blsp1-uart1-default-state {
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 @@ blsp1_uart1_sleep: blsp1-uart1-sleep-state {
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 @@ blsp1_uart2_default: blsp1-uart2-default-state {
bias-disable;
};
- blsp1_uart2_sleep: blsp1-uart2-sleep-state {
+ blsp_uart2_sleep: blsp-uart2-sleep-state {
pins = "gpio4", "gpio5";
function = "gpio";
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
index 550ba6b9d4cd..497fc83803ef 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-a2015-common.dtsi
@@ -8,7 +8,7 @@
/ {
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -233,7 +233,7 @@ battery@35 {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
index cb1b6318a246..82d94d62fbe6 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-gt5-common.dtsi
@@ -9,7 +9,7 @@
/ {
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -111,7 +111,7 @@ accelerometer@1d {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
index b2d2bc205ef2..78935205ea9d 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi
@@ -7,7 +7,7 @@
/ {
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -84,7 +84,7 @@ muic: extcon@25 {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
index 13a1d8828447..bd1e1e1153c0 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-samsung-serranove.dts
@@ -28,7 +28,7 @@ / {
chassis-type = "handset";
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -259,7 +259,7 @@ touchscreen@20 {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
index f5613107ad1f..898722ee86a5 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi
@@ -9,7 +9,7 @@ / {
chassis-type = "embedded";
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -82,7 +82,7 @@ &bam_dmux_dma {
status = "okay";
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
index 12ce4dc236c6..930318a443a8 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-wingtech-wt88047.dts
@@ -16,7 +16,7 @@ / {
chassis-type = "handset";
aliases {
- serial0 = &blsp1_uart2;
+ serial0 = &blsp_uart2;
};
chosen {
@@ -140,7 +140,7 @@ led@2 {
};
};
-&blsp1_uart2 {
+&blsp_uart2 {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index 56f35015746b..8081e2611e3c 100644
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1599,7 +1599,7 @@ blsp_dma: dma-controller@7884000 {
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>;
@@ -1608,12 +1608,12 @@ blsp1_uart1: serial@78af000 {
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>;
@@ -1622,8 +1622,8 @@ blsp1_uart2: serial@78b0000 {
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";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
index 951d01674b78..85a8d8fe212f 100644
--- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
+++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts
@@ -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 {
diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi
index 778d24c8aee5..a44f7e829513 100644
--- a/arch/arm64/boot/dts/qcom/msm8939.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi
@@ -660,28 +660,28 @@ tlmm: pinctrl@1000000 {
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 @@ blsp_dma: dma-controller@7884000 {
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 @@ blsp1_uart1: serial@78af000 {
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 @@ blsp1_uart2: serial@78b0000 {
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";
};
--
2.40.1
All definitions in pm8916.dtsi use the &pm8916_ label suffix, only the
codec uses the &wcd_codec label. &wcd_codec is confusing because the
codec on MSM8916 is split into a "wcd-digital" and "wcd-analog" part
and both could be described with &wcd_codec.
Let's just name it &pm8916_codec so it's consistent with all other PMIC
device nodes.
Signed-off-by: Stephan Gerhold <[email protected]>
---
arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 20 ++++++++++----------
arch/arm64/boot/dts/qcom/apq8039-t2.dts | 18 +++++++++---------
arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 20 ++++++++++----------
arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi | 12 ++++++------
arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 +-
5 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 9081825c9574..923646766ef1 100644
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -324,6 +324,14 @@ &mpss {
firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
};
+&pm8916_codec {
+ status = "okay";
+ clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
+ clock-names = "mclk";
+ qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
+ qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
+};
+
&pm8916_resin {
status = "okay";
linux,code = <KEY_VOLUMEDOWN>;
@@ -403,7 +411,7 @@ cpu {
sound-dai = <&lpass MI2S_PRIMARY>;
};
codec {
- sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
+ sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
};
};
@@ -413,7 +421,7 @@ cpu {
sound-dai = <&lpass MI2S_TERTIARY>;
};
codec {
- sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
+ sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
};
};
};
@@ -431,14 +439,6 @@ &usb_hs_phy {
extcon = <&usb_id>;
};
-&wcd_codec {
- status = "okay";
- clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
- clock-names = "mclk";
- qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
- qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
-};
-
&wcnss {
status = "okay";
firmware-name = "qcom/apq8016/wcnss.mbn";
diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
index 07f4c6398b41..e783b0af355e 100644
--- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts
+++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
@@ -139,6 +139,13 @@ &mdss {
status = "okay";
};
+&pm8916_codec {
+ qcom,hphl-jack-type-normally-open;
+ qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
+ qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
+ status = "okay";
+};
+
&pm8916_gpios {
gpio-line-names =
"PM_GPIO1", /* WIFI_GPIO1_PRE */
@@ -265,7 +272,7 @@ cpu {
sound-dai = <&lpass MI2S_PRIMARY>;
};
codec {
- sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
+ sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
};
};
@@ -275,7 +282,7 @@ cpu {
sound-dai = <&lpass MI2S_TERTIARY>;
};
codec {
- sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
+ sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
};
};
};
@@ -476,13 +483,6 @@ otg_ep: endpoint {
};
};
-&wcd_codec {
- qcom,hphl-jack-type-normally-open;
- qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
- qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
- status = "okay";
-};
-
&wcnss {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
index cbf53de44ef3..1334bfcf3cee 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -222,6 +222,14 @@ &lpass_codec {
status = "okay";
};
+&pm8916_codec {
+ status = "okay";
+ qcom,micbias-lvl = <2800>;
+ qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
+ qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
+ qcom,hphl-jack-type-normally-open;
+};
+
&pm8916_l8 {
regulator-min-microvolt = <2950000>;
regulator-max-microvolt = <2950000>;
@@ -298,7 +306,7 @@ cpu {
sound-dai = <&lpass MI2S_PRIMARY>;
};
codec {
- sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
+ sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
};
};
@@ -308,7 +316,7 @@ cpu {
sound-dai = <&lpass MI2S_TERTIARY>;
};
codec {
- sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
+ sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
};
};
};
@@ -322,14 +330,6 @@ &usb_hs_phy {
extcon = <&usb_id>;
};
-&wcd_codec {
- status = "okay";
- qcom,micbias-lvl = <2800>;
- qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
- qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
- qcom,hphl-jack-type-normally-open;
-};
-
&wcnss {
status = "okay";
};
diff --git a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
index 4e7289e6d22d..b1a7eafbee31 100644
--- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
@@ -28,6 +28,12 @@ &mpss {
pll-supply = <&pm8916_l7>;
};
+&pm8916_codec {
+ vdd-cdc-io-supply = <&pm8916_l5>;
+ vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
+ vdd-micbias-supply = <&pm8916_l13>;
+};
+
&sdhc_1 {
vmmc-supply = <&pm8916_l8>;
vqmmc-supply = <&pm8916_l5>;
@@ -43,12 +49,6 @@ &usb_hs_phy {
v3p3-supply = <&pm8916_l13>;
};
-&wcd_codec {
- vdd-cdc-io-supply = <&pm8916_l5>;
- vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
- vdd-micbias-supply = <&pm8916_l13>;
-};
-
&wcnss {
vddpx-supply = <&pm8916_l7>;
};
diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi
index 864bb1cd68db..1ea8920ff369 100644
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -139,7 +139,7 @@ pm8916_vib: vibrator@c000 {
status = "disabled";
};
- wcd_codec: audio-codec@f000 {
+ pm8916_codec: audio-codec@f000 {
compatible = "qcom,pm8916-wcd-analog-codec";
reg = <0xf000>;
reg-names = "pmic-codec-core";
--
2.40.1
On 29/05/2023 13:46, Stephan Gerhold wrote:
> 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 <[email protected]>
> ---
Reviewed-by: Bryan O'Donoghue <[email protected]>
On 29/05/2023 13:47, Stephan Gerhold wrote:
> MSM8939 has the aliases defined separately for each board (because
> there could be (theoretically) a board where the slots are numbered
> differently. To make MSM8916 and MSM8939 more consistent do the same
> for all MSM8916 boards and move aliases there.
>
> Signed-off-by: Stephan Gerhold <[email protected]>
> ---
Reviewed-by: Bryan O'Donoghue <[email protected]>
On 29/05/2023 13:47, Stephan Gerhold wrote:
> All definitions in pm8916.dtsi use the &pm8916_ label suffix, only the
That's a prefix_ not a _suffix
> codec uses the &wcd_codec label. &wcd_codec is confusing because the
> codec on MSM8916 is split into a "wcd-digital" and "wcd-analog" part
> and both could be described with &wcd_codec.
>
> Let's just name it &pm8916_codec so it's consistent with all other PMIC
> device nodes.
I'm not sure that's really consistent throught the dts/yaml TBH but, I
do think the pm8196 name is more meaningful and clear.
What is wcd supposed to stand for anyway ? Its probably obvious but I
prefer pm8916_code since that *is* obvious.
> Signed-off-by: Stephan Gerhold <[email protected]>
Seems like a valid change but, consider amending your commit log.
Reviewed-by: Bryan O'Donoghue <[email protected]>
On Mon, May 29, 2023 at 02:47:30PM +0100, Bryan O'Donoghue wrote:
> On 29/05/2023 13:47, Stephan Gerhold wrote:
> > All definitions in pm8916.dtsi use the &pm8916_ label suffix, only the
>
> That's a prefix_ not a _suffix
>
Right, my bad :)
> > codec uses the &wcd_codec label. &wcd_codec is confusing because the
> > codec on MSM8916 is split into a "wcd-digital" and "wcd-analog" part
> > and both could be described with &wcd_codec.
> >
> > Let's just name it &pm8916_codec so it's consistent with all other PMIC
> > device nodes.
>
> I'm not sure that's really consistent throught the dts/yaml TBH but, I do
> think the pm8196 name is more meaningful and clear.
>
> What is wcd supposed to stand for anyway ? Its probably obvious but I prefer
> pm8916_code since that *is* obvious.
>
I think WCD is the typical prefix Qualcomm uses for its dedicated audio
codec chips. There is no WCD* chip on MSM8916/PM8916 because the codec
was split and integrated partly into the SoC and partly into the PMIC.
I guess the "wcd" name just survived for historical reasons.
Looking at "WCD9335 Audio Codec - Device Specification - LM80-P2751-29
Rev. A - Table 1-2 Terms and acronyms" apparently
WCD = WSP codec device
WSP = Wafer-scale package
WSA = WSP smart amplifier
> > Signed-off-by: Stephan Gerhold <[email protected]>
>
> Seems like a valid change but, consider amending your commit log.
>
> Reviewed-by: Bryan O'Donoghue <[email protected]>
>
Perhaps Bjorn can fix "prefix" -> "suffix" in the commit message when
applying, doesn't seem worth resending for that alone. (Will fix it of
course in case I send a v2 for other reasons!)
Thanks,
Stephan
On Mon, 29 May 2023 14:46:57 +0200, Stephan Gerhold wrote:
> MSM8916 and MSM8939 are very similar and almost fully "pin-compatible",
> so there are some devices that exist in very similar variants with both
> MSM8916 and MSM8939. To allow sharing definitions for such devices the
> SoCs should be set up as similar as possible, e.g. using the same
> labels. At least for me this will also simplify maintenance and review
> because board DTs do not behave and/or look subtly different.
>
> [...]
Applied, thanks!
[1/6] arm64: dts: qcom: msm8916: Rename &msmgpio -> &tlmm
commit: 41e22c2ff38eaea777f1158071539e659aa7980d
[2/6] arm64: dts: qcom: msm8916/39: Rename &blsp1_uartN -> &blsp_uartN
commit: c310ca82e229124e7b373125d82ea8fdbf2f9f81
[3/6] arm64: dts: qcom: msm8916/39: Use consistent name for I2C/SPI pinctrl
commit: fdfc21f65023dbbfe11dcd8f106230668ba8d9e5
[4/6] arm64: dts: qcom: msm8916/39: Clean up MDSS labels
commit: 835f939501769253eb7eb2dc5389b8592a63a3ed
[5/6] arm64: dts: qcom: pm8916: Rename &wcd_codec -> &pm8916_codec
commit: 274cf2bdd6c94da2bf293f5a6c9a5f712dd4b01e
[6/6] arm64: dts: qcom: msm8916: Move aliases to boards
commit: 154f23a8d70cd39158cfdcfb71c112f687352da4
Best regards,
--
Bjorn Andersson <[email protected]>