Skip to content

Commit

Permalink
arm: omap: sdram-nokia: prepare for new memory timings
Browse files Browse the repository at this point in the history
Rename the current timings to indicate they're for 166 MHz. Based on
patches by Eduardo Valentin and Juha Keski-Saari.

Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
Cc: Eduardo Valentin <eduardo.valentin@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Aaro Koskinen authored and Tony Lindgren committed Dec 17, 2010
1 parent fcd8d84 commit fbd208e
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions arch/arm/mach-omap2/sdram-nokia.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ struct sdram_timings {

static struct omap_sdrc_params nokia_sdrc_params[4];

static const struct sdram_timings memory_timings[] = {
static const struct sdram_timings nokia_166mhz_timings[] = {
{
.casl = 3,
.tDAL = 33000,
Expand Down Expand Up @@ -160,7 +160,8 @@ static int set_sdrc_timing_regval_ps(u32 *regval, int st_bit, int end_bit,
err = -1;
#endif

static int sdrc_timings(int id, long rate)
static int sdrc_timings(int id, long rate,
const struct sdram_timings *memory_timings)
{
u32 ticks_per_ms;
u32 rfr, l;
Expand Down Expand Up @@ -213,9 +214,9 @@ struct omap_sdrc_params *nokia_get_sdram_timings(void)
{
int err;

err = sdrc_timings(0, 41500000);
err |= sdrc_timings(1, 83000000);
err |= sdrc_timings(2, 166000000);
err = sdrc_timings(0, 41500000, nokia_166mhz_timings);
err |= sdrc_timings(1, 83000000, nokia_166mhz_timings);
err |= sdrc_timings(2, 166000000, nokia_166mhz_timings);

return &nokia_sdrc_params[0];
}
Expand Down

0 comments on commit fbd208e

Please sign in to comment.