ARM: dts: renesas: Fix IOMMU device node names

[ Upstream commit ae990a1de014396ffc8d0fcc31b6888c9b0ce59a ]

Fix IOMMU device node names as "iommu@".

Fixes: bbb44da0b595 ("ARM: dts: r8a7743: Add IPMMU DT nodes")
Fixes: 0dcba3de5835 ("ARM: dts: r8a7745: Add IPMMU DT nodes")
Fixes: 350ae49b97c4 ("ARM: dts: r8a7744: Add IPMMU DT nodes")
Fixes: 70496727c082 ("ARM: shmobile: r8a7790: Add IPMMU DT nodes")
Fixes: f1951852ed17 ("ARM: shmobile: r8a7791: Add IPMMU DT nodes")
Fixes: 098cb3a601e6 ("ARM: shmobile: r8a7793: Add IPMMU nodes")
Fixes: 1cb2794f6082 ("ARM: shmobile: r8a7794: Add IPMMU DT nodes")
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
Link: https://lore.kernel.org/r/1587461756-13317-1-git-send-email-yoshihiro.shimoda.uh@renesas.com
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index de981d629bdddec386a98d27b306cf9064e0cf4d..fdd267819319e8a29a4c74fbb22cc25eb1f94d05 100644 (file)
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -338,7 +338,7 @@
                        #thermal-sensor-cells = <0>;
                };
 
-               ipmmu_sy0: mmu@e6280000 {
+               ipmmu_sy0: iommu@e6280000 {
                        compatible = "renesas,ipmmu-r8a7743",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6280000 0 0x1000>;
@@ -348,7 +348,7 @@
                        status = "disabled";
                };
 
-               ipmmu_sy1: mmu@e6290000 {
+               ipmmu_sy1: iommu@e6290000 {
                        compatible = "renesas,ipmmu-r8a7743",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6290000 0 0x1000>;
@@ -357,7 +357,7 @@
                        status = "disabled";
                };
 
-               ipmmu_ds: mmu@e6740000 {
+               ipmmu_ds: iommu@e6740000 {
                        compatible = "renesas,ipmmu-r8a7743",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6740000 0 0x1000>;
@@ -367,7 +367,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mp: mmu@ec680000 {
+               ipmmu_mp: iommu@ec680000 {
                        compatible = "renesas,ipmmu-r8a7743",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xec680000 0 0x1000>;
@@ -376,7 +376,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mx: mmu@fe951000 {
+               ipmmu_mx: iommu@fe951000 {
                        compatible = "renesas,ipmmu-r8a7743",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xfe951000 0 0x1000>;
@@ -386,7 +386,7 @@
                        status = "disabled";
                };
 
-               ipmmu_gp: mmu@e62a0000 {
+               ipmmu_gp: iommu@e62a0000 {
                        compatible = "renesas,ipmmu-r8a7743",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe62a0000 0 0x1000>;

diff --git a/arch/arm/boot/dts/r8a7744.dtsi b/arch/arm/boot/dts/r8a7744.dtsi
index fa74a262107bce6cd9304f1adcdae51fa79d823a..8264481bf87649cce219cfdd9bad454d670c2f43 100644 (file)
--- a/arch/arm/boot/dts/r8a7744.dtsi
+++ b/arch/arm/boot/dts/r8a7744.dtsi
@@ -338,7 +338,7 @@
                        #thermal-sensor-cells = <0>;
                };
 
-               ipmmu_sy0: mmu@e6280000 {
+               ipmmu_sy0: iommu@e6280000 {
                        compatible = "renesas,ipmmu-r8a7744",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6280000 0 0x1000>;
@@ -348,7 +348,7 @@
                        status = "disabled";
                };
 
-               ipmmu_sy1: mmu@e6290000 {
+               ipmmu_sy1: iommu@e6290000 {
                        compatible = "renesas,ipmmu-r8a7744",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6290000 0 0x1000>;
@@ -357,7 +357,7 @@
                        status = "disabled";
                };
 
-               ipmmu_ds: mmu@e6740000 {
+               ipmmu_ds: iommu@e6740000 {
                        compatible = "renesas,ipmmu-r8a7744",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6740000 0 0x1000>;
@@ -367,7 +367,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mp: mmu@ec680000 {
+               ipmmu_mp: iommu@ec680000 {
                        compatible = "renesas,ipmmu-r8a7744",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xec680000 0 0x1000>;
@@ -376,7 +376,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mx: mmu@fe951000 {
+               ipmmu_mx: iommu@fe951000 {
                        compatible = "renesas,ipmmu-r8a7744",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xfe951000 0 0x1000>;
@@ -386,7 +386,7 @@
                        status = "disabled";
                };
 
-               ipmmu_gp: mmu@e62a0000 {
+               ipmmu_gp: iommu@e62a0000 {
                        compatible = "renesas,ipmmu-r8a7744",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe62a0000 0 0x1000>;

diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi
index c53f7ff20695f04adfff363ef378b364dbc3f6e9..c306713f2ab7d5b2fab18cd8278a4c0e07362107 100644 (file)
--- a/arch/arm/boot/dts/r8a7745.dtsi
+++ b/arch/arm/boot/dts/r8a7745.dtsi
@@ -302,7 +302,7 @@
                        resets = <&cpg 407>;
                };
 
-               ipmmu_sy0: mmu@e6280000 {
+               ipmmu_sy0: iommu@e6280000 {
                        compatible = "renesas,ipmmu-r8a7745",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6280000 0 0x1000>;
@@ -312,7 +312,7 @@
                        status = "disabled";
                };
 
-               ipmmu_sy1: mmu@e6290000 {
+               ipmmu_sy1: iommu@e6290000 {
                        compatible = "renesas,ipmmu-r8a7745",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6290000 0 0x1000>;
@@ -321,7 +321,7 @@
                        status = "disabled";
                };
 
-               ipmmu_ds: mmu@e6740000 {
+               ipmmu_ds: iommu@e6740000 {
                        compatible = "renesas,ipmmu-r8a7745",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6740000 0 0x1000>;
@@ -331,7 +331,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mp: mmu@ec680000 {
+               ipmmu_mp: iommu@ec680000 {
                        compatible = "renesas,ipmmu-r8a7745",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xec680000 0 0x1000>;
@@ -340,7 +340,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mx: mmu@fe951000 {
+               ipmmu_mx: iommu@fe951000 {
                        compatible = "renesas,ipmmu-r8a7745",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xfe951000 0 0x1000>;
@@ -350,7 +350,7 @@
                        status = "disabled";
                };
 
-               ipmmu_gp: mmu@e62a0000 {
+               ipmmu_gp: iommu@e62a0000 {
                        compatible = "renesas,ipmmu-r8a7745",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe62a0000 0 0x1000>;

diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 5a2747758f676a4b526231658fb728aae93d2fe9..e3ba00a22eebf6e86cb76a858c2f8235efb5f3d4 100644 (file)
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -427,7 +427,7 @@
                        #thermal-sensor-cells = <0>;
                };
 
-               ipmmu_sy0: mmu@e6280000 {
+               ipmmu_sy0: iommu@e6280000 {
                        compatible = "renesas,ipmmu-r8a7790",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6280000 0 0x1000>;
@@ -437,7 +437,7 @@
                        status = "disabled";
                };
 
-               ipmmu_sy1: mmu@e6290000 {
+               ipmmu_sy1: iommu@e6290000 {
                        compatible = "renesas,ipmmu-r8a7790",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6290000 0 0x1000>;
@@ -446,7 +446,7 @@
                        status = "disabled";
                };
 
-               ipmmu_ds: mmu@e6740000 {
+               ipmmu_ds: iommu@e6740000 {
                        compatible = "renesas,ipmmu-r8a7790",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6740000 0 0x1000>;
@@ -456,7 +456,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mp: mmu@ec680000 {
+               ipmmu_mp: iommu@ec680000 {
                        compatible = "renesas,ipmmu-r8a7790",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xec680000 0 0x1000>;
@@ -465,7 +465,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mx: mmu@fe951000 {
+               ipmmu_mx: iommu@fe951000 {
                        compatible = "renesas,ipmmu-r8a7790",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xfe951000 0 0x1000>;
@@ -475,7 +475,7 @@
                        status = "disabled";
                };
 
-               ipmmu_rt: mmu@ffc80000 {
+               ipmmu_rt: iommu@ffc80000 {
                        compatible = "renesas,ipmmu-r8a7790",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xffc80000 0 0x1000>;

diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 6f875502453cf40a52df7337e53e4933c7a8053f..a26f86ccc57940e273f1d70bc0308829eb0f64f1 100644 (file)
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -350,7 +350,7 @@
                        #thermal-sensor-cells = <0>;
                };
 
-               ipmmu_sy0: mmu@e6280000 {
+               ipmmu_sy0: iommu@e6280000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6280000 0 0x1000>;
@@ -360,7 +360,7 @@
                        status = "disabled";
                };
 
-               ipmmu_sy1: mmu@e6290000 {
+               ipmmu_sy1: iommu@e6290000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6290000 0 0x1000>;
@@ -369,7 +369,7 @@
                        status = "disabled";
                };
 
-               ipmmu_ds: mmu@e6740000 {
+               ipmmu_ds: iommu@e6740000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6740000 0 0x1000>;
@@ -379,7 +379,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mp: mmu@ec680000 {
+               ipmmu_mp: iommu@ec680000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xec680000 0 0x1000>;
@@ -388,7 +388,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mx: mmu@fe951000 {
+               ipmmu_mx: iommu@fe951000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xfe951000 0 0x1000>;
@@ -398,7 +398,7 @@
                        status = "disabled";
                };
 
-               ipmmu_rt: mmu@ffc80000 {
+               ipmmu_rt: iommu@ffc80000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xffc80000 0 0x1000>;
@@ -407,7 +407,7 @@
                        status = "disabled";
                };
 
-               ipmmu_gp: mmu@e62a0000 {
+               ipmmu_gp: iommu@e62a0000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe62a0000 0 0x1000>;

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index bf05110fac4e23beb7b5dff259d44b317a49c0db..fa3839795018815859370edf52c59885dacba886 100644 (file)
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -336,7 +336,7 @@
                        #thermal-sensor-cells = <0>;
                };
 
-               ipmmu_sy0: mmu@e6280000 {
+               ipmmu_sy0: iommu@e6280000 {
                        compatible = "renesas,ipmmu-r8a7793",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6280000 0 0x1000>;
@@ -346,7 +346,7 @@
                        status = "disabled";
                };
 
-               ipmmu_sy1: mmu@e6290000 {
+               ipmmu_sy1: iommu@e6290000 {
                        compatible = "renesas,ipmmu-r8a7793",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6290000 0 0x1000>;
@@ -355,7 +355,7 @@
                        status = "disabled";
                };
 
-               ipmmu_ds: mmu@e6740000 {
+               ipmmu_ds: iommu@e6740000 {
                        compatible = "renesas,ipmmu-r8a7793",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6740000 0 0x1000>;
@@ -365,7 +365,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mp: mmu@ec680000 {
+               ipmmu_mp: iommu@ec680000 {
                        compatible = "renesas,ipmmu-r8a7793",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xec680000 0 0x1000>;
@@ -374,7 +374,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mx: mmu@fe951000 {
+               ipmmu_mx: iommu@fe951000 {
                        compatible = "renesas,ipmmu-r8a7793",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xfe951000 0 0x1000>;
@@ -384,7 +384,7 @@
                        status = "disabled";
                };
 
-               ipmmu_rt: mmu@ffc80000 {
+               ipmmu_rt: iommu@ffc80000 {
                        compatible = "renesas,ipmmu-r8a7793",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xffc80000 0 0x1000>;
@@ -393,7 +393,7 @@
                        status = "disabled";
                };
 
-               ipmmu_gp: mmu@e62a0000 {
+               ipmmu_gp: iommu@e62a0000 {
                        compatible = "renesas,ipmmu-r8a7793",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe62a0000 0 0x1000>;

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index 8d797d34816e3625e1c3a56aa7e6af8cadc219dc..9dd952479e680fb2cd074a76c2ef483b594c36fa 100644 (file)
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -290,7 +290,7 @@
                        resets = <&cpg 407>;
                };
 
-               ipmmu_sy0: mmu@e6280000 {
+               ipmmu_sy0: iommu@e6280000 {
                        compatible = "renesas,ipmmu-r8a7794",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6280000 0 0x1000>;
@@ -300,7 +300,7 @@
                        status = "disabled";
                };
 
-               ipmmu_sy1: mmu@e6290000 {
+               ipmmu_sy1: iommu@e6290000 {
                        compatible = "renesas,ipmmu-r8a7794",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6290000 0 0x1000>;
@@ -309,7 +309,7 @@
                        status = "disabled";
                };
 
-               ipmmu_ds: mmu@e6740000 {
+               ipmmu_ds: iommu@e6740000 {
                        compatible = "renesas,ipmmu-r8a7794",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6740000 0 0x1000>;
@@ -319,7 +319,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mp: mmu@ec680000 {
+               ipmmu_mp: iommu@ec680000 {
                        compatible = "renesas,ipmmu-r8a7794",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xec680000 0 0x1000>;
@@ -328,7 +328,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mx: mmu@fe951000 {
+               ipmmu_mx: iommu@fe951000 {
                        compatible = "renesas,ipmmu-r8a7794",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xfe951000 0 0x1000>;
@@ -338,7 +338,7 @@
                        status = "disabled";
                };
 
-               ipmmu_gp: mmu@e62a0000 {
+               ipmmu_gp: iommu@e62a0000 {
                        compatible = "renesas,ipmmu-r8a7794",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe62a0000 0 0x1000>;