mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-06 08:47:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Stephan Gerhold
2023-05-29 14:47:02 +02:00
committed by Bjorn Andersson
parent 835f939501
commit 274cf2bdd6
5 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

2
arch/arm64/boot/dts/qcom/pm8916.dtsi
View File

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