aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2015-12-03 15:02:31 -0500
committerTony Lindgren <tony@atomide.com>2015-12-09 19:53:46 -0500
commit4e34df0cba14e95e941bf73721352fa4d9c2622f (patch)
tree19916230ce4582e732d9825fc4c62c902c92f90d
parent5fbeef5822781972d6fa054842cc7edca101f4bc (diff)
ARM: OMAP2+: Add DPPLS clock manager for dm814x
On dm814x we have some clocks at DPLLS and some at PRCM. Let's add a new omap_prcm_init_data entry for the DPLLS so we can initalize timer clocks early. 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.c6
-rw-r--r--include/linux/clk/ti.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/prm_common.c b/arch/arm/mach-omap2/prm_common.c
index 3fc2cbe52113..55acc76113b8 100644
--- a/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@ -662,6 +662,11 @@ static struct omap_prcm_init_data am3_prm_data __initdata = {
662 .index = TI_CLKM_PRM, 662 .index = TI_CLKM_PRM,
663 .init = am33xx_prm_init, 663 .init = am33xx_prm_init,
664}; 664};
665
666static struct omap_prcm_init_data dm814_pllss_data __initdata = {
667 .index = TI_CLKM_PLLSS,
668 .init = am33xx_prm_init,
669};
665#endif 670#endif
666 671
667#ifdef CONFIG_ARCH_OMAP4 672#ifdef CONFIG_ARCH_OMAP4
@@ -715,6 +720,7 @@ static const struct of_device_id const omap_prcm_dt_match_table[] __initconst =
715#endif 720#endif
716#ifdef CONFIG_SOC_TI81XX 721#ifdef CONFIG_SOC_TI81XX
717 { .compatible = "ti,dm814-prcm", .data = &am3_prm_data }, 722 { .compatible = "ti,dm814-prcm", .data = &am3_prm_data },
723 { .compatible = "ti,dm814-pllss", .data = &dm814_pllss_data },
718 { .compatible = "ti,dm816-prcm", .data = &am3_prm_data }, 724 { .compatible = "ti,dm816-prcm", .data = &am3_prm_data },
719#endif 725#endif
720#ifdef CONFIG_ARCH_OMAP2 726#ifdef CONFIG_ARCH_OMAP2
diff --git a/include/linux/clk/ti.h b/include/linux/clk/ti.h
index 223be696df27..57663c162e1c 100644
--- a/include/linux/clk/ti.h
+++ b/include/linux/clk/ti.h
@@ -195,6 +195,7 @@ enum {
195 TI_CLKM_PRM, 195 TI_CLKM_PRM,
196 TI_CLKM_SCRM, 196 TI_CLKM_SCRM,
197 TI_CLKM_CTRL, 197 TI_CLKM_CTRL,
198 TI_CLKM_PLLSS,
198 CLK_MAX_MEMMAPS 199 CLK_MAX_MEMMAPS
199}; 200};
200 201