diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-03 10:35:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-03 10:35:01 -0700 |
| commit | 73bc67e1ea6c69f640f55a0096698a8206c00a40 (patch) | |
| tree | 9743f668ccc86386eafc6c2afe55532e8686c939 | |
| parent | 839e644e4e874a557761c8264bdb5d9829191378 (diff) | |
| parent | 3a0f71b5902983ba82fa3bbef7bd5747d2eb1b51 (diff) | |
Merge "ARM: dts: msm: enable mi2s and aux pcm on msmcobalt"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi index 9e95cff828d1..445f32df8aa4 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi @@ -36,6 +36,18 @@ qcom,model = "msmcobalt-tasha-snd-card"; qcom,ext-disp-audio-rx; qcom,wcn-btfm; + qcom,mi2s-audio-intf; + qcom,auxpcm-audio-intf; + qcom,msm-mi2s-master = <1>, <1>, <1>, <1>; + + reg = <0x1711a000 0x4>, + <0x1711b000 0x4>, + <0x1711c000 0x4>, + <0x1711d000 0x4>; + reg-names = "lpaif_pri_mode_muxsel", + "lpaif_sec_mode_muxsel", + "lpaif_tert_mode_muxsel", + "lpaif_quat_mode_muxsel"; qcom,audio-routing = "AIF4 VI", "MCLK", @@ -130,6 +142,18 @@ qcom,model = "msmcobalt-tavil-snd-card"; qcom,ext-disp-audio-rx; qcom,wcn-btfm; + qcom,mi2s-audio-intf; + qcom,auxpcm-audio-intf; + qcom,msm-mi2s-master = <1>, <1>, <1>, <1>; + + reg = <0x1711a000 0x4>, + <0x1711b000 0x4>, + <0x1711c000 0x4>, + <0x1711d000 0x4>; + reg-names = "lpaif_pri_mode_muxsel", + "lpaif_sec_mode_muxsel", + "lpaif_tert_mode_muxsel", + "lpaif_quat_mode_muxsel"; qcom,audio-routing = "RX_BIAS", "MCLK", |