diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-06-12 18:51:25 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-06-12 18:51:25 -0700 |
| commit | f328b4d28d25e602ef5ea36be8a355af9d895964 (patch) | |
| tree | 70a4bb6a193bea6efb04a2169ca14c3e2525bf92 | |
| parent | 17fd8dbacb926ced0864e3d7546b624adba68c7f (diff) | |
| parent | eb0322ea9b07b5ff148445b92293882eec0e52f9 (diff) | |
Merge "arm: dts: msm: Add avs-version dt property for 8996"
| -rw-r--r-- | Documentation/devicetree/bindings/sound/qcom-audio-dev.txt | 23 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-mtp.dtsi | 17 |
2 files changed, 40 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt index 102857a13a86..2a737bb69bc9 100644 --- a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt +++ b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt @@ -8,6 +8,15 @@ Required properties: - qcom,msm-pcm-dsp-id : device node id + Optional properties + + - qcom,avs-version: + This property can be used to specify the ADSP version/name. + Based on ADSP version, we decide if we have to use older + ADSP APIs or newer. Right now we are using "AVS 2.7" for + 8996 purpose.If the ADSP version is anything other than this + we use new ADSP APIs. + * msm-pcm-low-latency Required properties: @@ -28,6 +37,13 @@ Required properties: ultra : ultra low latency stream ull-pp : ultra low latency stream with post-processing capability + - qcom,avs-version: + This property can be used to specify the ADSP version/name. + Based on ADSP version, we decide if we have to use older + ADSP APIs or newer. Right now we are using "AVS 2.7" for + 8996 purpose.If the ADSP version is anything other than this + we use new ADSP APIs. + * msm-pcm-dsp-noirq Required properties: @@ -75,6 +91,13 @@ Optional properties 8909 purpose.If the ADSP version is anything other than this we use new ADSP APIs. + - qcom,avs-version: + This property can be used to specify the ADSP version/name. + Based on ADSP version, we decide if we have to use older + ADSP APIs or newer. Right now we are using "AVS 2.7" for + 8996 purpose.If the ADSP version is anything other than this + we use new ADSP APIs. + * msm-voip-dsp Required properties: diff --git a/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi index d3350deba5d2..38f3715973cd 100644 --- a/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-mtp.dtsi @@ -813,6 +813,23 @@ qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight", "SpkrLeft", "SpkrRight"; }; + + qcom,msm-pcm { + qcom,avs-version; + }; + + qcom,msm-pcm-low-latency { + qcom,avs-version; + }; + + qcom,msm-ultra-low-latency { + qcom,avs-version; + }; + + qcom,msm-compress-dsp { + qcom,avs-version; + }; + qcom,msm-dai-tdm-tert-rx { qcom,msm-cpudai-tdm-clk-internal = <1>; qcom,msm-cpudai-tdm-sync-mode = <0>; |