[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20200618010805.600873-15-sashal@kernel.org>
Date: Wed, 17 Jun 2020 21:01:52 -0400
From: Sasha Levin <sashal@...nel.org>
To: linux-kernel@...r.kernel.org, stable@...r.kernel.org
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>,
Niklas Söderlund
<niklas.soderlund+renesas@...natech.se>,
Geert Uytterhoeven <geert+renesas@...der.be>,
Sasha Levin <sashal@...nel.org>,
linux-renesas-soc@...r.kernel.org, devicetree@...r.kernel.org
Subject: [PATCH AUTOSEL 5.7 015/388] ARM: dts: renesas: Fix IOMMU device node names
From: Yoshihiro Shimoda <yoshihiro.shimoda.uh@...esas.com>
[ 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@...esas.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@...natech.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@...der.be>
Signed-off-by: Sasha Levin <sashal@...nel.org>
---
arch/arm/boot/dts/r8a7743.dtsi | 12 ++++++------
arch/arm/boot/dts/r8a7744.dtsi | 12 ++++++------
arch/arm/boot/dts/r8a7745.dtsi | 12 ++++++------
arch/arm/boot/dts/r8a7790.dtsi | 12 ++++++------
arch/arm/boot/dts/r8a7791.dtsi | 14 +++++++-------
arch/arm/boot/dts/r8a7793.dtsi | 14 +++++++-------
arch/arm/boot/dts/r8a7794.dtsi | 12 ++++++------
7 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
index e8b340bb99bc..fff123753b85 100644
--- a/arch/arm/boot/dts/r8a7743.dtsi
+++ b/arch/arm/boot/dts/r8a7743.dtsi
@@ -338,7 +338,7 @@ thermal: thermal@...f0000 {
#thermal-sensor-cells = <0>;
};
- ipmmu_sy0: mmu@...80000 {
+ ipmmu_sy0: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7743",
"renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
@@ -348,7 +348,7 @@ ipmmu_sy0: mmu@...80000 {
status = "disabled";
};
- ipmmu_sy1: mmu@...90000 {
+ ipmmu_sy1: iommu@...90000 {
compatible = "renesas,ipmmu-r8a7743",
"renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
@@ -357,7 +357,7 @@ ipmmu_sy1: mmu@...90000 {
status = "disabled";
};
- ipmmu_ds: mmu@...40000 {
+ ipmmu_ds: iommu@...40000 {
compatible = "renesas,ipmmu-r8a7743",
"renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
@@ -367,7 +367,7 @@ ipmmu_ds: mmu@...40000 {
status = "disabled";
};
- ipmmu_mp: mmu@...80000 {
+ ipmmu_mp: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7743",
"renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
@@ -376,7 +376,7 @@ ipmmu_mp: mmu@...80000 {
status = "disabled";
};
- ipmmu_mx: mmu@...51000 {
+ ipmmu_mx: iommu@...51000 {
compatible = "renesas,ipmmu-r8a7743",
"renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
@@ -386,7 +386,7 @@ ipmmu_mx: mmu@...51000 {
status = "disabled";
};
- ipmmu_gp: mmu@...a0000 {
+ ipmmu_gp: iommu@...a0000 {
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 def840b8b2d3..5050ac19041d 100644
--- a/arch/arm/boot/dts/r8a7744.dtsi
+++ b/arch/arm/boot/dts/r8a7744.dtsi
@@ -338,7 +338,7 @@ thermal: thermal@...f0000 {
#thermal-sensor-cells = <0>;
};
- ipmmu_sy0: mmu@...80000 {
+ ipmmu_sy0: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7744",
"renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
@@ -348,7 +348,7 @@ ipmmu_sy0: mmu@...80000 {
status = "disabled";
};
- ipmmu_sy1: mmu@...90000 {
+ ipmmu_sy1: iommu@...90000 {
compatible = "renesas,ipmmu-r8a7744",
"renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
@@ -357,7 +357,7 @@ ipmmu_sy1: mmu@...90000 {
status = "disabled";
};
- ipmmu_ds: mmu@...40000 {
+ ipmmu_ds: iommu@...40000 {
compatible = "renesas,ipmmu-r8a7744",
"renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
@@ -367,7 +367,7 @@ ipmmu_ds: mmu@...40000 {
status = "disabled";
};
- ipmmu_mp: mmu@...80000 {
+ ipmmu_mp: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7744",
"renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
@@ -376,7 +376,7 @@ ipmmu_mp: mmu@...80000 {
status = "disabled";
};
- ipmmu_mx: mmu@...51000 {
+ ipmmu_mx: iommu@...51000 {
compatible = "renesas,ipmmu-r8a7744",
"renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
@@ -386,7 +386,7 @@ ipmmu_mx: mmu@...51000 {
status = "disabled";
};
- ipmmu_gp: mmu@...a0000 {
+ ipmmu_gp: iommu@...a0000 {
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 7ab58d8bb740..b0d1fc24e97e 100644
--- a/arch/arm/boot/dts/r8a7745.dtsi
+++ b/arch/arm/boot/dts/r8a7745.dtsi
@@ -302,7 +302,7 @@ irqc: interrupt-controller@...c0000 {
resets = <&cpg 407>;
};
- ipmmu_sy0: mmu@...80000 {
+ ipmmu_sy0: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7745",
"renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
@@ -312,7 +312,7 @@ ipmmu_sy0: mmu@...80000 {
status = "disabled";
};
- ipmmu_sy1: mmu@...90000 {
+ ipmmu_sy1: iommu@...90000 {
compatible = "renesas,ipmmu-r8a7745",
"renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
@@ -321,7 +321,7 @@ ipmmu_sy1: mmu@...90000 {
status = "disabled";
};
- ipmmu_ds: mmu@...40000 {
+ ipmmu_ds: iommu@...40000 {
compatible = "renesas,ipmmu-r8a7745",
"renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
@@ -331,7 +331,7 @@ ipmmu_ds: mmu@...40000 {
status = "disabled";
};
- ipmmu_mp: mmu@...80000 {
+ ipmmu_mp: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7745",
"renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
@@ -340,7 +340,7 @@ ipmmu_mp: mmu@...80000 {
status = "disabled";
};
- ipmmu_mx: mmu@...51000 {
+ ipmmu_mx: iommu@...51000 {
compatible = "renesas,ipmmu-r8a7745",
"renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
@@ -350,7 +350,7 @@ ipmmu_mx: mmu@...51000 {
status = "disabled";
};
- ipmmu_gp: mmu@...a0000 {
+ ipmmu_gp: iommu@...a0000 {
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 e5ef9fd4284a..166d5566229d 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -427,7 +427,7 @@ thermal: thermal@...f0000 {
#thermal-sensor-cells = <0>;
};
- ipmmu_sy0: mmu@...80000 {
+ ipmmu_sy0: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7790",
"renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
@@ -437,7 +437,7 @@ ipmmu_sy0: mmu@...80000 {
status = "disabled";
};
- ipmmu_sy1: mmu@...90000 {
+ ipmmu_sy1: iommu@...90000 {
compatible = "renesas,ipmmu-r8a7790",
"renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
@@ -446,7 +446,7 @@ ipmmu_sy1: mmu@...90000 {
status = "disabled";
};
- ipmmu_ds: mmu@...40000 {
+ ipmmu_ds: iommu@...40000 {
compatible = "renesas,ipmmu-r8a7790",
"renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
@@ -456,7 +456,7 @@ ipmmu_ds: mmu@...40000 {
status = "disabled";
};
- ipmmu_mp: mmu@...80000 {
+ ipmmu_mp: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7790",
"renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
@@ -465,7 +465,7 @@ ipmmu_mp: mmu@...80000 {
status = "disabled";
};
- ipmmu_mx: mmu@...51000 {
+ ipmmu_mx: iommu@...51000 {
compatible = "renesas,ipmmu-r8a7790",
"renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
@@ -475,7 +475,7 @@ ipmmu_mx: mmu@...51000 {
status = "disabled";
};
- ipmmu_rt: mmu@...80000 {
+ ipmmu_rt: iommu@...80000 {
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 6e5bd86731cd..09e47cc17765 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -350,7 +350,7 @@ thermal: thermal@...f0000 {
#thermal-sensor-cells = <0>;
};
- ipmmu_sy0: mmu@...80000 {
+ ipmmu_sy0: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7791",
"renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
@@ -360,7 +360,7 @@ ipmmu_sy0: mmu@...80000 {
status = "disabled";
};
- ipmmu_sy1: mmu@...90000 {
+ ipmmu_sy1: iommu@...90000 {
compatible = "renesas,ipmmu-r8a7791",
"renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
@@ -369,7 +369,7 @@ ipmmu_sy1: mmu@...90000 {
status = "disabled";
};
- ipmmu_ds: mmu@...40000 {
+ ipmmu_ds: iommu@...40000 {
compatible = "renesas,ipmmu-r8a7791",
"renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
@@ -379,7 +379,7 @@ ipmmu_ds: mmu@...40000 {
status = "disabled";
};
- ipmmu_mp: mmu@...80000 {
+ ipmmu_mp: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7791",
"renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
@@ -388,7 +388,7 @@ ipmmu_mp: mmu@...80000 {
status = "disabled";
};
- ipmmu_mx: mmu@...51000 {
+ ipmmu_mx: iommu@...51000 {
compatible = "renesas,ipmmu-r8a7791",
"renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
@@ -398,7 +398,7 @@ ipmmu_mx: mmu@...51000 {
status = "disabled";
};
- ipmmu_rt: mmu@...80000 {
+ ipmmu_rt: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7791",
"renesas,ipmmu-vmsa";
reg = <0 0xffc80000 0 0x1000>;
@@ -407,7 +407,7 @@ ipmmu_rt: mmu@...80000 {
status = "disabled";
};
- ipmmu_gp: mmu@...a0000 {
+ ipmmu_gp: iommu@...a0000 {
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 dadbda16161b..1b62a7e06b42 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -336,7 +336,7 @@ thermal: thermal@...f0000 {
#thermal-sensor-cells = <0>;
};
- ipmmu_sy0: mmu@...80000 {
+ ipmmu_sy0: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7793",
"renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
@@ -346,7 +346,7 @@ ipmmu_sy0: mmu@...80000 {
status = "disabled";
};
- ipmmu_sy1: mmu@...90000 {
+ ipmmu_sy1: iommu@...90000 {
compatible = "renesas,ipmmu-r8a7793",
"renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
@@ -355,7 +355,7 @@ ipmmu_sy1: mmu@...90000 {
status = "disabled";
};
- ipmmu_ds: mmu@...40000 {
+ ipmmu_ds: iommu@...40000 {
compatible = "renesas,ipmmu-r8a7793",
"renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
@@ -365,7 +365,7 @@ ipmmu_ds: mmu@...40000 {
status = "disabled";
};
- ipmmu_mp: mmu@...80000 {
+ ipmmu_mp: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7793",
"renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
@@ -374,7 +374,7 @@ ipmmu_mp: mmu@...80000 {
status = "disabled";
};
- ipmmu_mx: mmu@...51000 {
+ ipmmu_mx: iommu@...51000 {
compatible = "renesas,ipmmu-r8a7793",
"renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
@@ -384,7 +384,7 @@ ipmmu_mx: mmu@...51000 {
status = "disabled";
};
- ipmmu_rt: mmu@...80000 {
+ ipmmu_rt: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7793",
"renesas,ipmmu-vmsa";
reg = <0 0xffc80000 0 0x1000>;
@@ -393,7 +393,7 @@ ipmmu_rt: mmu@...80000 {
status = "disabled";
};
- ipmmu_gp: mmu@...a0000 {
+ ipmmu_gp: iommu@...a0000 {
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 2c9e7a1ebfec..8d7f8798628a 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -290,7 +290,7 @@ irqc0: interrupt-controller@...c0000 {
resets = <&cpg 407>;
};
- ipmmu_sy0: mmu@...80000 {
+ ipmmu_sy0: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7794",
"renesas,ipmmu-vmsa";
reg = <0 0xe6280000 0 0x1000>;
@@ -300,7 +300,7 @@ ipmmu_sy0: mmu@...80000 {
status = "disabled";
};
- ipmmu_sy1: mmu@...90000 {
+ ipmmu_sy1: iommu@...90000 {
compatible = "renesas,ipmmu-r8a7794",
"renesas,ipmmu-vmsa";
reg = <0 0xe6290000 0 0x1000>;
@@ -309,7 +309,7 @@ ipmmu_sy1: mmu@...90000 {
status = "disabled";
};
- ipmmu_ds: mmu@...40000 {
+ ipmmu_ds: iommu@...40000 {
compatible = "renesas,ipmmu-r8a7794",
"renesas,ipmmu-vmsa";
reg = <0 0xe6740000 0 0x1000>;
@@ -319,7 +319,7 @@ ipmmu_ds: mmu@...40000 {
status = "disabled";
};
- ipmmu_mp: mmu@...80000 {
+ ipmmu_mp: iommu@...80000 {
compatible = "renesas,ipmmu-r8a7794",
"renesas,ipmmu-vmsa";
reg = <0 0xec680000 0 0x1000>;
@@ -328,7 +328,7 @@ ipmmu_mp: mmu@...80000 {
status = "disabled";
};
- ipmmu_mx: mmu@...51000 {
+ ipmmu_mx: iommu@...51000 {
compatible = "renesas,ipmmu-r8a7794",
"renesas,ipmmu-vmsa";
reg = <0 0xfe951000 0 0x1000>;
@@ -338,7 +338,7 @@ ipmmu_mx: mmu@...51000 {
status = "disabled";
};
- ipmmu_gp: mmu@...a0000 {
+ ipmmu_gp: iommu@...a0000 {
compatible = "renesas,ipmmu-r8a7794",
"renesas,ipmmu-vmsa";
reg = <0 0xe62a0000 0 0x1000>;
--
2.25.1
Powered by blists - more mailing lists