aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-01-14 20:37:16 -0500
committerTony Lindgren <tony@atomide.com>2015-01-14 20:37:16 -0500
commit132754e483d55309ddd714a2c44580379e4ac55a (patch)
tree0b52f8d4b7fd1725215c9f9e0d61490b23b504f0
parentc27964b5d2f3c36b0160d6d26f79f2d4730c440b (diff)
ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init
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>
-rw-r--r--arch/arm/mach-omap2/prm_common.c4
-rw-r--r--arch/arm/mach-omap2/timer.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 779940cb6e56..b6587854bca5 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -571,6 +571,10 @@ static const struct of_device_id omap_prcm_dt_match_table[] = {
571 { .compatible = "ti,am3-scrm" }, 571 { .compatible = "ti,am3-scrm" },
572 { .compatible = "ti,am4-prcm" }, 572 { .compatible = "ti,am4-prcm" },
573 { .compatible = "ti,am4-scrm" }, 573 { .compatible = "ti,am4-scrm" },
574 { .compatible = "ti,dm814-prcm" },
575 { .compatible = "ti,dm814-scrm" },
576 { .compatible = "ti,dm816-prcm" },
577 { .compatible = "ti,dm816-scrm" },
574 { .compatible = "ti,omap2-prcm" }, 578 { .compatible = "ti,omap2-prcm" },
575 { .compatible = "ti,omap2-scrm" }, 579 { .compatible = "ti,omap2-scrm" },
576 { .compatible = "ti,omap3-prm" }, 580 { .compatible = "ti,omap3-prm" },
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 4f61148ec168..376b099ba84b 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -146,6 +146,8 @@ static const struct of_device_id omap_timer_match[] __initconst = {
146 { .compatible = "ti,omap3430-timer", }, 146 { .compatible = "ti,omap3430-timer", },
147 { .compatible = "ti,omap4430-timer", }, 147 { .compatible = "ti,omap4430-timer", },
148 { .compatible = "ti,omap5430-timer", }, 148 { .compatible = "ti,omap5430-timer", },
149 { .compatible = "ti,dm814-timer", },
150 { .compatible = "ti,dm816-timer", },
149 { .compatible = "ti,am335x-timer", }, 151 { .compatible = "ti,am335x-timer", },
150 { .compatible = "ti,am335x-timer-1ms", }, 152 { .compatible = "ti,am335x-timer-1ms", },
151 { } 153 { }