Skip to contentSkip to conversation

ARM: dts: exynos: Fix address of PPMU ACP on Exynos4210

PATCH In review Krzysztof Kozlowski 2 participants 5 messages Feb 22, 2018 – Feb 26, 2018

Subsystems (2)
lore
Share & tools
lore

Krzysztof Kozlowski

author maintainer
#0 lore raw

PATCH 1/2 ARM: dts: exynos: Fix address of PPMU ACP on Exynos4210

Typo in unit address of PPMU ACP caused DTC warnings:

arch/arm/boot/dts/exynos4412-odroidu3.dtb:
Warning (simple_bus_reg): Node /soc/ppmu_acp at 10ae0000 simple-bus unit address format error, expected "106e0000"

PPMU ACP (under 0x10ae0000 address) is present only in Exynos4210 so move this node to exynos4210.dtsi with fixing the reg address to proper one.

---
 arch/arm/boot/dts/exynos4.dtsi    | 6 ------
 arch/arm/boot/dts/exynos4210.dtsi | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +0 -6
index 967cd02401c5..909a9f2bf5be 100644
@@ -821,12 +821,6 @@
 			status = "disabled";
 		};
 
-		ppmu_acp: ppmu_acp at 10ae0000 {
-			compatible = "samsung,exynos-ppmu";
-			reg = <0x106e0000 0x2000>;
-			status = "disabled";
-		};
-
 		ppmu_rightbus: ppmu_rightbus at 112a0000 {
 			compatible = "samsung,exynos-ppmu";
 			reg = <0x112a0000 0x2000>;
arch/arm/boot/dts/exynos4210.dtsi +6 -0
index 853604d91158..88fb47cef9a8 100644
@@ -162,6 +162,12 @@
 			iommus = <&sysmmu_g2d>;
 		};
 
+		ppmu_acp: ppmu_acp at 10ae0000 {
+			compatible = "samsung,exynos-ppmu";
+			reg = <0x10ae0000 0x2000>;
+			status = "disabled";
+		};
+
 		ppmu_lcd1: ppmu_lcd1 at 12240000 {
 			compatible = "samsung,exynos-ppmu";
 			reg = <0x12240000 0x2000>;
Signature · 1 line
2.14.1
author maintainer
#1 lore raw

PATCH 2/2 ARM: dts: exynos: Fix unit addresses of PDMA nodes in Exynos5410

Fix the unit addresses of PDMA nodes in Exynos5410 (the reg property is correct) to get rid of DTC warnings like:

arch/arm/boot/dts/exynos5410-odroidxu.dtb: Warning (simple_bus_reg):
Node /soc/amba/pdma at 12680000 simple-bus unit address format error, expected "121a0000"

---
 arch/arm/boot/dts/exynos5410.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/exynos5410.dtsi +4 -4
index 1e6b57d013c4..55509c690328 100644
@@ -196,9 +196,9 @@
 			interrupt-parent = <&gic>;
 			ranges;
 
-			pdma0: pdma at 12680000 {
+			pdma0: pdma at 121a0000 {
 				compatible = "arm,pl330", "arm,primecell";
-				reg = <0x121A0000 0x1000>;
+				reg = <0x121a0000 0x1000>;
 				interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clock CLK_PDMA0>;
 				clock-names = "apb_pclk";
@@ -207,9 +207,9 @@
 				#dma-requests = <32>;
 			};
 
-			pdma1: pdma at 12690000 {
+			pdma1: pdma at 121b0000 {
 				compatible = "arm,pl330", "arm,primecell";
-				reg = <0x121B0000 0x1000>;
+				reg = <0x121b0000 0x1000>;
 				interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clock CLK_PDMA1>;
 				clock-names = "apb_pclk";
Signature · 1 line
2.14.1
Reviewed-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] ARM: dts: exynos: Fix unit addresses of PDMA nodes in Exynos5410

Quoted 30 lines · Krzysztof Kozlowski

Fix the unit addresses of PDMA nodes in Exynos5410 (the reg property is correct) to get rid of DTC warnings like:

arch/arm/boot/dts/exynos5410-odroidxu.dtb: Warning (simple_bus_reg):
Node /soc/amba/pdma at 12680000 simple-bus unit address format error, expected "121a0000"

---
 arch/arm/boot/dts/exynos5410.dtsi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/exynos5410.dtsi +2 -2
index 1e6b57d013c4..55509c690328 100644
@@ -196,9 +196,9 @@
 			interrupt-parent = <&gic>;
 			ranges;
 
-			pdma0: pdma at 12680000 {
+			pdma0: pdma at 121a0000 {
 				compatible = "arm,pl330", "arm,primecell";
-				reg = <0x121A0000 0x1000>;
+				reg = <0x121a0000 0x1000>;
 				interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clock CLK_PDMA0>;
 				clock-names = "apb_pclk";
@@ -207,9 +207,9 @@
 				#dma-requests = <32>;

arch/arm/boot/dts/exynos5410.dtsi line 215

Quoted 10 lines
arch/arm/boot/dts/exynos5410.dtsi +2 -2
 			};
 
-			pdma1: pdma at 12690000 {
+			pdma1: pdma at 121b0000 {
 				compatible = "arm,pl330", "arm,primecell";
-				reg = <0x121B0000 0x1000>;
+				reg = <0x121b0000 0x1000>;
 				interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clock CLK_PDMA1>;
 				clock-names = "apb_pclk";
Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics
Reviewed-by on v1 1/2
#3 lore raw
In reply to Krzysztof Kozlowski
Quoted 40 lines · Krzysztof Kozlowski

Typo in unit address of PPMU ACP caused DTC warnings:

arch/arm/boot/dts/exynos4412-odroidu3.dtb:
Warning (simple_bus_reg): Node /soc/ppmu_acp at 10ae0000 simple-bus unit address format error, expected "106e0000"

PPMU ACP (under 0x10ae0000 address) is present only in Exynos4210 so move this node to exynos4210.dtsi with fixing the reg address to proper one.

---
 arch/arm/boot/dts/exynos4.dtsi    | 6 ------
 arch/arm/boot/dts/exynos4210.dtsi | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +0 -6
index 967cd02401c5..909a9f2bf5be 100644
@@ -821,12 +821,6 @@
 			status = "disabled";
 		};
 
-		ppmu_acp: ppmu_acp at 10ae0000 {
-			compatible = "samsung,exynos-ppmu";
-			reg = <0x106e0000 0x2000>;
-			status = "disabled";
-		};
-
 		ppmu_rightbus: ppmu_rightbus at 112a0000 {
 			compatible = "samsung,exynos-ppmu";
 			reg = <0x112a0000 0x2000>;
arch/arm/boot/dts/exynos4210.dtsi +0 -0
index 853604d91158..88fb47cef9a8 100644
@@ -162,6 +162,12 @@
 			iommus = <&sysmmu_g2d>;
 		};

arch/arm/boot/dts/exynos4210.dtsi line 173

Quoted 10 lines
arch/arm/boot/dts/exynos4210.dtsi +6 -0
 
+		ppmu_acp: ppmu_acp at 10ae0000 {
+			compatible = "samsung,exynos-ppmu";
+			reg = <0x10ae0000 0x2000>;
+			status = "disabled";
+		};
+
 		ppmu_lcd1: ppmu_lcd1 at 12240000 {
 			compatible = "samsung,exynos-ppmu";
 			reg = <0x12240000 0x2000>;
Signature · 3 lines
Best Regards,
Chanwoo Choi
Samsung Electronics
author maintainer
#4 lore raw
Quoted 41 lines · Chanwoo Choi
Quoted 40 lines · Krzysztof Kozlowski

Typo in unit address of PPMU ACP caused DTC warnings:

arch/arm/boot/dts/exynos4412-odroidu3.dtb:
Warning (simple_bus_reg): Node /soc/ppmu_acp at 10ae0000 simple-bus unit address format error, expected "106e0000"

PPMU ACP (under 0x10ae0000 address) is present only in Exynos4210 so move this node to exynos4210.dtsi with fixing the reg address to proper one.

---
 arch/arm/boot/dts/exynos4.dtsi    | 6 ------
 arch/arm/boot/dts/exynos4210.dtsi | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +0 -6
index 967cd02401c5..909a9f2bf5be 100644
@@ -821,12 +821,6 @@
 			status = "disabled";
 		};
 
-		ppmu_acp: ppmu_acp at 10ae0000 {
-			compatible = "samsung,exynos-ppmu";
-			reg = <0x106e0000 0x2000>;
-			status = "disabled";
-		};
-
 		ppmu_rightbus: ppmu_rightbus at 112a0000 {
 			compatible = "samsung,exynos-ppmu";
 			reg = <0x112a0000 0x2000>;
arch/arm/boot/dts/exynos4210.dtsi +0 -0
index 853604d91158..88fb47cef9a8 100644
@@ -162,6 +162,12 @@
 			iommus = <&sysmmu_g2d>;
 		};
 
Quoted 12 lines

arch/arm/boot/dts/exynos4210.dtsi line 173

Quoted 10 lines
arch/arm/boot/dts/exynos4210.dtsi +6 -0
+		ppmu_acp: ppmu_acp at 10ae0000 {
+			compatible = "samsung,exynos-ppmu";
+			reg = <0x10ae0000 0x2000>;
+			status = "disabled";
+		};
+
 		ppmu_lcd1: ppmu_lcd1 at 12240000 {
 			compatible = "samsung,exynos-ppmu";
 			reg = <0x12240000 0x2000>;

Thanks for reviews!

Applied both.

Best regards,
Krzysztof