* [PATCH] ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP node
@ 2012-09-03 16:20 ` Benoit Cousson
0 siblings, 0 replies; 6+ messages in thread
From: Benoit Cousson @ 2012-09-03 16:20 UTC (permalink / raw)
To: tony@atomide.com
Cc: devicetree-discuss@lists.ozlabs.org, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Remove a useless comment and move GIC controller outside
of the OCP node since it does use the MPU internal bus and
not the OCP.
This will not change the functionality but will reflect the
reality more accurately.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
---
Hi Tony
This is a minor cleanup done since Santosh's series is introducing some more MPU devices that does not belong to the TI main OCP interconnect. It makes sense for consistency / accuracy to move GIC to the same location.
Regards,
Benoit
arch/arm/boot/dts/omap4.dtsi | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 2b670ab..1853dc7 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -38,6 +38,14 @@
};
};
+ gic: interrupt-controller@48241000 {
+ compatible = "arm,cortex-a9-gic";
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ reg = <0x48241000 0x1000>,
+ <0x48240100 0x0100>;
+ };
+
L2: l2-cache-controller@48242000 {
compatible = "arm,pl310-cache";
reg = <0x48242000 0x1000>;
@@ -76,30 +84,6 @@
/*
* XXX: Use a flat representation of the OMAP4 interconnect.
* The real OMAP interconnect network is quite complex.
- *
- * MPU -+-- MPU_PRIVATE - GIC, L2
- * |
- * +----------------+----------+
- * | | |
- * + +- EMIF - DDR |
- * | | |
- * | + +--------+
- * | | |
- * | +- L4_ABE - AESS, MCBSP, TIMERs...
- * | |
- * +- L3_MAIN --+- L4_CORE - IPs...
- * |
- * +- L4_PER - IPs...
- * |
- * +- L4_CFG -+- L4_WKUP - IPs...
- * | |
- * | +- IPs...
- * +- IPU ----+
- * | |
- * +- DSP ----+
- * | |
- * +- DSS ----+
- *
* Since that will not bring real advantage to represent that in DT for
* the moment, just use a fake OCP bus entry to represent the whole bus
* hierarchy.
@@ -111,14 +95,6 @@
ranges;
ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
- gic: interrupt-controller@48241000 {
- compatible = "arm,cortex-a9-gic";
- interrupt-controller;
- #interrupt-cells = <3>;
- reg = <0x48241000 0x1000>,
- <0x48240100 0x0100>;
- };
-
gpio1: gpio@4a310000 {
compatible = "ti,omap4-gpio";
ti,hwmods = "gpio1";
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH] ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP node
@ 2012-09-03 16:20 ` Benoit Cousson
0 siblings, 0 replies; 6+ messages in thread
From: Benoit Cousson @ 2012-09-03 16:20 UTC (permalink / raw)
To: linux-arm-kernel
Remove a useless comment and move GIC controller outside
of the OCP node since it does use the MPU internal bus and
not the OCP.
This will not change the functionality but will reflect the
reality more accurately.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
---
Hi Tony
This is a minor cleanup done since Santosh's series is introducing some more MPU devices that does not belong to the TI main OCP interconnect. It makes sense for consistency / accuracy to move GIC to the same location.
Regards,
Benoit
arch/arm/boot/dts/omap4.dtsi | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 2b670ab..1853dc7 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -38,6 +38,14 @@
};
};
+ gic: interrupt-controller at 48241000 {
+ compatible = "arm,cortex-a9-gic";
+ interrupt-controller;
+ #interrupt-cells = <3>;
+ reg = <0x48241000 0x1000>,
+ <0x48240100 0x0100>;
+ };
+
L2: l2-cache-controller at 48242000 {
compatible = "arm,pl310-cache";
reg = <0x48242000 0x1000>;
@@ -76,30 +84,6 @@
/*
* XXX: Use a flat representation of the OMAP4 interconnect.
* The real OMAP interconnect network is quite complex.
- *
- * MPU -+-- MPU_PRIVATE - GIC, L2
- * |
- * +----------------+----------+
- * | | |
- * + +- EMIF - DDR |
- * | | |
- * | + +--------+
- * | | |
- * | +- L4_ABE - AESS, MCBSP, TIMERs...
- * | |
- * +- L3_MAIN --+- L4_CORE - IPs...
- * |
- * +- L4_PER - IPs...
- * |
- * +- L4_CFG -+- L4_WKUP - IPs...
- * | |
- * | +- IPs...
- * +- IPU ----+
- * | |
- * +- DSP ----+
- * | |
- * +- DSS ----+
- *
* Since that will not bring real advantage to represent that in DT for
* the moment, just use a fake OCP bus entry to represent the whole bus
* hierarchy.
@@ -111,14 +95,6 @@
ranges;
ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
- gic: interrupt-controller at 48241000 {
- compatible = "arm,cortex-a9-gic";
- interrupt-controller;
- #interrupt-cells = <3>;
- reg = <0x48241000 0x1000>,
- <0x48240100 0x0100>;
- };
-
gpio1: gpio at 4a310000 {
compatible = "ti,omap4-gpio";
ti,hwmods = "gpio1";
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP node
2012-09-03 16:20 ` Benoit Cousson
@ 2012-09-04 5:47 ` Shilimkar, Santosh
-1 siblings, 0 replies; 6+ messages in thread
From: Shilimkar, Santosh @ 2012-09-04 5:47 UTC (permalink / raw)
To: Benoit Cousson
Cc: tony@atomide.com, devicetree-discuss@lists.ozlabs.org,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
On Mon, Sep 3, 2012 at 9:20 AM, Benoit Cousson <b-cousson@ti.com> wrote:
> Remove a useless comment and move GIC controller outside
> of the OCP node since it does use the MPU internal bus and
> not the OCP.
> This will not change the functionality but will reflect the
> reality more accurately.
>
> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
> ---
>
Make sense.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP node
@ 2012-09-04 5:47 ` Shilimkar, Santosh
0 siblings, 0 replies; 6+ messages in thread
From: Shilimkar, Santosh @ 2012-09-04 5:47 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Sep 3, 2012 at 9:20 AM, Benoit Cousson <b-cousson@ti.com> wrote:
> Remove a useless comment and move GIC controller outside
> of the OCP node since it does use the MPU internal bus and
> not the OCP.
> This will not change the functionality but will reflect the
> reality more accurately.
>
> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
> ---
>
Make sense.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP node
2012-09-04 5:47 ` Shilimkar, Santosh
@ 2012-09-04 11:30 ` Benoit Cousson
-1 siblings, 0 replies; 6+ messages in thread
From: Benoit Cousson @ 2012-09-04 11:30 UTC (permalink / raw)
To: Shilimkar, Santosh
Cc: tony@atomide.com, devicetree-discuss@lists.ozlabs.org,
linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org
On 09/04/2012 07:47 AM, Shilimkar, Santosh wrote:
> On Mon, Sep 3, 2012 at 9:20 AM, Benoit Cousson <b-cousson@ti.com> wrote:
>> Remove a useless comment and move GIC controller outside
>> of the OCP node since it does use the MPU internal bus and
>> not the OCP.
>> This will not change the functionality but will reflect the
>> reality more accurately.
>>
>> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
>> ---
>>
> Make sense.
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>
Thanks Santosh,
I'll update the patch with your ack are will add it after your series
for Tony to pull.
Thanks,
Benoit
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP node
@ 2012-09-04 11:30 ` Benoit Cousson
0 siblings, 0 replies; 6+ messages in thread
From: Benoit Cousson @ 2012-09-04 11:30 UTC (permalink / raw)
To: linux-arm-kernel
On 09/04/2012 07:47 AM, Shilimkar, Santosh wrote:
> On Mon, Sep 3, 2012 at 9:20 AM, Benoit Cousson <b-cousson@ti.com> wrote:
>> Remove a useless comment and move GIC controller outside
>> of the OCP node since it does use the MPU internal bus and
>> not the OCP.
>> This will not change the functionality but will reflect the
>> reality more accurately.
>>
>> Signed-off-by: Benoit Cousson <b-cousson@ti.com>
>> ---
>>
> Make sense.
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
>
Thanks Santosh,
I'll update the patch with your ack are will add it after your series
for Tony to pull.
Thanks,
Benoit
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-04 11:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-03 16:20 [PATCH] ARM: dts: OMAP4: Cleanup and move GIC outside of the OCP node Benoit Cousson
2012-09-03 16:20 ` Benoit Cousson
2012-09-04 5:47 ` Shilimkar, Santosh
2012-09-04 5:47 ` Shilimkar, Santosh
2012-09-04 11:30 ` Benoit Cousson
2012-09-04 11:30 ` Benoit Cousson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.