diff mbox series

[5/6] arm64: dts: qcom: pm8916: Rename &wcd_codec -> &pm8916_codec

Message ID 20230525-msm8916-labels-v1-5-bec0f5fb46fb@gerhold.net
State New
Headers
Series arm64: dts: qcom: msm8916/39: Clean up labels |

Commit Message

Stephan Gerhold May 29, 2023, 12:47 p.m. UTC 
  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 <stephan@gerhold.net>
---
 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(-)

Comments

Bryan O'Donoghue May 29, 2023, 1:47 p.m. UTC | #1 
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 <stephan@gerhold.net>

Seems like a valid change but, consider amending your commit log.

Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Stephan Gerhold May 29, 2023, 3:07 p.m. UTC | #2 
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 <stephan@gerhold.net>
> 
> Seems like a valid change but, consider amending your commit log.
> 
> Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
> 

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
diff mbox series

Patch

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