Merge "ARM: dts: msm: enable mi2s and aux pcm on msmcobalt"

This commit is contained in:
Linux Build Service Account 2016-10-03 10:35:01 -07:00 committed by Gerrit - the friendly Code Review server
commit 73bc67e1ea

View file

@ -36,6 +36,18 @@
qcom,model = "msmcobalt-tasha-snd-card"; qcom,model = "msmcobalt-tasha-snd-card";
qcom,ext-disp-audio-rx; qcom,ext-disp-audio-rx;
qcom,wcn-btfm; 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 = qcom,audio-routing =
"AIF4 VI", "MCLK", "AIF4 VI", "MCLK",
@ -130,6 +142,18 @@
qcom,model = "msmcobalt-tavil-snd-card"; qcom,model = "msmcobalt-tavil-snd-card";
qcom,ext-disp-audio-rx; qcom,ext-disp-audio-rx;
qcom,wcn-btfm; 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 = qcom,audio-routing =
"RX_BIAS", "MCLK", "RX_BIAS", "MCLK",