From f4e76026d6041cea6aa8b6a3b009897ffe8a4e50 Mon Sep 17 00:00:00 2001 From: "Yoon (Seungyoon) Lee" Date: Wed, 26 Dec 2018 00:24:12 -0600 Subject: [PATCH] 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 Reviewed-on: https://gerrit.mot.com/1287050 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Zhengming Yao Reviewed-by: Xiangpo Zhao Submit-Approved: Jira Key --- .../exynos/exynos9609-robusta2_common.dtsi | 10 +++++--- .../arm64/boot/dts/exynos/exynos9609-wing.dts | 24 ++++++------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi index d46ea81a806e..919be5e963bc 100755 --- 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 30635ea21540..7de2d4f5fc9d 100755 --- 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>; }; }; }; -- 2.20.1