From 4a0d41b4b1481ea7f78364e6245185af57d28999 Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson@ti.com>
Date: Fri, 12 Aug 2011 13:48:47 +0200
Subject: [PATCH] --- yaml --- r: 272915 b: refs/heads/master c:
 ad8dfac66fb1995014060302bda19a15bc62bd6d h: refs/heads/master i:   272913:
 b21a2f9aeebd0f08328a32f8cca2fb766d390a77   272911:
 3e02649971e696af347ce04e768394abe3431f34 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/boot/dts/omap4.dtsi  | 3 ++-
 trunk/arch/arm/mach-omap2/devices.c | 5 +++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f9b3487b954c..169f2379c0f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d039c5b9fb2315ef942944439da6f0fbaf2f1941
+refs/heads/master: ad8dfac66fb1995014060302bda19a15bc62bd6d
diff --git a/trunk/arch/arm/boot/dts/omap4.dtsi b/trunk/arch/arm/boot/dts/omap4.dtsi
index d4131e36aefb..b85a39debbea 100644
--- a/trunk/arch/arm/boot/dts/omap4.dtsi
+++ b/trunk/arch/arm/boot/dts/omap4.dtsi
@@ -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";
diff --git a/trunk/arch/arm/mach-omap2/devices.c b/trunk/arch/arm/mach-omap2/devices.c
index 2d4a1998d5d9..0f8e0eb18166 100644
--- a/trunk/arch/arm/mach-omap2/devices.c
+++ b/trunk/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