ARM: dts: imx: update sdma node name format

[ Upstream commit 6769089ecb5073b0896addffe72c89a4d80258c9 ]

Node names should be generic, so change the sdma node name format 'sdma'
into 'dma-controller'.

Acked-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Joy Zou <joy.zou@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Stable-dep-of: be18293e47cb ("ARM: dts: imx: Set default tuning step for imx7d usdhc")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index fdcca82c9986f6f52f8bda390733c403f13ebef3..bd8ea2ec24575861edb73567c610eb160e9f7a8b 100644 (file)
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -515,7 +515,7 @@
                                #interrupt-cells = <2>;
                        };
 
-                       sdma: sdma@53fd4000 {
+                       sdma: dma-controller@53fd4000 {
                                compatible = "fsl,imx25-sdma";
                                reg = <0x53fd4000 0x4000>;
                                clocks = <&clks 112>, <&clks 68>;

diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index 948d2a543f8d119adb546b6860fb1fd4f1533988..c85866e73a7b9316f8b152f9a8b78be144c94262 100644 (file)
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -297,7 +297,7 @@
                                #interrupt-cells = <2>;
                        };
 
-                       sdma: sdma@53fd4000 {
+                       sdma: dma-controller@53fd4000 {
                                compatible = "fsl,imx31-sdma";
                                reg = <0x53fd4000 0x4000>;
                                interrupts = <34>;

diff --git a/arch/arm/boot/dts/imx35.dtsi b/arch/arm/boot/dts/imx35.dtsi
index 8e41c8b7bd705ff21854856bc1823a23a3502e1d..d650f54c3fc6bd2f886848638a120807c764d5a4 100644 (file)
--- a/arch/arm/boot/dts/imx35.dtsi
+++ b/arch/arm/boot/dts/imx35.dtsi
@@ -284,7 +284,7 @@
                                #interrupt-cells = <2>;
                        };
 
-                       sdma: sdma@53fd4000 {
+                       sdma: dma-controller@53fd4000 {
                                compatible = "fsl,imx35-sdma";
                                reg = <0x53fd4000 0x4000>;
                                clocks = <&clks 9>, <&clks 65>;

diff --git a/arch/arm/boot/dts/imx50.dtsi b/arch/arm/boot/dts/imx50.dtsi
index a969f335b24026fd1aaa4043bb2b9aae0c3c2a98..2560f8514ebed8632b7005c2df6a6d361ec040f4 100644 (file)
--- a/arch/arm/boot/dts/imx50.dtsi
+++ b/arch/arm/boot/dts/imx50.dtsi
@@ -421,7 +421,7 @@
                                status = "disabled";
                        };
 
-                       sdma: sdma@63fb0000 {
+                       sdma: dma-controller@63fb0000 {
                                compatible = "fsl,imx50-sdma", "fsl,imx35-sdma";
                                reg = <0x63fb0000 0x4000>;
                                interrupts = <6>;

diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 01cfcbe5928e83a1c7514d8cbd94c461ef85e761..b3ab0c000d9d14b4cf89965167a7ccf9d51fb824 100644 (file)
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -498,7 +498,7 @@
                                status = "disabled";
                        };
 
-                       sdma: sdma@83fb0000 {
+                       sdma: dma-controller@83fb0000 {
                                compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
                                reg = <0x83fb0000 0x4000>;
                                interrupts = <6>;

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 2cf3909cca2f871a4936d8f927d57c8b7377cf25..ca1bea42cc0e25f513a92bcb8b8dd11f49e43842 100644 (file)
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -710,7 +710,7 @@
                                status = "disabled";
                        };
 
-                       sdma: sdma@63fb0000 {
+                       sdma: dma-controller@63fb0000 {
                                compatible = "fsl,imx53-sdma", "fsl,imx35-sdma";
                                reg = <0x63fb0000 0x4000>;
                                interrupts = <6>;

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 8520ffc1779b66d32631f6dc4017e789f8e0a8b3..60fd903ead3aae765c91d64028c6cf7cc0dc3556 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -930,7 +930,7 @@
                                interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
-                       sdma: sdma@20ec000 {
+                       sdma: dma-controller@20ec000 {
                                compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
                                reg = <0x020ec000 0x4000>;
                                interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index 5b4dfc62030e8f1376052390f97f8e6e18f97c97..0e0139246ad2183708bfa0e6ce8094aa7af64b6f 100644 (file)
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -752,7 +752,7 @@
                                interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
                        };
 
-                       sdma: sdma@20ec000 {
+                       sdma: dma-controller@20ec000 {
                                compatible = "fsl,imx6sl-sdma", "fsl,imx6q-sdma";
                                reg = <0x020ec000 0x4000>;
                                interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 3e779fd0a3961c070c1bb1020a7da697607d6eb9..ff4dc6d1b7578353a21f44766e28d30de87b14d1 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -848,7 +848,7 @@
                                reg = <0x020e4000 0x4000>;
                        };
 
-                       sdma: sdma@20ec000 {
+                       sdma: dma-controller@20ec000 {
                                compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";
                                reg = <0x020ec000 0x4000>;
                                interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index eca8bf89ab88fadc5a3e04d7de648432d7c96a8c..f920c7beb02faa90500b7362b48c482e73c1581d 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -744,7 +744,7 @@
                                status = "disabled";
                        };
 
-                       sdma: sdma@20ec000 {
+                       sdma: dma-controller@20ec000 {
                                compatible = "fsl,imx6ul-sdma", "fsl,imx6q-sdma",
                                             "fsl,imx35-sdma";
                                reg = <0x020ec000 0x4000>;

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index f4d2009d998b73e5413be700ecfebde7c7dd3674..5951f9a22af86bad0a578697f3d03a9377f03ddf 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -1206,7 +1206,7 @@
                                status = "disabled";
                        };
 
-                       sdma: sdma@30bd0000 {
+                       sdma: dma-controller@30bd0000 {
                                compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma";
                                reg = <0x30bd0000 0x10000>;
                                interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;