audio: fixed conflict of SM1-bringup and mainline [1/1]

PD#SWPL-6486

Problem:
merge to mainline conflict.

Solution:
add clk change in dts

Verify:
sm1_ac200, verify pass

Change-Id: I37e7317cd795cd8cb9815ff20db49bc8644f0087
Signed-off-by: Zhe Wang <Zhe.Wang@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 1e18de08533cae2c86d36b256d7d780ba47d0c2f..f73b280120d6a22b1f0d77349a3bf740f8b63c56 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -919,8 +919,10 @@
                dai-tdm-clk-sel = <1>;
                clocks = <&clkaudio CLKID_AUDIO_MCLK_B
                                &clkc CLKID_MPLL1
-                               &clkc CLKID_MPLL0>;
-               clock-names = "mclk", "clk_srcpll", "samesource_sysclk";
+                               &clkc CLKID_MPLL0
+                               &clkaudio CLKID_AUDIO_SPDIFOUT_A>;
+               clock-names = "mclk", "clk_srcpll",
+                       "samesource_srcpll", "samesource_clk";
                pinctrl-names = "tdm_pins";
                pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>;
 

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
index 32a04dbf00702a0d2973eaf7757415cb296ad361..e33e8268617e8798db124569d0ffeabdb3680ba1 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -919,8 +919,10 @@
                dai-tdm-clk-sel = <1>;
                clocks = <&clkaudio CLKID_AUDIO_MCLK_B
                                &clkc CLKID_MPLL1
-                               &clkc CLKID_MPLL0>;
-               clock-names = "mclk", "clk_srcpll", "samesource_sysclk";
+                               &clkc CLKID_MPLL0
+                               &clkaudio CLKID_AUDIO_SPDIFOUT_A>;
+               clock-names = "mclk", "clk_srcpll",
+                       "samesource_srcpll", "samesource_clk";
                pinctrl-names = "tdm_pins";
                pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>;
 

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 75a64df72faae48a49fe1639c9b4c546435cb7ce..59c4e7315a49aa281ab3a0f08904b2f39a440ad1 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -917,8 +917,10 @@
                dai-tdm-clk-sel = <1>;
                clocks = <&clkaudio CLKID_AUDIO_MCLK_B
                                &clkc CLKID_MPLL1
-                               &clkc CLKID_MPLL0>;
-               clock-names = "mclk", "clk_srcpll", "samesource_sysclk";
+                               &clkc CLKID_MPLL0
+                               &clkaudio CLKID_AUDIO_SPDIFOUT_A>;
+               clock-names = "mclk", "clk_srcpll",
+                       "samesource_srcpll", "samesource_clk";
                pinctrl-names = "tdm_pins";
                pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>;
 

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
index 064dbdd1ff72febbc61f9c692a2a80921c1f9292..2a1344254b37a04fde93320944adbab8be7c70fb 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -917,8 +917,10 @@
                dai-tdm-clk-sel = <1>;
                clocks = <&clkaudio CLKID_AUDIO_MCLK_B
                                &clkc CLKID_MPLL1
-                               &clkc CLKID_MPLL0>;
-               clock-names = "mclk", "clk_srcpll", "samesource_sysclk";
+                               &clkc CLKID_MPLL0
+                               &clkaudio CLKID_AUDIO_SPDIFOUT_A>;
+               clock-names = "mclk", "clk_srcpll",
+                       "samesource_srcpll", "samesource_clk";
                pinctrl-names = "tdm_pins";
                pinctrl-0 = <&tdmb_mclk &tdmout_b &tdmin_b>;