Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-01 02:21:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge "ARM: dts: msm: fix audio gpio conflict with uart in 8909 cdp"

Browse source
This commit is contained in:
Linux Build Service Account 2015-04-08 22:12:19 -07:00 committed by Gerrit - the friendly Code Review server
commit a1b563bb2f
2 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/boot/dts/qcom/msm8909-cdp.dtsi
View file

@ -242,11 +242,9 @@
"cdc_lines_sec_ext_act",
"cdc_lines_sec_ext_sus",
"cdc_lines_quat_ext_act",
"cdc_lines_quat_ext_sus",
"vdd_spkdrv_act",
"vdd_spkdrv_sus";
pinctrl-0 = <&cdc_pdm_lines_act &vdd_spkdrv_act>;
pinctrl-1 = <&cdc_pdm_lines_sus &vdd_spkdrv_sus>;
"cdc_lines_quat_ext_sus";
pinctrl-0 = <&cdc_pdm_lines_act>;
pinctrl-1 = <&cdc_pdm_lines_sus>;
pinctrl-2 = <&cross_conn_det_act>;
pinctrl-3 = <&cross_conn_det_sus>;
pinctrl-4 = <&cdc_pdm_lines_act &cdc_ext_pa_act

12
arch/arm/boot/dts/qcom/msm8909-pm8909-cdp.dtsi
View file

@ -106,18 +106,6 @@
qcom,msm-micbias2-ext-cap;
};
&spk_vreg {
status = "okay";
};
&pm8909_conga_dig {
cdc-vdd-spkdrv-supply = <&spk_vreg>;
qcom,cdc-vdd-spkdrv-voltage = <5000000 5000000>;
qcom,cdc-vdd-spkdrv-current = <20000>;
qcom,cdc-on-demand-supplies = "cdc-vdd-mic-bias",
"cdc-vdd-spkdrv";
};
&wcnss {
qcom,wcnss-vadc = <&pm8909_vadc>;
};