MLK-12862: ARM: dts: fix mqs no sound issue

The MQS can only work when the mclk1 is selected as the mclk
of sai.  On other hand, the mclk0 use same clock root
(sai_clk_root) as mclk1. so removing mclk0 won't impact the sai
features.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
[Arul: Fix merge conflicts]
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 4bbfc67..b0406bd 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -1191,7 +1191,7 @@
                                reg = <0x021d4000 0x4000>;
                                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_SAI1_IPG>,
-                                        <&clks IMX6SX_CLK_SAI1>,
+                                        <&clks IMX6SX_CLK_DUMMY>,
                                         <&clks IMX6SX_CLK_SAI1>,
                                         <&clks 0>, <&clks 0>;
                                clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
@@ -1212,7 +1212,7 @@
                                reg = <0x021dc000 0x4000>;
                                interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clks IMX6SX_CLK_SAI2_IPG>,
-                                        <&clks IMX6SX_CLK_SAI2>,
+                                        <&clks IMX6SX_CLK_DUMMY>,
                                         <&clks IMX6SX_CLK_SAI2>,
                                         <&clks 0>, <&clks 0>;
                                clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index 292f367..e99ac6e 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -383,7 +383,7 @@
                                        reg = <0x02028000 0x4000>;
                                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6UL_CLK_SAI1_IPG>,
-                                                <&clks IMX6UL_CLK_SAI1>,
+                                                <&clks IMX6UL_CLK_DUMMY>,
                                                 <&clks IMX6UL_CLK_SAI1>,
                                                 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;
                                        clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
@@ -399,7 +399,7 @@
                                        reg = <0x0202c000 0x4000>;
                                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6UL_CLK_SAI2_IPG>,
-                                                <&clks IMX6UL_CLK_SAI2>,
+                                                <&clks IMX6UL_CLK_DUMMY>,
                                                 <&clks IMX6UL_CLK_SAI2>,
                                                 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;
                                        clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
@@ -416,7 +416,7 @@
                                        reg = <0x02030000 0x4000>;
                                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6UL_CLK_SAI3_IPG>,
-                                                <&clks IMX6UL_CLK_SAI3>,
+                                                <&clks IMX6UL_CLK_DUMMY>,
                                                 <&clks IMX6UL_CLK_SAI3>,
                                                 <&clks IMX6UL_CLK_DUMMY>, <&clks IMX6UL_CLK_DUMMY>;
                                        clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";

diff --git a/arch/arm/boot/dts/imx6ull.dtsi b/arch/arm/boot/dts/imx6ull.dtsi
index 4068c15..c42d153 100644 (file)
--- a/arch/arm/boot/dts/imx6ull.dtsi
+++ b/arch/arm/boot/dts/imx6ull.dtsi
@@ -343,7 +343,7 @@
                                        reg = <0x02028000 0x4000>;
                                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6UL_CLK_SAI1_IPG>,
-                                                <&clks IMX6UL_CLK_SAI1>,
+                                                <&clks IMX6UL_CLK_DUMMY>,
                                                 <&clks IMX6UL_CLK_SAI1>,
                                                 <&clks 0>, <&clks 0>;
                                        clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";
@@ -373,7 +373,7 @@
                                        reg = <0x02030000 0x4000>;
                                        interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX6UL_CLK_SAI3_IPG>,
-                                                <&clks IMX6UL_CLK_SAI3>,
+                                                <&clks IMX6UL_CLK_DUMMY>,
                                                 <&clks IMX6UL_CLK_SAI3>,
                                                 <&clks 0>, <&clks 0>;
                                        clock-names = "bus", "mclk0", "mclk1", "mclk2", "mclk3";

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 663830b..97badd0 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -801,7 +801,7 @@
                                        reg = <0x308a0000 0x10000>;
                                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX7D_SAI1_IPG_CLK>,
-                                                <&clks IMX7D_SAI1_ROOT_CLK>,
+                                                <&clks IMX7D_CLK_DUMMY>,
                                                 <&clks IMX7D_SAI1_ROOT_CLK>,
                                                 <&clks IMX7D_CLK_DUMMY>,
                                                 <&clks IMX7D_CLK_DUMMY>;
@@ -817,7 +817,7 @@
                                        reg = <0x308b0000 0x10000>;
                                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX7D_SAI2_IPG_CLK>,
-                                                <&clks IMX7D_SAI2_ROOT_CLK>,
+                                                <&clks IMX7D_CLK_DUMMY>,
                                                 <&clks IMX7D_SAI2_ROOT_CLK>,
                                                 <&clks IMX7D_CLK_DUMMY>,
                                                 <&clks IMX7D_CLK_DUMMY>;
@@ -833,7 +833,7 @@
                                        reg = <0x308c0000 0x10000>;
                                        interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
                                        clocks = <&clks IMX7D_SAI3_IPG_CLK>,
-                                                <&clks IMX7D_SAI3_ROOT_CLK>,
+                                                <&clks IMX7D_CLK_DUMMY>,
                                                 <&clks IMX7D_SAI3_ROOT_CLK>,
                                                 <&clks IMX7D_CLK_DUMMY>,
                                                 <&clks IMX7D_CLK_DUMMY>;