arm64: dts: qcom: pm8916: Rename &wcd_codec -> &pm8916_codec

All definitions in pm8916.dtsi use the &pm8916_ label prefix, 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>
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-5-bec0f5fb46fb@gerhold.net

diff --git a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
index 9081825c95746d5614e8ff7fa7308017bc6ecbb8..923646766ef1cf9ad07fc1471116988ae1bcfddd 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
+++ b/arch/arm64/boot/dts/qcom/apq8016-sbc.dts
@@ -324,6 +324,14 @@
        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 @@
                        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 @@
                        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 @@
        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 07f4c6398b41b4022a3df48d7c5522600a438ea1..e783b0af355e1cbfeb85f2eb37dc75a621a63628 100644 (file)
--- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts
+++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts
@@ -139,6 +139,13 @@
        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 @@
                        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 @@
                        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 @@
        };
 };
 
-&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 cbf53de44ef32bf1f1c00d549e7905e2962208fe..1334bfcf3ceebf008a42896317e790b39c4d3147 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
+++ b/arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts
@@ -222,6 +222,14 @@
        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 @@
                        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 @@
                        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 @@
        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 4e7289e6d22da5668e69994c34fcf129e92b751d..b1a7eafbee31f7a5ef957597237e56644ffd45cf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi
@@ -28,6 +28,12 @@
        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 @@
        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 864bb1cd68dbfd9eab1e99cbd46be3fdfdaa9806..1ea8920ff3694108672bdeea260ba587ed3e7303 100644 (file)
--- a/arch/arm64/boot/dts/qcom/pm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi
@@ -139,7 +139,7 @@
                        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";