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>

diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 779940c..b658785 100644 (file)
--- 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[] = {
        { .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" },

diff --cc arch/arm/mach-omap2/timer.c
Simple merge