diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2016-09-16 09:22:05 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-16 09:22:04 -0700 |
commit | 8a8abceb69e80c464db9572131a6156c650e31af (patch) | |
tree | 87a97abd4cff50ad15657254bece6f82b3ebab71 /arch | |
parent | a146b61be94fa822b4ee5eabca828014917a82d1 (diff) | |
parent | c3d1fc7a13a78830ea509840316da3775239196c (diff) |
Merge "ARM: dts: msm: add new clk for native playback on msmcobalt"
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi | 28 |
2 files changed, 31 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi index ec69d7ac895d..9b50bb96750a 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi @@ -231,6 +231,9 @@ clocks = <&clock_gcc clk_div_clk1>; qcom,node_has_rpm_clock; #clock-cells = <1>; + pinctrl-names = "sleep", "active"; + pinctrl-0 = <&spkr_i2s_clk_sleep>; + pinctrl-1 = <&spkr_i2s_clk_active>; }; clock_audio_lnbb: audio_ext_clk_lnbb { diff --git a/arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi index c0f465b0eba5..f4f47bc461fc 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-pinctrl.dtsi @@ -2715,5 +2715,33 @@ }; }; }; + + spkr_i2s_clk_pin { + spkr_i2s_clk_sleep: spkr_i2s_clk_sleep { + mux { + pins = "gpio69"; + function = "spkr_i2s"; + }; + + config { + pins = "gpio69"; + drive-strength = <2>; /* 2 mA */ + bias-pull-down; /* PULL DOWN */ + }; + }; + + spkr_i2s_clk_active: spkr_i2s_clk_active { + mux { + pins = "gpio69"; + function = "spkr_i2s"; + }; + + config { + pins = "gpio69"; + drive-strength = <8>; /* 8 mA */ + bias-disable; /* NO PULL */ + }; + }; + }; }; }; |