arm/dts: kane: use new 'cirrus' adsp nodes

use new 'cirrus' adsp nodes instead of old 'wlf' nodes to get
more flexibility and to remove redundancy from wm_adsp driver.

Change-Id: Ie4e282387cd247d9e8e334a6244558466948fdc3
Signed-off-by: Yoon (Seungyoon) Lee <w22905@motorola.com>
Reviewed-on: https://gerrit.mot.com/1287050
SLTApproved: Slta Waiver
SME-Granted: SME Approvals Granted
Tested-by: Jira Key
Reviewed-by: Zhengming Yao <yaozm1@mt.com>
Reviewed-by: Xiangpo Zhao <zhaoxp3@motorola.com>
Submit-Approved: Jira Key

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi
index d46ea81a806efd9b0dfd269dcb8a43ad5165646c..919be5e963bc4e51b768c73cc5245a59f3c3f6da 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi
@@ -1936,8 +1936,10 @@
                                reg = <0x17fe00>;
                                firmware {
                                        frontend {
-                                               wlf,wmfw-file = "marley-dsp2-aov-frontend.wmfw";
-                                               wlf,bin-file = "marley-dsp2-aov-vrgain.bin";
+                                               cirrus,wmfw-file = "marley-dsp2-aov-frontend.wmfw";
+                                               cirrus,bin-file = "marley-dsp2-aov-vrgain.bin";
+                                               cirrus,full-name;
+                                               cirrus,compr-caps = <14 1 4 1 16000>;
                                        };
                                };
                        };
@@ -1945,7 +1947,9 @@
                                reg = <0x1ffe00>;
                                firmware {
                                        aov {
-                                               wlf,wmfw-file = "marley-dsp3-aov-control.wmfw";
+                                               cirrus,wmfw-file = "marley-dsp3-aov-control.wmfw";
+                                               cirrus,full-name;
+                                               cirrus,compr-caps = <14 1 4 1 16000>;
                                        };
                                };
                        };

diff --git a/arch/arm64/boot/dts/exynos/exynos9609-wing.dts b/arch/arm64/boot/dts/exynos/exynos9609-wing.dts
index 30635ea2154093ffcd4ebe6be0edf5484420c080..7de2d4f5fc9de51b8e7026a9c065281bac4fdc69 100755 (executable)
--- a/arch/arm64/boot/dts/exynos/exynos9609-wing.dts
+++ b/arch/arm64/boot/dts/exynos/exynos9609-wing.dts
@@ -2527,21 +2527,14 @@
                adsps {
                        #address-cells = <1>;
                        #size-cells = <0>;
-                       adsp@0ffe00 {
-                               reg = <0x0ffe00>;
-                               firmware {
-                                       ultrasound {
-                                               wlf,wmfw-file = "marley-dsp1-ultrasound.wmfw";
-                                               wlf,bin-file = "marley-dsp1v-ultrasound.bin";
-                                       };
-                               };
-                       };
                        adsp@17fe00 {
                                reg = <0x17fe00>;
                                firmware {
                                        frontend {
-                                               wlf,wmfw-file = "marley-dsp2-aov-frontend.wmfw";
-                                               wlf,bin-file = "marley-dsp2-aov-vrgain.bin";
+                                               cirrus,wmfw-file = "marley-dsp2-aov-frontend.wmfw";
+                                               cirrus,bin-file = "marley-dsp2-aov-vrgain.bin";
+                                               cirrus,full-name;
+                                               cirrus,compr-caps = <14 1 4 1 16000>;
                                        };
                                };
                        };
@@ -2549,12 +2542,9 @@
                                reg = <0x1ffe00>;
                                firmware {
                                        aov {
-                                               wlf,wmfw-file = "marley-dsp3-aov-control.wmfw";
-                                               wlf,bin-file = "marley-dsp3-aov-model.bin";
-                                       };
-                                       ez2record {
-                                               wlf,wmfw-file = "marley-dsp3-ez2-record.wmfw";
-                                               wlf,bin-file = "marley-dsp3-ez2-record.bin";
+                                               cirrus,wmfw-file = "marley-dsp3-aov-control.wmfw";
+                                               cirrus,full-name;
+                                               cirrus,compr-caps = <14 1 4 1 16000>;
                                        };
                                };
                        };