diff options
author | Sekhar Nori <nsekhar@ti.com> | 2009-08-31 06:17:59 -0400 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2009-11-25 13:21:19 -0500 |
commit | 6a28adef21e551602023afc5bba330f8013556d8 (patch) | |
tree | 6001f5b92b5550012b6ec9c6a25c3323842ebb2b /arch/arm/mach-davinci/da830.c | |
parent | 3c60a66de662dca6e47951a78b73de1bf081e785 (diff) |
davinci: DA8XX/OMAP-L1XX: Avoid use of IO_ADDRESS for SYSCFG module
Avoid use of IO_ADDRESS() for SYSCFG module by doing an ioremap() instead.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci/da830.c')
-rw-r--r-- | arch/arm/mach-davinci/da830.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index c2224b968311..3d70eae19b59 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c | |||
@@ -1184,7 +1184,6 @@ static struct davinci_soc_info davinci_soc_info_da830 = { | |||
1184 | .cpu_clks = da830_clks, | 1184 | .cpu_clks = da830_clks, |
1185 | .psc_bases = da830_psc_bases, | 1185 | .psc_bases = da830_psc_bases, |
1186 | .psc_bases_num = ARRAY_SIZE(da830_psc_bases), | 1186 | .psc_bases_num = ARRAY_SIZE(da830_psc_bases), |
1187 | .pinmux_base = IO_ADDRESS(DA8XX_SYSCFG_BASE + 0x120), | ||
1188 | .pinmux_pins = da830_pins, | 1187 | .pinmux_pins = da830_pins, |
1189 | .pinmux_pins_num = ARRAY_SIZE(da830_pins), | 1188 | .pinmux_pins_num = ARRAY_SIZE(da830_pins), |
1190 | .intc_base = (void __iomem *)DA8XX_CP_INTC_VIRT, | 1189 | .intc_base = (void __iomem *)DA8XX_CP_INTC_VIRT, |
@@ -1201,5 +1200,11 @@ static struct davinci_soc_info davinci_soc_info_da830 = { | |||
1201 | 1200 | ||
1202 | void __init da830_init(void) | 1201 | void __init da830_init(void) |
1203 | { | 1202 | { |
1203 | da8xx_syscfg_base = ioremap(DA8XX_SYSCFG_BASE, SZ_4K); | ||
1204 | if (WARN(!da8xx_syscfg_base, "Unable to map syscfg module")) | ||
1205 | return; | ||
1206 | |||
1207 | davinci_soc_info_da830.pinmux_base = DA8XX_SYSCFG_VIRT(0x120); | ||
1208 | |||
1204 | davinci_common_init(&davinci_soc_info_da830); | 1209 | davinci_common_init(&davinci_soc_info_da830); |
1205 | } | 1210 | } |