diff options
| author | qctecmdr <qctecmdr@localhost> | 2021-10-22 01:35:52 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-10-22 01:35:51 -0700 |
| commit | ab4ee4ad4c07dfe6f4e94ae16f65ed963c6adc59 (patch) | |
| tree | d1ad10081232c26a8678f6884b7cbb43e199ccfc | |
| parent | 585c1b2933409a3628079a291647eb279e3d8a6e (diff) | |
| parent | 317a01ab275a0ffb5ea5b7a7865908828d56ff5a (diff) | |
| download | devicetree-ab4ee4ad4c07dfe6f4e94ae16f65ed963c6adc59.tar.gz | |
Merge "ARM: dts: msm: add support for mi2s and tdm"
| -rw-r--r-- | bindings/sound/qcom-audio-dev.txt | 4 | ||||
| -rw-r--r-- | qcom/kona-audio-overlay-ar.dtsi | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/bindings/sound/qcom-audio-dev.txt b/bindings/sound/qcom-audio-dev.txt index b6674c26..ffef4409 100644 --- a/bindings/sound/qcom-audio-dev.txt +++ b/bindings/sound/qcom-audio-dev.txt @@ -2007,6 +2007,10 @@ Optional properties: - qcom,msm-mi2s-master: This property is used to inform machine driver if MSM is the clock master of mi2s. 1 means master and 0 means slave. The first entry is primary mi2s; the second entry is secondary mi2s, and so on. +- qcom,tdm-clk-attribute: This property is used to set the clock attribute for tdm. + The first entry is primary tdm; the second entry is secondary tdm, and so on. +- qcom,mi2s-clk-attribute: This property is used to set the clock attribute for mi2s. + The first entry is primary mi2s; the second entry is secondary mi2s, and so on. - qcom,msm-mbhc-hphl-swh: This property is used to distinguish headset HPHL switch type on target typically the switch type will be normally open or normally close, value for this property 0 for normally close and 1 for diff --git a/qcom/kona-audio-overlay-ar.dtsi b/qcom/kona-audio-overlay-ar.dtsi index 67596564..8cc61d5d 100644 --- a/qcom/kona-audio-overlay-ar.dtsi +++ b/qcom/kona-audio-overlay-ar.dtsi @@ -214,8 +214,12 @@ &kona_snd_ar { qcom,model = "kona-mtp-snd-card"; qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>; - qcom,wcn-bt = <1>; + qcom,mi2s-tdm-is-hw-vote-needed = <1>, <0>, <1>, <0>, <0>, <0>; + qcom,wcn-bt = <0>; qcom,ext-disp-audio-rx = <1>; + qcom,tdm-max-slots = <8>; + qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; + qcom,mi2s-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>; qcom,audio-routing = "AMIC1", "MIC BIAS1", "MIC BIAS1", "Analog Mic1", |