diff options
author | Afzal Mohammed <afzal@ti.com> | 2012-08-19 08:59:45 -0400 |
---|---|---|
committer | Afzal Mohammed <afzal@ti.com> | 2012-10-15 05:11:45 -0400 |
commit | 1b47ca1a127925acd73381edb8d1d462014bff1f (patch) | |
tree | 2921dbbb6b58acc0531a4df0948fe21bb21ab128 | |
parent | 757ef79188657087f96f6f12c003b682860fede2 (diff) |
ARM: OMAP2+: gpmc: remove cs# in sync clk div calc
Divider value for a certain sync clk is determined solely
based on gpmc fclk. CS# does not have any role here, thus
remove presence of CS# in clock divider calculation API.
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Reviewed-by: Jon Hunter <jon-hunter@ti.com>
-rw-r--r-- | arch/arm/mach-omap2/gpmc-onenand.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-omap2/gpmc.c | 4 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/gpmc.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c index 50165aa4205..06fd8465721 100644 --- a/arch/arm/mach-omap2/gpmc-onenand.c +++ b/arch/arm/mach-omap2/gpmc-onenand.c | |||
@@ -231,7 +231,7 @@ omap2_onenand_calc_sync_timings(struct omap_onenand_platform_data *cfg, | |||
231 | break; | 231 | break; |
232 | } | 232 | } |
233 | 233 | ||
234 | div = gpmc_cs_calc_divider(cs, min_gpmc_clk_period); | 234 | div = gpmc_calc_divider(min_gpmc_clk_period); |
235 | gpmc_clk_ns = gpmc_ticks_to_ns(div); | 235 | gpmc_clk_ns = gpmc_ticks_to_ns(div); |
236 | if (gpmc_clk_ns < 15) /* >66Mhz */ | 236 | if (gpmc_clk_ns < 15) /* >66Mhz */ |
237 | onenand_flags |= ONENAND_FLAG_HF; | 237 | onenand_flags |= ONENAND_FLAG_HF; |
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 5ac5cf30406..91af5aefeaa 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c | |||
@@ -288,7 +288,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, | |||
288 | return -1 | 288 | return -1 |
289 | #endif | 289 | #endif |
290 | 290 | ||
291 | int gpmc_cs_calc_divider(int cs, unsigned int sync_clk) | 291 | int gpmc_calc_divider(unsigned int sync_clk) |
292 | { | 292 | { |
293 | int div; | 293 | int div; |
294 | u32 l; | 294 | u32 l; |
@@ -308,7 +308,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t) | |||
308 | int div; | 308 | int div; |
309 | u32 l; | 309 | u32 l; |
310 | 310 | ||
311 | div = gpmc_cs_calc_divider(cs, t->sync_clk); | 311 | div = gpmc_calc_divider(t->sync_clk); |
312 | if (div < 0) | 312 | if (div < 0) |
313 | return div; | 313 | return div; |
314 | 314 | ||
diff --git a/arch/arm/plat-omap/include/plat/gpmc.h b/arch/arm/plat-omap/include/plat/gpmc.h index 2e6e2597178..f7e0990eaf3 100644 --- a/arch/arm/plat-omap/include/plat/gpmc.h +++ b/arch/arm/plat-omap/include/plat/gpmc.h | |||
@@ -160,7 +160,7 @@ extern unsigned long gpmc_get_fclk_period(void); | |||
160 | 160 | ||
161 | extern void gpmc_cs_write_reg(int cs, int idx, u32 val); | 161 | extern void gpmc_cs_write_reg(int cs, int idx, u32 val); |
162 | extern u32 gpmc_cs_read_reg(int cs, int idx); | 162 | extern u32 gpmc_cs_read_reg(int cs, int idx); |
163 | extern int gpmc_cs_calc_divider(int cs, unsigned int sync_clk); | 163 | extern int gpmc_calc_divider(unsigned int sync_clk); |
164 | extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t); | 164 | extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t); |
165 | extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base); | 165 | extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base); |
166 | extern void gpmc_cs_free(int cs); | 166 | extern void gpmc_cs_free(int cs); |