OMAP2/3: GPMC: put sync_clk value in picoseconds instead of nanoseconds
Subsystems (6)
PATCH 1/2 OMAP2/3: GPMC: put sync_clk value in picoseconds instead of nanoseconds
The calculations done with sync_clk are anyway in picoseconds and switching to picoseconds allows sync_clk values that are not a whole number of nanoseconds - which is sometimes the case.
Signed-off-by Adrian Hunter <[email protected]>
--- arch/arm/mach-omap2/gpmc-nand.c | 2 +- arch/arm/mach-omap2/gpmc-onenand.c | 10 +++++----- arch/arm/mach-omap2/gpmc.c | 12 +++++++++++- arch/arm/mach-omap2/usb-tusb6010.c | 4 ++-- arch/arm/plat-omap/include/plat/gpmc.h | 9 +++++---- 5 files changed, 24 insertions(+), 13 deletions(-)
arch/arm/mach-omap2/gpmc-nand.c +1 -1
@@ -41,7 +41,7 @@ static int omap2_nand_gpmc_retime(void)return 0 ;memset (&t,0 ,sizeof (t)); - t.sync_clk =gpmc_round_ns_to_ticks (gpmc_nand_data->gpmc_t->sync_clk); + t.sync_clk = gpmc_nand_data->gpmc_t->sync_clk; t.cs_on =gpmc_round_ns_to_ticks (gpmc_nand_data->gpmc_t->cs_on); t.adv_on =gpmc_round_ns_to_ticks (gpmc_nand_data->gpmc_t->adv_on);
arch/arm/mach-omap2/gpmc-onenand.c +5 -5
@@ -174,7 +174,7 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg,switch (freq) {case 83 : - min_gpmc_clk_period =12 ;/* 83 MHz */ + min_gpmc_clk_period =12000 ;/* 83 MHz */ t_ces =5 ; t_avds =4 ; t_avdh =2 ;
@@ -183,7 +183,7 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg, t_rdyo =9 ;break ;case 66 : - min_gpmc_clk_period =15 ;/* 66 MHz */ + min_gpmc_clk_period =15000 ;/* 66 MHz */ t_ces =6 ; t_avds =5 ; t_avdh =2 ;
@@ -192,7 +192,7 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg, t_rdyo =11 ;break ;default : - min_gpmc_clk_period =18 ;/* 54 MHz */ + min_gpmc_clk_period =18500 ;/* 54 MHz */ t_ces =7 ; t_avds =7 ; t_avdh =7 ;
@@ -271,8 +271,8 @@ static int omap2_onenand_set_sync_mode(struct omap_onenand_platform_data *cfg, t.wr_cycle = t.rd_cycle;if (cpu_is_omap34xx ()) { t.wr_data_mux_bus =gpmc_ticks_to_ns (fclk_offset + -gpmc_ns_to_ticks (min_gpmc_clk_period + - t_rdyo)); +gpmc_ps_to_ticks (min_gpmc_clk_period + + t_rdyo *1000 )); t.wr_access = t.access; } }else {
arch/arm/mach-omap2/gpmc.c +11 -1
@@ -168,6 +168,16 @@ unsigned int gpmc_ns_to_ticks(unsigned int time_ns)return (time_ns *1000 + tick_ps -1 ) / tick_ps; } +unsigned int gpmc_ps_to_ticks (unsigned int time_ps) +{ +unsigned long tick_ps; + +/* Calculate in picosecs to yield more exact results */ + tick_ps =gpmc_get_fclk_period (); + +return (time_ps + tick_ps -1 ) / tick_ps; +} +unsigned int gpmc_ticks_to_ns (unsigned int ticks) {return ticks *gpmc_get_fclk_period () /1000 ;
@@ -235,7 +245,7 @@ int gpmc_cs_calc_divider(int cs, unsigned int sync_clk)int div;u32 l; - l = sync_clk *1000 + (gpmc_get_fclk_period () -1 ); + l = sync_clk + (gpmc_get_fclk_period () -1 ); div = l /gpmc_get_fclk_period ();if (div >4 )return -1 ;
arch/arm/mach-omap2/usb-tusb6010.c +2 -2
@@ -120,8 +120,8 @@ static int tusb_set_sync_mode(unsigned sysclk_ps, unsigned fclk_ps) t.adv_on =next_clk (t.cs_on, t_scsnh_advnh -7000 , fclk_ps);/* GPMC_CLK rate = fclk rate / div */ - t.sync_clk =12 /* 11.1 nsec */ ; - tmp = (t.sync_clk *1000 + fclk_ps -1 ) / fclk_ps; + t.sync_clk =11100 /* 11.1 nsec */ ; + tmp = (t.sync_clk + fclk_ps -1 ) / fclk_ps;if (tmp >4 )return -ERANGE ;if (tmp <=0 )
arch/arm/plat-omap/include/plat/gpmc.h +5 -4
@@ -80,12 +80,12 @@#define GPMC_PREFETCH_STATUS_COUNT (val) (val & 0x00003fff)/* -* Note that all values in this struct are in nanoseconds, while -* the register values are in gpmc_fck cycles. +* Note that all values in this struct are in nanoseconds except sync_clk +* (which is in picoseconds), while the register values are in gpmc_fck cycles. */ struct gpmc_timings { -/* Minimum clock period for synchronous mode */ -u16 sync_clk; +/* Minimum clock period for synchronous mode (in picoseconds) */ +u32 sync_clk;/* Chip-select signal timings corresponding to GPMC_CS_CONFIG2 */ u16 cs_on;/* Assertion time */
@@ -117,6 +117,7 @@ struct gpmc_timings { };extern unsigned int gpmc_ns_to_ticks (unsigned int time_ns); +extern unsigned int gpmc_ps_to_ticks (unsigned int time_ps);extern unsigned int gpmc_ticks_to_ns (unsigned int ticks);extern unsigned int gpmc_round_ns_to_ticks (unsigned int time_ns);extern unsigned long gpmc_get_fclk_period (void );
Signature · 1 line
1.7.0.4