diff options
author | Benoit Cousson <b-cousson@ti.com> | 2011-08-12 07:48:47 -0400 |
---|---|---|
committer | Benoit Cousson <b-cousson@ti.com> | 2011-10-04 16:29:39 -0400 |
commit | ad8dfac66fb1995014060302bda19a15bc62bd6d (patch) | |
tree | ee807e9a225ecfa909f092949511e3db1e311235 /arch/arm/mach-omap2/devices.c | |
parent | d039c5b9fb2315ef942944439da6f0fbaf2f1941 (diff) |
arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
Used the main OCP node to add bindings with the l3_noc driver.
Remove l3_noc static device creation if DT is populated.
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 2d4a1998d5d..0f8e0eb1816 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -16,6 +16,7 @@ | |||
16 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
18 | #include <linux/slab.h> | 18 | #include <linux/slab.h> |
19 | #include <linux/of.h> | ||
19 | 20 | ||
20 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
21 | #include <mach/irqs.h> | 22 | #include <mach/irqs.h> |
@@ -77,6 +78,10 @@ static int __init omap4_l3_init(void) | |||
77 | struct platform_device *pdev; | 78 | struct platform_device *pdev; |
78 | char oh_name[L3_MODULES_MAX_LEN]; | 79 | char oh_name[L3_MODULES_MAX_LEN]; |
79 | 80 | ||
81 | /* If dtb is there, the devices will be created dynamically */ | ||
82 | if (of_have_populated_dt()) | ||
83 | return -ENODEV; | ||
84 | |||
80 | /* | 85 | /* |
81 | * To avoid code running on other OMAPs in | 86 | * To avoid code running on other OMAPs in |
82 | * multi-omap builds | 87 | * multi-omap builds |