aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/sdram-nokia.c
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@nokia.com>2010-12-17 15:13:45 -0800
committerTony Lindgren <tony@atomide.com>2010-12-17 15:13:45 -0800
commitfbd208e9772005c193459d1a0575c0787ad52f69 (patch)
tree0aae2e640e5ad709e705e531f61b9e0d2740dc05 /arch/arm/mach-omap2/sdram-nokia.c
parentfcd8d84633902fd1717d80f36a38b8a4305ca3d4 (diff)
downloadkernel_samsung_smdk4412-fbd208e9772005c193459d1a0575c0787ad52f69.zip
kernel_samsung_smdk4412-fbd208e9772005c193459d1a0575c0787ad52f69.tar.gz
kernel_samsung_smdk4412-fbd208e9772005c193459d1a0575c0787ad52f69.tar.bz2
arm: omap: sdram-nokia: prepare for new memory timings
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>
Diffstat (limited to 'arch/arm/mach-omap2/sdram-nokia.c')
-rw-r--r--arch/arm/mach-omap2/sdram-nokia.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/sdram-nokia.c b/arch/arm/mach-omap2/sdram-nokia.c
index 261efc8..97d1673 100644
--- a/arch/arm/mach-omap2/sdram-nokia.c
+++ b/arch/arm/mach-omap2/sdram-nokia.c
@@ -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,
@@ -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;
@@ -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];
}