diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 12:42:39 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-01-18 12:42:39 +0100 |
| commit | 8faba6121566248330e738d25a2c43d7500fb9f0 (patch) | |
| tree | 9cb09b2ec00b504dd24e1272126a22cd365e7282 /arch/sh/boards | |
| parent | sh: Need IRQs enabled for init_fpu(). (diff) | |
| parent | sh: Tidy up non-translatable checks in iounmap path. (diff) | |
| download | linux-8faba6121566248330e738d25a2c43d7500fb9f0.tar.xz linux-8faba6121566248330e738d25a2c43d7500fb9f0.zip | |
Merge branch 'sh/ioremap-fixed'
Diffstat (limited to 'arch/sh/boards')
| -rw-r--r-- | arch/sh/boards/board-sh7785lcr.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c index 7eea90db6cea..511de38d2046 100644 --- a/arch/sh/boards/board-sh7785lcr.c +++ b/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 */ |