diff options
| author | Walter Yang <yandongy@codeaurora.org> | 2017-05-15 15:38:46 +0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-24 03:03:05 -0700 |
| commit | 8166e48761c57a3822cab6fa392e28d0c9c8ca5b (patch) | |
| tree | 1599abf56d393ef5fe437e15508d5490034ad562 | |
| parent | 60be71604a84d2e047215cb702d6324379a353bb (diff) | |
ARM: dts: msm: add audio support for HDK660/630 boards
Add support for required node for audio of HDK660/630 boards
with tasha codec.
Change-Id: I1b5acb70d4fb8e8e4958ffafb2b83c16df1d933c
CRs-Fixed: 2047107
Signed-off-by: Walter Yang <yandongy@codeaurora.org>
| -rw-r--r-- | arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts | 56 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts | 17 |
2 files changed, 45 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts b/arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts index 480a69601541..0d5ee0d5c85c 100644 --- a/arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts +++ b/arch/arm/boot/dts/qcom/sda630-pm660a-qrd-hdk.dts @@ -16,7 +16,7 @@ #include "sda630.dtsi" #include "sdm630-qrd.dtsi" #include "msm-pm660a.dtsi" -#include "sdm660-internal-codec.dtsi" +#include "sdm660-external-codec.dtsi" / { model = "Qualcomm Technologies, Inc. SDM 630 PM660 + PM660A QRD HDK630"; @@ -25,33 +25,6 @@ qcom,pmic-id = <0x0001001b 0x0001011a 0x0 0x0>; }; -&int_codec { - qcom,model = "sdm660-snd-card-skush"; - /delete-property/ qcom,us-euro-gpios; - qcom,audio-routing = - "RX_BIAS", "INT_MCLK0", - "SPK_RX_BIAS", "INT_MCLK0", - "INT_LDO_H", "INT_MCLK0", - "MIC BIAS External2", "Headset Mic", - "AMIC2", "MIC BIAS External2", - "MIC BIAS External", "Digital Mic1", - "DMIC1", "MIC BIAS External", - "MIC BIAS External", "Digital Mic3", - "DMIC3", "MIC BIAS External", - "MIC BIAS External", "Digital Mic4", - "DMIC4", "MIC BIAS External", - "SpkrLeft IN", "SPK1 OUT", - "PDM_IN_RX1", "PDM_OUT_RX1", - "PDM_IN_RX2", "PDM_OUT_RX2", - "PDM_IN_RX3", "PDM_OUT_RX3", - "ADC1_IN", "ADC1_OUT", - "ADC2_IN", "ADC2_OUT", - "ADC3_IN", "ADC3_OUT"; - qcom,wsa-max-devs = <1>; - qcom,wsa-devs = <&wsa881x_211_en>, <&wsa881x_213_en>; - qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft"; -}; - &pm660a_oledb { status = "okay"; qcom,oledb-default-voltage-mv = <6400>; @@ -83,3 +56,30 @@ qcom,mdss-dsi-bl-max-level = <255>; qcom,panel-supply-entries = <&dsi_panel_pwr_supply_labibb_amoled>; }; + +/delete-node/ &tasha_hph_en0; +/delete-node/ &tasha_hph_en1; + +&tasha_snd { + qcom,model = "sdm660-tasha-skus-snd-card"; + qcom,audio-routing = + "AIF4 VI", "MCLK", + "RX_BIAS", "MCLK", + "MADINPUT", "MCLK", + "AMIC2", "MIC BIAS2", + "MIC BIAS2", "Headset Mic", + "DMIC0", "MIC BIAS1", + "MIC BIAS1", "Digital Mic0", + "DMIC3", "MIC BIAS3", + "MIC BIAS3", "Digital Mic3", + "DMIC5", "MIC BIAS4", + "MIC BIAS4", "Digital Mic5", + "SpkrLeft IN", "SPK1 OUT"; + qcom,msm-mbhc-hphl-swh = <0>; + /delete-property/ qcom,us-euro-gpios; + /delete-property/ qcom,hph-en0-gpio; + /delete-property/ qcom,hph-en1-gpio; + qcom,wsa-max-devs = <1>; + qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_213>; + qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft"; +}; diff --git a/arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts b/arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts index c2bf2c4a088e..70a5c523578f 100644 --- a/arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts +++ b/arch/arm/boot/dts/qcom/sda660-pm660a-qrd-hdk.dts @@ -191,3 +191,20 @@ qcom,mdss-dsi-bl-max-level = <255>; qcom,panel-supply-entries = <&dsi_panel_pwr_supply_labibb_amoled>; }; + +&tasha_snd { + qcom,audio-routing = + "AIF4 VI", "MCLK", + "RX_BIAS", "MCLK", + "MADINPUT", "MCLK", + "AMIC2", "MIC BIAS2", + "MIC BIAS2", "Headset Mic", + "DMIC0", "MIC BIAS1", + "MIC BIAS1", "Digital Mic0", + "DMIC3", "MIC BIAS3", + "MIC BIAS3", "Digital Mic3", + "DMIC5", "MIC BIAS4", + "MIC BIAS4", "Digital Mic5", + "SpkrLeft IN", "SPK1 OUT"; + qcom,msm-mbhc-hphl-swh = <0>; +}; |