Skip to content

Commit

Permalink
ARM: OMAP2+: gpmc: remove cs# in sync clk div calc
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Afzal Mohammed committed Oct 15, 2012
1 parent 757ef79 commit 1b47ca1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion arch/arm/mach-omap2/gpmc-onenand.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ omap2_onenand_calc_sync_timings(struct omap_onenand_platform_data *cfg,
break;
}

div = gpmc_cs_calc_divider(cs, min_gpmc_clk_period);
div = gpmc_calc_divider(min_gpmc_clk_period);
gpmc_clk_ns = gpmc_ticks_to_ns(div);
if (gpmc_clk_ns < 15) /* >66Mhz */
onenand_flags |= ONENAND_FLAG_HF;
Expand Down
4 changes: 2 additions & 2 deletions arch/arm/mach-omap2/gpmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit,
return -1
#endif

int gpmc_cs_calc_divider(int cs, unsigned int sync_clk)
int gpmc_calc_divider(unsigned int sync_clk)
{
int div;
u32 l;
Expand All @@ -308,7 +308,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)
int div;
u32 l;

div = gpmc_cs_calc_divider(cs, t->sync_clk);
div = gpmc_calc_divider(t->sync_clk);
if (div < 0)
return div;

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/plat-omap/include/plat/gpmc.h
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ extern unsigned long gpmc_get_fclk_period(void);

extern void gpmc_cs_write_reg(int cs, int idx, u32 val);
extern u32 gpmc_cs_read_reg(int cs, int idx);
extern int gpmc_cs_calc_divider(int cs, unsigned int sync_clk);
extern int gpmc_calc_divider(unsigned int sync_clk);
extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t);
extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base);
extern void gpmc_cs_free(int cs);
Expand Down

0 comments on commit 1b47ca1

Please sign in to comment.