ARM: dts: exynos4: clean up arm-pmu node
Subsystems (2)
PATCH 1/1 ARM: dts: exynos4: clean up arm-pmu node
This patch cleans a arm-pmu node up for exynos4. Only exynos4412 series boards have four pmu interrupts. Rest of exynos4 boards, except 4412, have only two pmu interrupts. Thus, we can define two interrupts in the exynos4.dtsi and extends the interrupts only exynos4412.dtsi.
--- arch/arm/boot/dts/exynos4.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4210.dtsi | 6 ------ arch/arm/boot/dts/exynos4412.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4x12.dtsi | 6 ------ 4 files changed, 12 insertions(+), 12 deletions(-)
arch/arm/boot/dts/exynos4.dtsi +6 -0
@@ -105,6 +105,12 @@ reg = <0x10440000 0x1000>; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&combiner>; + interrupts = <2 2>, <3 2>; + }; + sys_reg: syscon at 10010000 { compatible = "samsung,exynos4-sysreg", "syscon"; reg = <0x10010000 0x400>;
arch/arm/boot/dts/exynos4210.dtsi +0 -6
@@ -75,12 +75,6 @@ #clock-cells = <1>; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupt-parent = <&combiner>; - interrupts = <2 2>, <3 2>; - }; - pinctrl_0: pinctrl at 11400000 { compatible = "samsung,exynos4210-pinctrl"; reg = <0x11400000 0x1000>;
arch/arm/boot/dts/exynos4412.dtsi +6 -0
@@ -26,6 +26,12 @@ samsung,combiner-nr = <20>; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&combiner>; + interrupts = <2 2>, <3 2>, <18 2>, <19 2>; + }; + gic: interrupt-controller at 10490000 { cpu-offset = <0x4000>; };
arch/arm/boot/dts/exynos4x12.dtsi +0 -6
@@ -31,12 +31,6 @@ mshc0 = &mshc_0; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupt-parent = <&combiner>; - interrupts = <2 2>, <3 2>, <18 2>, <19 2>; - }; - pd_isp: isp-power-domain at 10023CA0 { compatible = "samsung,exynos4210-pd"; reg = <0x10023CA0 0x20>;
Signature · 1 line
1.8.3.2
PATCH 1/1 ARM: dts: exynos4: clean up arm-pmu node
Hi Chanho,
Quoted 53 lines · Chanho Park
This patch cleans a arm-pmu node up for exynos4. Only exynos4412 series boards have four pmu interrupts. Rest of exynos4 boards, except 4412, have only two pmu interrupts. Thus, we can define two interrupts in the
exynos4.dtsiand extends the interrupts onlyexynos4412.dtsi.Cc Chanwoo Choi <[email protected]>Signed-off-by Chanho Park <[email protected]>--- arch/arm/boot/dts/exynos4.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4210.dtsi | 6 ------ arch/arm/boot/dts/exynos4412.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4x12.dtsi | 6 ------ 4 files changed, 12 insertions(+), 12 deletions(-)arch/arm/boot/dts/exynos4.dtsi +6
-0@@ -105,6 +105,12 @@ reg = <0x10440000 0x1000>; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&combiner>; + interrupts = <2 2>, <3 2>; + }; + sys_reg: syscon at 10010000 { compatible = "samsung,exynos4-sysreg", "syscon"; reg = <0x10010000 0x400>;arch/arm/boot/dts/exynos4210.dtsi +0
-6@@ -75,12 +75,6 @@ #clock-cells = <1>; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupt-parent = <&combiner>; - interrupts = <2 2>, <3 2>; - }; - pinctrl_0: pinctrl at 11400000 { compatible = "samsung,exynos4210-pinctrl"; reg = <0x11400000 0x1000>;arch/arm/boot/dts/exynos4412.dtsi +0
-0
arch/arm/boot/dts/exynos4412.dtsi line 31
Quoted 6 lines
arch/arm/boot/dts/exynos4412.dtsi +3
-0@@ -26,6 +26,12 @@ samsung,combiner-nr = <20>; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&combiner>;
I guess you could omit the two properties above and let them be inherited from exynos4.dtsi.
Otherwise looks fine.
Best regards,
Tomasz
PATCH 1/1 ARM: dts: exynos4: clean up arm-pmu node
Hi Tomasz,
Quoted 73 lines
-----Original Message-----
From: linux-arm-kernel [mailto:linux-arm-kernel- bounces at lists.infradead.org] On Behalf Of Tomasz Figa
Sent: Friday, April 25, 2014 2:04 AM
To: Chanho Park; kgene.kim at samsung.com; linux-samsung- soc at vger.kernel.org
Cc: Chanwoo Choi; linux-arm-kernel at lists.infradead.org
Subject: Re: [PATCH] ARM: dts: exynos4: clean up arm-pmu nodeHi Chanho,
Quoted 1 line · Chanho Park
This patch cleans a arm-pmu node up for exynos4. Only exynos4412
series
Quoted 1 line
boards have four pmu interrupts. Rest of exynos4 boards, except 4412,
have only
Quoted 5 lines
two pmu interrupts. Thus, we can define two interrupts in the
exynos4.dtsiand extends the interrupts onlyexynos4412.dtsi.Cc Chanwoo Choi <[email protected]>Signed-off-by Chanho Park <[email protected]>Review
Quoted 8 lines
--- arch/arm/boot/dts/exynos4.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4210.dtsi | 6 ------ arch/arm/boot/dts/exynos4412.dtsi | 6 ++++++ arch/arm/boot/dts/exynos4x12.dtsi | 6 ------ 4 files changed, 12 insertions(+), 12 deletions(-)(quoted diff) +0
-0
b/arch/arm/boot/dts/exynos4.dtsiReview
Quoted 17 lines
index e541ecb..6de978c 100644
arch/arm/boot/dts/exynos4.dtsi +6
-0@@ -105,6 +105,12 @@ reg = <0x10440000 0x1000>; }; + pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&combiner>; + interrupts = <2 2>, <3 2>; + }; + sys_reg: syscon at 10010000 { compatible = "samsung,exynos4-sysreg", "syscon"; reg = <0x10010000 0x400>;(quoted diff) +0
-0
b/arch/arm/boot/dts/exynos4210.dtsiReview
Quoted 17 lines
index cacf614..4e7610f 100644
arch/arm/boot/dts/exynos4210.dtsi +0
-6@@ -75,12 +75,6 @@ #clock-cells = <1>; }; - pmu { - compatible = "arm,cortex-a9-pmu"; - interrupt-parent = <&combiner>; - interrupts = <2 2>, <3 2>; - }; - pinctrl_0: pinctrl at 11400000 { compatible = "samsung,exynos4210-pinctrl"; reg = <0x11400000 0x1000>;(quoted diff) +0
-0
b/arch/arm/boot/dts/exynos4412.dtsiQuoted 7 lines
index 15d3c0a..e6af870 100644
arch/arm/boot/dts/exynos4412.dtsi +0
-0@@ -26,6 +26,12 @@ samsung,combiner-nr = <20>; };
Quoted 6 lines
arch/arm/boot/dts/exynos4412.dtsi line 31
Quoted 3 lines
arch/arm/boot/dts/exynos4412.dtsi +3
-0+ pmu { + compatible = "arm,cortex-a9-pmu"; + interrupt-parent = <&combiner>;I guess you could omit the two properties above and let them be inherited from
exynos4.dtsi.
Yes. It can be omitted in the exynos4412.dtsi. Thank you for your review. I'll send V2 Patch.
Best Regards,
Chanho Park