ARM: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk

[ Upstream commit 4cb7df64c732b2b9918424095c11660c2a8c4a33 ]

The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790),
but according to the reference manual, there is no such gate. Moreover,
the consumer driver of the mentioned clock might gate it and leave
the ECSPI2 (the true owner of that gate) hanging. So lets use the
audio_mclk_post_div, which is the parent.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index 62b771c1d5a9a71058dfb478a6f6f14b4641dbaa..f1c60b0cb143edad66f9376f34b0a856bfc86187 100644 (file)
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -40,7 +40,7 @@
 
                dailink_master: simple-audio-card,codec {
                        sound-dai = <&codec>;
-                       clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+                       clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                };
        };
 };
@@ -293,7 +293,7 @@
                compatible = "fsl,sgtl5000";
                #sound-dai-cells = <0>;
                reg = <0x0a>;
-               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_sai1_mclk>;
                VDDA-supply = <&reg_module_3v3_avdd>;

diff --git a/arch/arm/boot/dts/imx7-mba7.dtsi b/arch/arm/boot/dts/imx7-mba7.dtsi
index 5e6bef230dc757615ef46359ccd377392f040dc5..b55a7792a83918f386fd0932809074ad54b5ac5d 100644 (file)
--- a/arch/arm/boot/dts/imx7-mba7.dtsi
+++ b/arch/arm/boot/dts/imx7-mba7.dtsi
@@ -264,7 +264,7 @@
        tlv320aic32x4: audio-codec@18 {
                compatible = "ti,tlv320aic32x4";
                reg = <0x18>;
-               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                clock-names = "mclk";
                ldoin-supply = <&reg_audio_3v3>;
                iov-supply = <&reg_audio_3v3>;

diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index e0751e6ba3c0f7e0d4709a5c1106eaeb7ab4f33b..a31de900139d6d10f0c849756bbf95e83ec5157d 100644 (file)
--- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
@@ -288,7 +288,7 @@
        codec: wm8960@1a {
                compatible = "wlf,wm8960";
                reg = <0x1a>;
-               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                clock-names = "mclk";
                wlf,shared-lrclk;
        };

diff --git a/arch/arm/boot/dts/imx7d-pico-hobbit.dts b/arch/arm/boot/dts/imx7d-pico-hobbit.dts
index 7b2198a9372c621e0276bd509c3b373cf02c4072..d917dc4f2f22759bc546c18248bbff7fcc3d726f 100644 (file)
--- a/arch/arm/boot/dts/imx7d-pico-hobbit.dts
+++ b/arch/arm/boot/dts/imx7d-pico-hobbit.dts
@@ -31,7 +31,7 @@
 
                dailink_master: simple-audio-card,codec {
                        sound-dai = <&sgtl5000>;
-                       clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+                       clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                };
        };
 };
@@ -41,7 +41,7 @@
                #sound-dai-cells = <0>;
                reg = <0x0a>;
                compatible = "fsl,sgtl5000";
-               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                VDDA-supply = <&reg_2p5v>;
                VDDIO-supply = <&reg_vref_1v8>;
        };

diff --git a/arch/arm/boot/dts/imx7d-pico-pi.dts b/arch/arm/boot/dts/imx7d-pico-pi.dts
index 70bea95c06d83f84737d13478d1d7b37dca2272d..f263e391e24cbb6c44d569cf284dde74020f58ac 100644 (file)
--- a/arch/arm/boot/dts/imx7d-pico-pi.dts
+++ b/arch/arm/boot/dts/imx7d-pico-pi.dts
@@ -31,7 +31,7 @@
 
                dailink_master: simple-audio-card,codec {
                        sound-dai = <&sgtl5000>;
-                       clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+                       clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                };
        };
 };
@@ -41,7 +41,7 @@
                #sound-dai-cells = <0>;
                reg = <0x0a>;
                compatible = "fsl,sgtl5000";
-               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                VDDA-supply = <&reg_2p5v>;
                VDDIO-supply = <&reg_vref_1v8>;
        };

diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 4a0d83784d7d1dd8569e01e6f808e990006c082c..e5f1bdbe79921671d6b77f9afcfe1e0c5e71a518 100644 (file)
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -385,14 +385,14 @@
        codec: wm8960@1a {
                compatible = "wlf,wm8960";
                reg = <0x1a>;
-               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                clock-names = "mclk";
                wlf,shared-lrclk;
                wlf,hp-cfg = <2 2 3>;
                wlf,gpio-cfg = <1 3>;
                assigned-clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_SRC>,
                                  <&clks IMX7D_PLL_AUDIO_POST_DIV>,
-                                 <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+                                 <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                assigned-clock-parents = <&clks IMX7D_PLL_AUDIO_POST_DIV>;
                assigned-clock-rates = <0>, <884736000>, <12288000>;
        };

diff --git a/arch/arm/boot/dts/imx7s-warp.dts b/arch/arm/boot/dts/imx7s-warp.dts
index 569bbd84e371a956b5c64427bd9bfd15e25aa4bf..558b064da743c5d38c51c3949eca666cf9d93bb4 100644 (file)
--- a/arch/arm/boot/dts/imx7s-warp.dts
+++ b/arch/arm/boot/dts/imx7s-warp.dts
@@ -75,7 +75,7 @@
 
                dailink_master: simple-audio-card,codec {
                        sound-dai = <&codec>;
-                       clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+                       clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                };
        };
 };
@@ -232,7 +232,7 @@
                #sound-dai-cells = <0>;
                reg = <0x0a>;
                compatible = "fsl,sgtl5000";
-               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_CLK>;
+               clocks = <&clks IMX7D_AUDIO_MCLK_ROOT_DIV>;
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_sai1_mclk>;
                VDDA-supply = <&vgen4_reg>;