| Message ID | 3cc7885c2ae9055763ba72cae0735b065dae403e.1345524670.git.afzal@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 08/21/2012 05:45 AM, Afzal Mohammed wrote: > 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> > --- > arch/arm/mach-omap2/gpmc-onenand.c | 3 +-- > arch/arm/mach-omap2/gpmc.c | 4 ++-- > arch/arm/plat-omap/include/plat/gpmc.h | 2 +- > 3 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c > index 8a301f3..e139e3f 100644 > --- a/arch/arm/mach-omap2/gpmc-onenand.c > +++ b/arch/arm/mach-omap2/gpmc-onenand.c > @@ -182,7 +182,6 @@ omap2_onenand_calc_sync_timings(struct omap_onenand_platform_data *cfg, > int min_gpmc_clk_period, t_ces, t_avds, t_avdh, t_ach, t_aavdh, t_rdyo; > int div, fclk_offset_ns, fclk_offset, gpmc_clk_ns; > int ticks_cez; > - int cs = cfg->cs; > > if (cfg->flags & ONENAND_SYNC_READ) > onenand_flags = ONENAND_FLAG_SYNCREAD; > @@ -229,7 +228,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; > diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c > index 68123d0..d005b3a 100644 > --- a/arch/arm/mach-omap2/gpmc.c > +++ b/arch/arm/mach-omap2/gpmc.c > @@ -313,7 +313,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; > @@ -333,7 +333,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 -1; > > diff --git a/arch/arm/plat-omap/include/plat/gpmc.h b/arch/arm/plat-omap/include/plat/gpmc.h > index b7c9ea6..1cafbfd 100644 > --- a/arch/arm/plat-omap/include/plat/gpmc.h > +++ b/arch/arm/plat-omap/include/plat/gpmc.h > @@ -179,7 +179,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); > Reviewed-by: Jon Hunter <jon-hunter@ti.com> Thanks! Jon
diff --git a/arch/arm/mach-omap2/gpmc-onenand.c b/arch/arm/mach-omap2/gpmc-onenand.c index 8a301f3..e139e3f 100644 --- a/arch/arm/mach-omap2/gpmc-onenand.c +++ b/arch/arm/mach-omap2/gpmc-onenand.c @@ -182,7 +182,6 @@ omap2_onenand_calc_sync_timings(struct omap_onenand_platform_data *cfg, int min_gpmc_clk_period, t_ces, t_avds, t_avdh, t_ach, t_aavdh, t_rdyo; int div, fclk_offset_ns, fclk_offset, gpmc_clk_ns; int ticks_cez; - int cs = cfg->cs; if (cfg->flags & ONENAND_SYNC_READ) onenand_flags = ONENAND_FLAG_SYNCREAD; @@ -229,7 +228,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; diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 68123d0..d005b3a 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -313,7 +313,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; @@ -333,7 +333,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 -1; diff --git a/arch/arm/plat-omap/include/plat/gpmc.h b/arch/arm/plat-omap/include/plat/gpmc.h index b7c9ea6..1cafbfd 100644 --- a/arch/arm/plat-omap/include/plat/gpmc.h +++ b/arch/arm/plat-omap/include/plat/gpmc.h @@ -179,7 +179,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);
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> --- arch/arm/mach-omap2/gpmc-onenand.c | 3 +-- arch/arm/mach-omap2/gpmc.c | 4 ++-- arch/arm/plat-omap/include/plat/gpmc.h | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-)