diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-03-23 09:44:30 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-03-23 09:44:30 -0700 |
| commit | ab2411c816f50940c964d1e47bf03d288cec262e (patch) | |
| tree | 1cee946f312933d2603e806ad230bb44e1c51241 | |
| parent | 2edff433a4933ca8037dab3e4983186ee7f01406 (diff) | |
| parent | d5e2207b8221f8f2eda936ce7f966d10d1c76bc5 (diff) | |
Merge "ARM: dts:msm: correct clk setting for native playback on SDM660"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-audio.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sdm660-audio.dtsi | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-audio.dtsi b/arch/arm/boot/dts/qcom/msm-audio.dtsi index 42cf30c789d9..d450f43f8c22 100644 --- a/arch/arm/boot/dts/qcom/msm-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msm-audio.dtsi @@ -931,6 +931,8 @@ clocks = <&clock_rpmcc RPM_DIV_CLK1>; qcom,node_has_rpm_clock; #clock-cells = <1>; + qcom,codec-mclk-clk-freq = <11289600>; + qcom,mclk-clk-reg = <0x15020018 0x0>; pinctrl-names = "sleep", "active"; pinctrl-0 = <&lpi_mclk0_sleep>; pinctrl-1 = <&lpi_mclk0_active>; diff --git a/arch/arm/boot/dts/qcom/sdm660-audio.dtsi b/arch/arm/boot/dts/qcom/sdm660-audio.dtsi index c1cb6441cd43..402f19efd50d 100644 --- a/arch/arm/boot/dts/qcom/sdm660-audio.dtsi +++ b/arch/arm/boot/dts/qcom/sdm660-audio.dtsi @@ -34,7 +34,7 @@ clock-names = "wcd_clk", "wcd_native_clk"; clocks = <&clock_audio AUDIO_PMI_CLK>, - <&clock_audio AUDIO_AP_CLK2>; + <&clock_audio AUDIO_LPASS_MCLK>; cdc-vdd-mic-bias-supply = <&pm660l_bob>; qcom,cdc-vdd-mic-bias-voltage = <3300000 3300000>; |