From f237d5128ec6dc07879897b68f394b17d7d17aa6 Mon Sep 17 00:00:00 2001 From: Matt Fleming Date: Thu, 5 Nov 2009 08:01:10 +0000 Subject: [PATCH] --- yaml --- r: 181099 b: refs/heads/master c: 6f82b6ebb1dcc0c3c23820a70a5d79a60c4f5e84 h: refs/heads/master i: 181097: 760146bd9b1773297cedb423c24e0e921324ffa4 181095: 03c1e883aba3c150eff369d1c2fba0970e1e2927 v: v3 --- [refs] | 2 +- trunk/arch/sh/boards/board-sh7785lcr.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e6febd4e0b99..a3c8c0e52a2d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d35b93a66e9b87df20784fcf130d2e8760be53f +refs/heads/master: 6f82b6ebb1dcc0c3c23820a70a5d79a60c4f5e84 diff --git a/trunk/arch/sh/boards/board-sh7785lcr.c b/trunk/arch/sh/boards/board-sh7785lcr.c index 7eea90db6cea..511de38d2046 100644 --- a/trunk/arch/sh/boards/board-sh7785lcr.c +++ b/trunk/arch/sh/boards/board-sh7785lcr.c @@ -332,8 +332,15 @@ static void __init sh7785lcr_setup(char **cmdline_p) pm_power_off = sh7785lcr_power_off; /* sm501 DRAM configuration */ - sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL; - writel(0x000307c2, sm501_reg); + sm501_reg = ioremap_fixed(SM107_REG_ADDR, SM501_DRAM_CONTROL, + PAGE_KERNEL); + if (!sm501_reg) { + printk(KERN_ERR "%s: ioremap error.\n", __func__); + return; + } + + writel(0x000307c2, sm501_reg + SM501_DRAM_CONTROL); + iounmap_fixed(sm501_reg); } /* Return the board specific boot mode pin configuration */