4 files changed, 62 insertions, 8 deletions

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 78813b397209..88aa6b1835c3 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -110,6 +110,7 @@ MACHINE_END
 
 static const char *omap3_gp_boards_compat[] __initdata = {
         "ti,omap3-beagle",
+        "timll,omap3-devkit8000",
         NULL,
 };
 
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 93f213b6a784..d25a95fe9921 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -139,6 +139,8 @@
 #include <linux/slab.h>
 #include <linux/bootmem.h>
 #include <linux/cpu.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
 
 #include <asm/system_misc.h>
 
@@ -2350,6 +2352,34 @@ static int _shutdown(struct omap_hwmod *oh)
 }
 
 /**
+ * of_dev_hwmod_lookup - look up needed hwmod from dt blob
+ * @np: struct device_node *
+ * @oh: struct omap_hwmod *
+ *
+ * Parse the dt blob and find out needed hwmod. Recursive function is
+ * implemented to take care hierarchical dt blob parsing.
+ * Return: The device node on success or NULL on failure.
+ */
+static struct device_node *of_dev_hwmod_lookup(struct device_node *np,
+                                                struct omap_hwmod *oh)
+{
+        struct device_node *np0 = NULL, *np1 = NULL;
+        const char *p;
+
+        for_each_child_of_node(np, np0) {
+                if (of_find_property(np0, "ti,hwmods", NULL)) {
+                        p = of_get_property(np0, "ti,hwmods", NULL);
+                        if (!strcmp(p, oh->name))
+                                return np0;
+                        np1 = of_dev_hwmod_lookup(np0, oh);
+                        if (np1)
+                                return np1;
+                }
+        }
+        return NULL;
+}
+
+/**
  * _init_mpu_rt_base - populate the virtual address for a hwmod
  * @oh: struct omap_hwmod * to locate the virtual address
  *
@@ -2361,7 +2391,8 @@ static int _shutdown(struct omap_hwmod *oh)
 static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data)
 {
         struct omap_hwmod_addr_space *mem;
-        void __iomem *va_start;
+        void __iomem *va_start = NULL;
+        struct device_node *np;
 
         if (!oh)
                 return;
@@ -2375,10 +2406,18 @@ static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data)
         if (!mem) {
                 pr_debug("omap_hwmod: %s: no MPU register target found\n",
                          oh->name);
-                return;
+
+                /* Extract the IO space from device tree blob */
+                if (!of_have_populated_dt())
+                        return;
+
+                np = of_dev_hwmod_lookup(of_find_node_by_name(NULL, "ocp"), oh);
+                if (np)
+                        va_start = of_iomap(np, 0);
+        } else {
+                va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
         }
 
-        va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);
         if (!va_start) {
                 pr_err("omap_hwmod: %s: Could not ioremap\n", oh->name);
                 return;
@@ -2410,7 +2449,8 @@ static int __init _init(struct omap_hwmod *oh, void *data)
         if (oh->_state != _HWMOD_STATE_REGISTERED)
                 return 0;
 
-        _init_mpu_rt_base(oh, NULL);
+        if (oh->class->sysc)
+                _init_mpu_rt_base(oh, NULL);
 
         r = _init_clocks(oh, NULL);
         if (r < 0) {
diff --git a/arch/arm/mach-omap2/pmu.c b/arch/arm/mach-omap2/pmu.c
index 9debf822687c..9ace8eae7ee8 100644
--- a/arch/arm/mach-omap2/pmu.c
+++ b/arch/arm/mach-omap2/pmu.c
@@ -11,6 +11,8 @@
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  */
+#include <linux/of.h>
+
 #include <asm/pmu.h>
 
 #include "soc.h"
@@ -63,6 +65,15 @@ static int __init omap_init_pmu(void)
         unsigned oh_num;
         char **oh_names;
 
+        /* XXX Remove this check when the CTI driver is available */
+        if (cpu_is_omap443x()) {
+                pr_info("ARM PMU: not yet supported on OMAP4430 due to missing CTI driver\n");
+                return 0;
+        }
+
+        if (of_have_populated_dt())
+                return 0;
+
         /*
          * To create an ARM-PMU device the following HWMODs
          * are required for the various OMAP2+ devices.
@@ -75,9 +86,6 @@ static int __init omap_init_pmu(void)
         if (cpu_is_omap443x()) {
                 oh_num = ARRAY_SIZE(omap4430_pmu_oh_names);
                 oh_names = omap4430_pmu_oh_names;
-                /* XXX Remove the next two lines when CTI driver available */
-                pr_info("ARM PMU: not yet supported on OMAP4430 due to missing CTI driver\n");
-                return 0;
         } else if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
                 oh_num = ARRAY_SIZE(omap3_pmu_oh_names);
                 oh_names = omap3_pmu_oh_names;
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index f12aa6c15da4..02e1d56a3fe5 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -133,7 +133,12 @@ static struct property device_disabled = {
 };
 
 static struct of_device_id omap_timer_match[] __initdata = {
-        { .compatible = "ti,omap2-timer", },
+        { .compatible = "ti,omap2420-timer", },
+        { .compatible = "ti,omap3430-timer", },
+        { .compatible = "ti,omap4430-timer", },
+        { .compatible = "ti,omap5430-timer", },
+        { .compatible = "ti,am335x-timer", },
+        { .compatible = "ti,am335x-timer-1ms", },
         { }
 };