summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/devices.c
diff options
context:
space:
mode:
authorBenoit Cousson <b-cousson@ti.com>2011-08-12 13:48:47 +0200
committerBenoit Cousson <b-cousson@ti.com>2011-10-04 22:29:39 +0200
commitad8dfac66fb1995014060302bda19a15bc62bd6d (patch)
treeee807e9a225ecfa909f092949511e3db1e311235 /arch/arm/mach-omap2/devices.c
parentd039c5b9fb2315ef942944439da6f0fbaf2f1941 (diff)
downloadop-kernel-dev-ad8dfac66fb1995014060302bda19a15bc62bd6d.zip
op-kernel-dev-ad8dfac66fb1995014060302bda19a15bc62bd6d.tar.gz
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.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 2d4a199..0f8e0eb 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -16,6 +16,7 @@
#include <linux/clk.h>
#include <linux/err.h>
#include <linux/slab.h>
+#include <linux/of.h>
#include <mach/hardware.h>
#include <mach/irqs.h>
@@ -77,6 +78,10 @@ static int __init omap4_l3_init(void)
struct platform_device *pdev;
char oh_name[L3_MODULES_MAX_LEN];
+ /* If dtb is there, the devices will be created dynamically */
+ if (of_have_populated_dt())
+ return -ENODEV;
+
/*
* To avoid code running on other OMAPs in
* multi-omap builds
OpenPOWER on IntegriCloud