* [PATCH] ARM: dts: exynos4: clean up arm-pmu node
@ 2014-04-14 13:03 Chanho Park
2014-04-24 17:04 ` Tomasz Figa
0 siblings, 1 reply; 3+ messages in thread
From: Chanho Park @ 2014-04-14 13:03 UTC (permalink / raw)
To: linux-arm-kernel
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.
Cc: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
---
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(-)
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e541ecb..6de978c 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index cacf614..4e7610f 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 15d3c0a..e6af870 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -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>;
};
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 3d77a40..318f3ac 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -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>;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] ARM: dts: exynos4: clean up arm-pmu node
2014-04-14 13:03 [PATCH] ARM: dts: exynos4: clean up arm-pmu node Chanho Park
@ 2014-04-24 17:04 ` Tomasz Figa
2014-04-25 2:03 ` Chanho Park
0 siblings, 1 reply; 3+ messages in thread
From: Tomasz Figa @ 2014-04-24 17:04 UTC (permalink / raw)
To: linux-arm-kernel
Hi Chanho,
On 14.04.2014 15:03, Chanho Park wrote:
> 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.
>
> Cc: Chanwoo Choi <cw00.choi@samsung.com>
> Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> ---
> 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(-)
>
> diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
> index e541ecb..6de978c 100644
> --- a/arch/arm/boot/dts/exynos4.dtsi
> +++ b/arch/arm/boot/dts/exynos4.dtsi
> @@ -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>;
> diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
> index cacf614..4e7610f 100644
> --- a/arch/arm/boot/dts/exynos4210.dtsi
> +++ b/arch/arm/boot/dts/exynos4210.dtsi
> @@ -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>;
> diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
> index 15d3c0a..e6af870 100644
> --- a/arch/arm/boot/dts/exynos4412.dtsi
> +++ b/arch/arm/boot/dts/exynos4412.dtsi
> @@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] ARM: dts: exynos4: clean up arm-pmu node
2014-04-24 17:04 ` Tomasz Figa
@ 2014-04-25 2:03 ` Chanho Park
0 siblings, 0 replies; 3+ messages in thread
From: Chanho Park @ 2014-04-25 2:03 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tomasz,
> -----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 node
>
> Hi Chanho,
>
> On 14.04.2014 15:03, Chanho Park wrote:
> > 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.
> >
> > Cc: Chanwoo Choi <cw00.choi@samsung.com>
> > Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> > ---
> > 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(-)
> >
> > diff --git a/arch/arm/boot/dts/exynos4.dtsi
> b/arch/arm/boot/dts/exynos4.dtsi
> > index e541ecb..6de978c 100644
> > --- a/arch/arm/boot/dts/exynos4.dtsi
> > +++ b/arch/arm/boot/dts/exynos4.dtsi
> > @@ -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>;
> > diff --git a/arch/arm/boot/dts/exynos4210.dtsi
> b/arch/arm/boot/dts/exynos4210.dtsi
> > index cacf614..4e7610f 100644
> > --- a/arch/arm/boot/dts/exynos4210.dtsi
> > +++ b/arch/arm/boot/dts/exynos4210.dtsi
> > @@ -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>;
> > diff --git a/arch/arm/boot/dts/exynos4412.dtsi
> b/arch/arm/boot/dts/exynos4412.dtsi
> > index 15d3c0a..e6af870 100644
> > --- a/arch/arm/boot/dts/exynos4412.dtsi
> > +++ b/arch/arm/boot/dts/exynos4412.dtsi
> > @@ -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.
Yes. It can be omitted in the exynos4412.dtsi. Thank you for your review.
I'll send V2 Patch.
Best Regards,
Chanho Park
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-04-25 2:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-14 13:03 [PATCH] ARM: dts: exynos4: clean up arm-pmu node Chanho Park
2014-04-24 17:04 ` Tomasz Figa
2014-04-25 2:03 ` Chanho Park
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).