2 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index d0e884d3a737..e602e75ce5b7 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -79,7 +79,7 @@
          * hierarchy.
          */
         ocp {
-                compatible = "simple-bus";
+                compatible = "ti,omap3-l3-smx", "simple-bus";
                 reg = <0x68000000 0x10000>;
                 interrupts = <9 10>;
                 #address-cells = <1>;
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 324f02bf8a51..55447972eeed 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -49,7 +49,7 @@ static int __init omap3_l3_init(void)
          * To avoid code running on other OMAPs in
          * multi-omap builds
          */
-        if (!(cpu_is_omap34xx()))
+        if (!(cpu_is_omap34xx()) || of_have_populated_dt())
                 return -ENODEV;
 
         snprintf(oh_name, L3_MODULES_MAX_LEN, "l3_main");