diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-19 17:04:07 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-19 17:04:07 -0800 |
| commit | 69a20f9ed98a94d503a1400742b572a939332fdb (patch) | |
| tree | 18bc2de7dbd5cfe83393796661ab7cd1edab4718 /arch | |
| parent | 498f0f3b7c05f2fb75fde69ef940f4a94fc24a30 (diff) | |
| parent | 73c975d6fde1adc6a8bbe28e98809e37c884d123 (diff) | |
Merge "ARM: dts: msm: update speaker left and right GPIOs for APQ8998"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts | 18 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi | 54 |
2 files changed, 72 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts b/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts index bc60d9a08c0b..03fa038d9413 100644 --- a/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts +++ b/arch/arm/boot/dts/qcom/apq8998-v2.1-mediabox.dts @@ -28,3 +28,21 @@ &mdss_mdp { 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>; + }; + }; +}; diff --git a/arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi index d4a2290c9b0a..bd20ae0a9b85 100644 --- a/arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-pinctrl.dtsi @@ -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; + }; + }; + }; }; }; |