diff options
| author | Vidyakumar Athota <vathota@codeaurora.org> | 2016-09-23 17:35:08 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-09-24 09:56:55 -0700 |
| commit | 36bd1b76633dd158758b8da7af4e2789235498dc (patch) | |
| tree | 3bf57c8c705bad7521542a82e211499ea6104a69 | |
| parent | 30931e7448f2c7dd8634376a2355120733b28e4e (diff) | |
ARM: dts: msm: add slimbus7 and slimbus8 cpu dais for msmcobalt
In msmcobalt platform, Slimbus7 and slimbus8 cpu dais are used for
BT and FM usecases. Add BT and FM cpu dais under sound-tavil
node.
Change-Id: I6cbe4167ab9d980b75f4fefdd4add0d8e8adaef8
Signed-off-by: Vidyakumar Athota <vathota@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi index 1db3c2482935..ff4ea42cd767 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi @@ -35,6 +35,7 @@ compatible = "qcom,msmcobalt-asoc-snd-tasha"; qcom,model = "msmcobalt-tasha-snd-card"; qcom,ext-disp-audio-rx; + qcom,wcn-btfm; qcom,audio-routing = "AIF4 VI", "MCLK", @@ -126,6 +127,7 @@ compatible = "qcom,msmcobalt-asoc-snd-tavil"; qcom,model = "msmcobalt-tavil-snd-card"; qcom,ext-disp-audio-rx; + qcom,wcn-btfm; qcom,audio-routing = "RX_BIAS", "MCLK", @@ -180,8 +182,9 @@ <&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>, <&incall_record_rx>, <&incall_record_tx>, <&incall_music_rx>, - <&incall_music_2_rx>, <&sb_5_rx>, - <&usb_audio_rx>, <&usb_audio_tx>, <&sb_6_rx>; + <&incall_music_2_rx>, <&sb_5_rx>, <&sb_6_rx>, + <&sb_7_rx>, <&sb_7_tx>, <&sb_8_tx>, + <&usb_audio_rx>, <&usb_audio_tx>; asoc-cpu-names = "msm-dai-q6-hdmi.8", "msm-dai-q6-dp.24608", "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", @@ -197,8 +200,9 @@ "msm-dai-q6-dev.240", "msm-dai-q6-dev.32771", "msm-dai-q6-dev.32772", "msm-dai-q6-dev.32773", "msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394", - "msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673", - "msm-dai-q6-dev.16396"; + "msm-dai-q6-dev.16396", "msm-dai-q6-dev.16398", + "msm-dai-q6-dev.16399", "msm-dai-q6-dev.16401", + "msm-dai-q6-dev.28672", "msm-dai-q6-dev.28673"; asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>; asoc-codec-names = "msm-stub-codec.1", "msm-ext-disp-audio-codec-rx"; diff --git a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi index f59899fba039..9d226c16d2eb 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi @@ -539,10 +539,6 @@ }; &soc { - sound-9335 { - qcom,wcn-btfm; - }; - gpio_keys { compatible = "gpio-keys"; input-name = "gpio-keys"; diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi index 8697ba4cb889..9b7d07c027e4 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi @@ -562,10 +562,6 @@ }; &soc { - sound-9335 { - qcom,wcn-btfm; - }; - gpio_keys { compatible = "gpio-keys"; input-name = "gpio-keys"; |