Skip to content

Commit 274cf2b

Browse files
stephan-ghandersson
stephan-gh
authored and
andersson
committed
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
1 parent 835f939 commit 274cf2b

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,14 @@
324324
firmware-name = "qcom/apq8016/mba.mbn", "qcom/apq8016/modem.mbn";
325325
};
326326

327+
&pm8916_codec {
328+
status = "okay";
329+
clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
330+
clock-names = "mclk";
331+
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
332+
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
333+
};
334+
327335
&pm8916_resin {
328336
status = "okay";
329337
linux,code = <KEY_VOLUMEDOWN>;
@@ -403,7 +411,7 @@
403411
sound-dai = <&lpass MI2S_PRIMARY>;
404412
};
405413
codec {
406-
sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
414+
sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
407415
};
408416
};
409417

@@ -413,7 +421,7 @@
413421
sound-dai = <&lpass MI2S_TERTIARY>;
414422
};
415423
codec {
416-
sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
424+
sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
417425
};
418426
};
419427
};
@@ -431,14 +439,6 @@
431439
extcon = <&usb_id>;
432440
};
433441

434-
&wcd_codec {
435-
status = "okay";
436-
clocks = <&gcc GCC_CODEC_DIGCODEC_CLK>;
437-
clock-names = "mclk";
438-
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
439-
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
440-
};
441-
442442
&wcnss {
443443
status = "okay";
444444
firmware-name = "qcom/apq8016/wcnss.mbn";

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,13 @@
139139
status = "okay";
140140
};
141141

142+
&pm8916_codec {
143+
qcom,hphl-jack-type-normally-open;
144+
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
145+
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
146+
status = "okay";
147+
};
148+
142149
&pm8916_gpios {
143150
gpio-line-names =
144151
"PM_GPIO1", /* WIFI_GPIO1_PRE */
@@ -265,7 +272,7 @@
265272
sound-dai = <&lpass MI2S_PRIMARY>;
266273
};
267274
codec {
268-
sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
275+
sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
269276
};
270277
};
271278

@@ -275,7 +282,7 @@
275282
sound-dai = <&lpass MI2S_TERTIARY>;
276283
};
277284
codec {
278-
sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
285+
sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
279286
};
280287
};
281288
};
@@ -476,13 +483,6 @@
476483
};
477484
};
478485

479-
&wcd_codec {
480-
qcom,hphl-jack-type-normally-open;
481-
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
482-
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
483-
status = "okay";
484-
};
485-
486486
&wcnss {
487487
status = "okay";
488488
};

‎arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,14 @@
222222
status = "okay";
223223
};
224224

225+
&pm8916_codec {
226+
status = "okay";
227+
qcom,micbias-lvl = <2800>;
228+
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
229+
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
230+
qcom,hphl-jack-type-normally-open;
231+
};
232+
225233
&pm8916_l8 {
226234
regulator-min-microvolt = <2950000>;
227235
regulator-max-microvolt = <2950000>;
@@ -298,7 +306,7 @@
298306
sound-dai = <&lpass MI2S_PRIMARY>;
299307
};
300308
codec {
301-
sound-dai = <&lpass_codec 0>, <&wcd_codec 0>;
309+
sound-dai = <&lpass_codec 0>, <&pm8916_codec 0>;
302310
};
303311
};
304312

@@ -308,7 +316,7 @@
308316
sound-dai = <&lpass MI2S_TERTIARY>;
309317
};
310318
codec {
311-
sound-dai = <&lpass_codec 1>, <&wcd_codec 1>;
319+
sound-dai = <&lpass_codec 1>, <&pm8916_codec 1>;
312320
};
313321
};
314322
};
@@ -322,14 +330,6 @@
322330
extcon = <&usb_id>;
323331
};
324332

325-
&wcd_codec {
326-
status = "okay";
327-
qcom,micbias-lvl = <2800>;
328-
qcom,mbhc-vthreshold-low = <75 150 237 450 500>;
329-
qcom,mbhc-vthreshold-high = <75 150 237 450 500>;
330-
qcom,hphl-jack-type-normally-open;
331-
};
332-
333333
&wcnss {
334334
status = "okay";
335335
};

‎arch/arm64/boot/dts/qcom/msm8916-pm8916.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
pll-supply = <&pm8916_l7>;
2929
};
3030

31+
&pm8916_codec {
32+
vdd-cdc-io-supply = <&pm8916_l5>;
33+
vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
34+
vdd-micbias-supply = <&pm8916_l13>;
35+
};
36+
3137
&sdhc_1 {
3238
vmmc-supply = <&pm8916_l8>;
3339
vqmmc-supply = <&pm8916_l5>;
@@ -43,12 +49,6 @@
4349
v3p3-supply = <&pm8916_l13>;
4450
};
4551

46-
&wcd_codec {
47-
vdd-cdc-io-supply = <&pm8916_l5>;
48-
vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>;
49-
vdd-micbias-supply = <&pm8916_l13>;
50-
};
51-
5252
&wcnss {
5353
vddpx-supply = <&pm8916_l7>;
5454
};

‎arch/arm64/boot/dts/qcom/pm8916.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
status = "disabled";
140140
};
141141

142-
wcd_codec: audio-codec@f000 {
142+
pm8916_codec: audio-codec@f000 {
143143
compatible = "qcom,pm8916-wcd-analog-codec";
144144
reg = <0xf000>;
145145
reg-names = "pmic-codec-core";

0 commit comments

Comments
 (0)