From mboxrd@z Thu Jan 1 00:00:00 1970 From: aaro.koskinen@nokia.com (Aaro Koskinen) Date: Thu, 9 Dec 2010 18:39:19 +0200 Subject: [PATCH 3/8] arm: omap: sdram-nokia: prepare for new memory timings In-Reply-To: <1291912764-12823-1-git-send-email-aaro.koskinen@nokia.com> References: <1291912764-12823-1-git-send-email-aaro.koskinen@nokia.com> Message-ID: <1291912764-12823-4-git-send-email-aaro.koskinen@nokia.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 Cc: Eduardo Valentin --- arch/arm/mach-omap2/sdram-nokia.c | 11 ++++++----- 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]; } -- 1.5.6.5