Skip to content

Commit

Permalink
arm: omap: sdram-nokia: use array to list timings
Browse files Browse the repository at this point in the history
Use an array to make it easier to add new values.

Signed-off-by: Aaro Koskinen <aaro.koskinen@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 fbd208e commit e5f5b54
Showing 1 changed file with 15 additions and 6 deletions.
21 changes: 15 additions & 6 deletions arch/arm/mach-omap2/sdram-nokia.c
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,6 @@ struct sdram_timings {
u32 tWTR;
};

static struct omap_sdrc_params nokia_sdrc_params[4];

static const struct sdram_timings nokia_166mhz_timings[] = {
{
.casl = 3,
Expand All @@ -67,6 +65,16 @@ static const struct sdram_timings nokia_166mhz_timings[] = {
},
};

static const struct {
long rate;
struct sdram_timings const *data;
} nokia_timings[] = {
{ 41500000, nokia_166mhz_timings },
{ 83000000, nokia_166mhz_timings },
{ 166000000, nokia_166mhz_timings },
};
static struct omap_sdrc_params nokia_sdrc_params[ARRAY_SIZE(nokia_timings) + 1];

static unsigned long sdrc_get_fclk_period(long rate)
{
/* In picoseconds */
Expand Down Expand Up @@ -212,11 +220,12 @@ static int sdrc_timings(int id, long rate,

struct omap_sdrc_params *nokia_get_sdram_timings(void)
{
int err;
int err = 0;
int i;

err = sdrc_timings(0, 41500000, nokia_166mhz_timings);
err |= sdrc_timings(1, 83000000, nokia_166mhz_timings);
err |= sdrc_timings(2, 166000000, nokia_166mhz_timings);
for (i = 0; i < ARRAY_SIZE(nokia_timings); i++)
err |= sdrc_timings(i, nokia_timings[i].rate,
nokia_timings[i].data);

return &nokia_sdrc_params[0];
}
Expand Down

0 comments on commit e5f5b54

Please sign in to comment.