[RFC PATCH 02/10] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
From: Benoit Cousson <hidden>
Date: 2011-08-24 13:09:08
Also in:
linux-devicetree, linux-omap
Subsystem:
arm port, omap2+ support, the rest · Maintainers:
Russell King, Aaro Koskinen, Andreas Kemnade, Kevin Hilman, Roger Quadros, Tony Lindgren, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2011-09-09 · Re: [RFC PATCH 02/10] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver · Grant Likely <hidden>
- 2011-09-09 · Re: [RFC PATCH 02/10] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver · Cousson, Benoit <hidden>
- 2011-09-08 · Re: [RFC PATCH 02/10] arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver · Grant Likely <hidden>
Used the main OCP node to add bindings with the l3_noc driver. Remove l3_noc static device creation if CONFIG_OF is defined. Signed-off-by: Benoit Cousson <redacted> Cc: Tony Lindgren <tony@atomide.com> Cc: Santosh Shilimkar <redacted> --- arch/arm/boot/dts/omap4.dtsi | 3 ++- arch/arm/mach-omap2/devices.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 97a3ea7..928a74c 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi@@ -64,10 +64,11 @@ * hierarchy. */ ocp { - compatible = "simple-bus"; + compatible = "ti,l3-noc", "arteris,noc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; + hwmods = "l3_main_1", "l3_main_2", "l3_main_3"; gic: interrupt-controller at 48241000 { compatible = "ti,omap4-gic", "arm,gic";
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 2d4a199..5964650 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c@@ -70,6 +70,7 @@ static int __init omap3_l3_init(void) } postcore_initcall(omap3_l3_init); +#ifndef CONFIG_OF static int __init omap4_l3_init(void) { int l, i;
@@ -100,6 +101,7 @@ static int __init omap4_l3_init(void) return IS_ERR(pdev) ? PTR_ERR(pdev) : 0; } postcore_initcall(omap4_l3_init); +#endif #if defined(CONFIG_VIDEO_OMAP2) || defined(CONFIG_VIDEO_OMAP2_MODULE)
--
1.7.0.4