evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ARM: dts: msm: update speaker left and right GPIOs for APQ8998"

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

18
arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts
View file

@ -28,3 +28,21 @@
&mdss_mdp { &mdss_mdp {
qcom,mdss-pref-prim-intf = "hdmi"; qcom,mdss-pref-prim-intf = "hdmi";
}; };
&slim_aud {
tasha_codec {
wsa_spkr_sd1: msm_cdc_pinctrll {
compatible = "qcom,msm-cdc-pinctrl";
pinctrl-names = "aud_active", "aud_sleep";
pinctrl-0 = <&spkr_1_sd_active_mediabox>;
pinctrl-1 = <&spkr_1_sd_sleep_mediabox>;
};
wsa_spkr_sd2: msm_cdc_pinctrlr {
compatible = "qcom,msm-cdc-pinctrl";
pinctrl-names = "aud_active", "aud_sleep";
pinctrl-0 = <&spkr_2_sd_active_mediabox>;
pinctrl-1 = <&spkr_2_sd_sleep_mediabox>;
};
};
};

54
arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi
View file

@ -2957,5 +2957,59 @@
}; };
}; };
}; };
spkr_1_sd_mediabox {
spkr_1_sd_sleep_mediabox: spkr_1_sd_sleep_mediabox {
mux {
pins = "gpio85";
function = "gpio";
};
config {
pins = "gpio85";
drive-strength = <2>; /* 2 mA */
bias-pull-down;
input-enable;
};
};
spkr_1_sd_active_mediabox: spkr_1_sd_active_mediabox {
mux {
pins = "gpio85";
function = "gpio";
};
config {
pins = "gpio85";
drive-strength = <8>; /* 8 mA */
bias-disable;
output-high;
};
};
};
spkr_2_sd_mediabox_mediabox {
spkr_2_sd_sleep_mediabox: spkr_2_sd_sleep_mediabox {
mux {
pins = "gpio112";
function = "gpio";
};
config {
pins = "gpio112";
drive-strength = <2>; /* 2 mA */
bias-pull-down;
input-enable;
};
};
spkr_2_sd_active_mediabox: spkr_2_sd_active_mediabox {
mux {
pins = "gpio112";
function = "gpio";
};
config {
pins = "gpio112";
drive-strength = <8>; /* 8 mA */
bias-disable;
output-high;
};
};
};
}; };
}; };