Merge branch 'for_3.10/dts' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into omap-for-v3.10/dt

1 files changed, 6 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 2bdd4cf17a8f..14b89afe4af7 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -143,7 +143,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", },
         { }
 };