projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: edb3ed3)
ARM: dts: imx6: Change the clock name for spba clock
authorShengjiu Wang <shengjiu.wang@freescale.com>
Thu, 26 Nov 2015 02:39:30 +0000 (10:39 +0800)
committerShawn Guo <shawnguo@kernel.org>
Tue, 22 Dec 2015 12:43:36 +0000 (20:43 +0800)
Audio IP need the spba clock, but original clock name "dma" is not
accurate, so change it to name "spba". The audio driver has been
using the new name "spba", the binding document has been updated.

Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx6qdl.dtsi patch | blob | blame | history
arch/arm/boot/dts/imx6sl.dtsi patch | blob | blame | history
arch/arm/boot/dts/imx6sx.dtsi patch | blob | blame | history

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index b98a41664855d9ffa6c891a4b5c71f9d32dbcaa4..f3b005c0a766b847b48efde05db8a4d35be55d50 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -227,7 +227,7 @@
                                                      "rxtx1", "rxtx2",
                                                      "rxtx3", "rxtx4",
                                                      "rxtx5", "rxtx6",
-                                                     "rxtx7", "dma";
+                                                     "rxtx7", "spba";
                                        status = "disabled";
                                };
 
@@ -309,7 +309,7 @@
                                                 <&clks IMX6QDL_CLK_ESAI_EXTAL>,
                                                 <&clks IMX6QDL_CLK_ESAI_IPG>,
                                                 <&clks IMX6QDL_CLK_SPBA>;
-                                       clock-names = "core", "mem", "extal", "fsys", "dma";
+                                       clock-names = "core", "mem", "extal", "fsys", "spba";
                                        dmas = <&sdma 23 21 0>, <&sdma 24 21 0>;
                                        dma-names = "rx", "tx";
                                        status = "disabled";
@@ -378,7 +378,7 @@
                                                "asrck_1", "asrck_2", "asrck_3", "asrck_4",
                                                "asrck_5", "asrck_6", "asrck_7", "asrck_8",
                                                "asrck_9", "asrck_a", "asrck_b", "asrck_c",
-                                               "asrck_d", "asrck_e", "asrck_f", "dma";
+                                               "asrck_d", "asrck_e", "asrck_f", "spba";
                                        dmas = <&sdma 17 23 1>, <&sdma 18 23 1>, <&sdma 19 23 1>,
                                                <&sdma 20 23 1>, <&sdma 21 23 1>, <&sdma 22 23 1>;
                                        dma-names = "rxa", "rxb", "rxc",
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index ebeae8f76436c58c2f04afc10339cb2998a85dda..d12b250342a6deab8cb4809c8dc105403e44cd39 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -151,7 +151,7 @@
                                                "rxtx1", "rxtx2",
                                                "rxtx3", "rxtx4",
                                                "rxtx5", "rxtx6",
-                                               "rxtx7", "dma";
+                                               "rxtx7", "spba";
                                        status = "disabled";
                                };
 
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index a74ae8d60c606287c812bb75565f21ddaf46bfb9..a5f76025a0ce9196569cb0f140740b952933407a 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -222,7 +222,7 @@
                                                      "rxtx1", "rxtx2",
                                                      "rxtx3", "rxtx4",
                                                      "rxtx5", "rxtx6",
-                                                     "rxtx7", "dma";
+                                                     "rxtx7", "spba";
                                        status = "disabled";
                                };
 
@@ -295,7 +295,7 @@
                                                 <&clks IMX6SX_CLK_ESAI_IPG>,
                                                 <&clks IMX6SX_CLK_SPBA>;
                                        clock-names = "core", "mem", "extal",
-                                                     "fsys", "dma";
+                                                     "fsys", "spba";
                                        status = "disabled";
                                };
 
@@ -348,7 +348,7 @@
                                                 <&clks IMX6SX_CLK_ASRC_IPG>,
                                                 <&clks IMX6SX_CLK_SPDIF>,
                                                 <&clks IMX6SX_CLK_SPBA>;
-                                       clock-names = "mem", "ipg", "asrck", "dma";
+                                       clock-names = "mem", "ipg", "asrck", "spba";
                                        dmas = <&sdma 17 20 1>, <&sdma 18 20 1>,
                                               <&sdma 19 20 1>, <&sdma 20 20 1>,
                                               <&sdma 21 20 1>, <&sdma 22 20 1>;