OSDN Git Service

ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init
authorTony Lindgren <tony@atomide.com>
Thu, 15 Jan 2015 01:37:16 +0000 (17:37 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 15 Jan 2015 01:37:16 +0000 (17:37 -0800)
Fix dm814 and dm816 clocks and timer init.

Cc: Brian Hutchinson <b.hutchman@gmail.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/prm_common.c
arch/arm/mach-omap2/timer.c

index 779940c..b658785 100644 (file)
@@ -571,6 +571,10 @@ static const struct of_device_id omap_prcm_dt_match_table[] = {
        { .compatible = "ti,am3-scrm" },
        { .compatible = "ti,am4-prcm" },
        { .compatible = "ti,am4-scrm" },
+       { .compatible = "ti,dm814-prcm" },
+       { .compatible = "ti,dm814-scrm" },
+       { .compatible = "ti,dm816-prcm" },
+       { .compatible = "ti,dm816-scrm" },
        { .compatible = "ti,omap2-prcm" },
        { .compatible = "ti,omap2-scrm" },
        { .compatible = "ti,omap3-prm" },
index 4f61148..376b099 100644 (file)
@@ -146,6 +146,8 @@ static const struct of_device_id omap_timer_match[] __initconst = {
        { .compatible = "ti,omap3430-timer", },
        { .compatible = "ti,omap4430-timer", },
        { .compatible = "ti,omap5430-timer", },
+       { .compatible = "ti,dm814-timer", },
+       { .compatible = "ti,dm816-timer", },
        { .compatible = "ti,am335x-timer", },
        { .compatible = "ti,am335x-timer-1ms", },
        { }