diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-04-08 16:34:32 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-04-08 16:34:32 -0700 |
| commit | d05663a23f31a1baf25ab8894b8c3fb2a506aa6a (patch) | |
| tree | 6b40bb08676a2788b007482df65f6d21a4afe331 /arch/arm/mach-omap2/timer.c | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| parent | 1fac4fffa719a98ec1047eaece236244333c9afe (diff) | |
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
Diffstat (limited to 'arch/arm/mach-omap2/timer.c')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 7 |
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", }, { } }; |