aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/clock_data.c
diff options
context:
space:
mode:
authorJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>2011-12-08 21:01:41 -0500
committerTony Lindgren <tony@atomide.com>2011-12-08 21:02:23 -0500
commit24ce2705c2dd50e51f325c6e57dec378adc8c135 (patch)
tree9f0688dae115c48d87ea8cda615a64831fb3c80d /arch/arm/mach-omap1/clock_data.c
parentee62e93a3c135ae18f2fa18615ce065fe5487259 (diff)
ARM: OMAP1: Move dpll1 rates selection from config to runtime
For still better multi-OMAP1 support, expand omap1_rate_table with flags for different SoC types and match them while selecting clock rates. The idea is stolen from current omap24xx clock rate selection algorithm. Since clkdev platform flag definitions are reused here, those had to be expanded with one extra entry for OMAP1710 subtype, as this is the only SoC for which we allow selection of the highest, 216 MHz rate. Once done, remove no longer needed clock rate configure time options. Tested on Amstrad Delta. Signed-off-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl> [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/clock_data.c')
-rw-r--r--arch/arm/mach-omap1/clock_data.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/clock_data.c b/arch/arm/mach-omap1/clock_data.c
index 9ff90a744a21..ff2d5248df23 100644
--- a/arch/arm/mach-omap1/clock_data.c
+++ b/arch/arm/mach-omap1/clock_data.c
@@ -778,12 +778,14 @@ static void __init omap1_show_rates(void)
778 arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10); 778 arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);
779} 779}
780 780
781u32 cpu_mask;
782
781int __init omap1_clk_init(void) 783int __init omap1_clk_init(void)
782{ 784{
783 struct omap_clk *c; 785 struct omap_clk *c;
784 const struct omap_clock_config *info; 786 const struct omap_clock_config *info;
785 int crystal_type = 0; /* Default 12 MHz */ 787 int crystal_type = 0; /* Default 12 MHz */
786 u32 reg, cpu_mask; 788 u32 reg;
787 789
788#ifdef CONFIG_DEBUG_LL 790#ifdef CONFIG_DEBUG_LL
789 /* 791 /*
@@ -808,6 +810,8 @@ int __init omap1_clk_init(void)
808 clk_preinit(c->lk.clk); 810 clk_preinit(c->lk.clk);
809 811
810 cpu_mask = 0; 812 cpu_mask = 0;
813 if (cpu_is_omap1710())
814 cpu_mask |= CK_1710;
811 if (cpu_is_omap16xx()) 815 if (cpu_is_omap16xx())
812 cpu_mask |= CK_16XX; 816 cpu_mask |= CK_16XX;
813 if (cpu_is_omap1510()) 817 if (cpu_is_omap1510())