projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: fea89b2)
ARM: dts: renesas: Fix IOMMU device node names
authorYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Tue, 21 Apr 2020 09:35:56 +0000 (18:35 +0900)
committerGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 27 Apr 2020 10:01:52 +0000 (12:01 +0200)
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>
arch/arm/boot/dts/r8a7743.dtsi patch | blob | history
arch/arm/boot/dts/r8a7744.dtsi patch | blob | history
arch/arm/boot/dts/r8a7745.dtsi patch | blob | history
arch/arm/boot/dts/r8a7790.dtsi patch | blob | history
arch/arm/boot/dts/r8a7791.dtsi patch | blob | history
arch/arm/boot/dts/r8a7793.dtsi patch | blob | history
arch/arm/boot/dts/r8a7794.dtsi patch | blob | history

diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index e8b340bb99bc303183613ed3d5778ce87200e32c..fff123753b85bf387f049f43dd4e39dc67d1d970 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 def840b8b2d3c0c482a4e2d27ea644caf1129bad..5050ac19041d513917d58362a507f0acd9517b9d 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 7ab58d8bb74010d6a014b054272d1cd5c8378011..b0d1fc24e97e404249aa7b324831900dd070d5ec 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 e5ef9fd4284ae436d54c394e03959ae30ef06fb9..166d5566229d4e3378150032dcd263dec9ed0aff 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 b2d329a5d8d532cd27f6c352ca95c70804d055b1..225676fbe312b1b56821b0cfaeac0970adba2645 100644 (file)
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -361,7 +361,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>;
@@ -371,7 +371,7 @@
                        status = "disabled";
                };
 
-               ipmmu_sy1: mmu@e6290000 {
+               ipmmu_sy1: iommu@e6290000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6290000 0 0x1000>;
@@ -380,7 +380,7 @@
                        status = "disabled";
                };
 
-               ipmmu_ds: mmu@e6740000 {
+               ipmmu_ds: iommu@e6740000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xe6740000 0 0x1000>;
@@ -390,7 +390,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mp: mmu@ec680000 {
+               ipmmu_mp: iommu@ec680000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xec680000 0 0x1000>;
@@ -399,7 +399,7 @@
                        status = "disabled";
                };
 
-               ipmmu_mx: mmu@fe951000 {
+               ipmmu_mx: iommu@fe951000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xfe951000 0 0x1000>;
@@ -409,7 +409,7 @@
                        status = "disabled";
                };
 
-               ipmmu_rt: mmu@ffc80000 {
+               ipmmu_rt: iommu@ffc80000 {
                        compatible = "renesas,ipmmu-r8a7791",
                                     "renesas,ipmmu-vmsa";
                        reg = <0 0xffc80000 0 0x1000>;
@@ -418,7 +418,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 dadbda16161b745715e7ff1ff70be7853c91da75..1b62a7e06b429140e81547610b0279fdabf51689 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 2c9e7a1ebfec1863ab7a9c34b5ece4a34b0cf8d3..8d7f8798628a6887f1f7f25cc662d496eb4f4ea0 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>;
ep93xx device tree rework repo: git://git.maquefel.me/linux.git