diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-09 13:16:09 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-09 13:16:08 -0800 |
| commit | 5a08a180fa117a57b6078d4227dfd661d49b0232 (patch) | |
| tree | f7b5f77ef0c39bc52b37f70d29e5bf7128506034 | |
| parent | 62a0513d39f920040530193766e4d1303fee4b03 (diff) | |
| parent | 6e29602fb4a2e17c615ba430edc1b47752e99f49 (diff) | |
Merge "ARM: dts: msm: Add MLCK routing for VI feedback path on msm8998"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm-audio.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-audio.dtsi | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msm-audio.dtsi b/arch/arm/boot/dts/qcom/msm-audio.dtsi index fc0e828eb2bc..a8a174300c7e 100644 --- a/arch/arm/boot/dts/qcom/msm-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msm-audio.dtsi @@ -696,6 +696,7 @@ qcom,auxpcm-audio-intf; qcom,msm-mi2s-master = <1>, <1>, <1>, <1>; qcom,audio-routing = + "AIF4 VI", "MCLK", "RX_BIAS", "MCLK", "MADINPUT", "MCLK", "AMIC2", "MIC BIAS2", diff --git a/arch/arm/boot/dts/qcom/msm8998-audio.dtsi b/arch/arm/boot/dts/qcom/msm8998-audio.dtsi index 09f0b2dbbe9b..ac1e37fa1d63 100644 --- a/arch/arm/boot/dts/qcom/msm8998-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msm8998-audio.dtsi @@ -183,6 +183,7 @@ "lpaif_quat_mode_muxsel"; qcom,audio-routing = + "AIF4 VI", "MCLK", "RX_BIAS", "MCLK", "MADINPUT", "MCLK", "hifi amp", "LINEOUT1", |