Skip to content

Commit

Permalink
arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benoit Cousson committed Oct 4, 2011
1 parent d039c5b commit ad8dfac
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/omap4.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,11 @@
* hierarchy.
*/
ocp {
compatible = "simple-bus";
compatible = "ti,omap4-l3-noc", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges;
ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";

gic: interrupt-controller@48241000 {
compatible = "arm,cortex-a9-gic";
Expand Down
5 changes: 5 additions & 0 deletions arch/arm/mach-omap2/devices.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ad8dfac

Please sign in to comment.