diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-10 12:27:07 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-10 12:27:06 -0800 |
| commit | e7bbbbb03149145778810a4de89bfdcb63de44c6 (patch) | |
| tree | 24b25646f2e8fa539faf8fd19ef91882935ffdad | |
| parent | 36a9ec4be8e1dfb737f3e35a250a0d3d7520dcfe (diff) | |
| parent | dc8d39270d65990cd7f7d1db94db28ad2d2acb6a (diff) | |
Merge "ARM: dts: msm: add audio device node for qrd msm8998 interposer"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-sdm660-qrd.dts | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-sdm660-qrd.dts b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-sdm660-qrd.dts index 9957adcc2336..d48516381e29 100644 --- a/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-sdm660-qrd.dts +++ b/arch/arm/boot/dts/qcom/msm8998-v2.1-interposer-sdm660-qrd.dts @@ -1,4 +1,4 @@ -/* Copyright (c) 2016, The Linux Foundation. All rights reserved. +/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -25,24 +25,6 @@ qcom,board-id = <0x03000b 0x80>; }; -&slim_aud { - tasha_codec { - /delete-property/cdc-vdd-buck-supply; - /delete-property/cdc-buck-sido-supply; - /delete-property/cdc-vdd-tx-h-supply; - /delete-property/cdc-vdd-rx-h-supply; - /delete-property/cdc-vddpx-1-supply; - }; - - tavil_codec { - /delete-property/cdc-vdd-buck-supply; - /delete-property/cdc-buck-sido-supply; - /delete-property/cdc-vdd-tx-h-supply; - /delete-property/cdc-vdd-rx-h-supply; - /delete-property/cdc-vddpx-1-supply; - }; -}; - &clock_gcc { vdd_dig-supply = <&pm660l_s3_level>; vdd_dig_ao-supply = <&pm660l_s3_level_ao>; @@ -167,3 +149,25 @@ &pm660l_wled { qcom,led-strings-list = [00 01]; }; + +&tasha_snd { + qcom,model = "msmfalcon-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", + "DMIC2", "MIC BIAS3", + "MIC BIAS3", "Digital Mic2", + "DMIC4", "MIC BIAS3", + "MIC BIAS3", "Digital Mic4", + "SpkrLeft IN", "SPK1 OUT"; + qcom,msm-mbhc-hphl-swh = <1>; + /delete-property/ qcom,us-euro-gpios; + qcom,wsa-max-devs = <1>; + qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_213>; + qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrLeft"; +}; |