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/da850.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/da850.c')
-rw-r--r-- | arch/arm/mach-davinci/da850.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 18c33b6cbfdd..54d1836f1224 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c | |||
@@ -799,7 +799,6 @@ static struct davinci_soc_info davinci_soc_info_da850 = { | |||
799 | .cpu_clks = da850_clks, | 799 | .cpu_clks = da850_clks, |
800 | .psc_bases = da850_psc_bases, | 800 | .psc_bases = da850_psc_bases, |
801 | .psc_bases_num = ARRAY_SIZE(da850_psc_bases), | 801 | .psc_bases_num = ARRAY_SIZE(da850_psc_bases), |
802 | .pinmux_base = IO_ADDRESS(DA8XX_SYSCFG_BASE + 0x120), | ||
803 | .pinmux_pins = da850_pins, | 802 | .pinmux_pins = da850_pins, |
804 | .pinmux_pins_num = ARRAY_SIZE(da850_pins), | 803 | .pinmux_pins_num = ARRAY_SIZE(da850_pins), |
805 | .intc_base = (void __iomem *)DA8XX_CP_INTC_VIRT, | 804 | .intc_base = (void __iomem *)DA8XX_CP_INTC_VIRT, |
@@ -816,5 +815,11 @@ static struct davinci_soc_info davinci_soc_info_da850 = { | |||
816 | 815 | ||
817 | void __init da850_init(void) | 816 | void __init da850_init(void) |
818 | { | 817 | { |
818 | da8xx_syscfg_base = ioremap(DA8XX_SYSCFG_BASE, SZ_4K); | ||
819 | if (WARN(!da8xx_syscfg_base, "Unable to map syscfg module")) | ||
820 | return; | ||
821 | |||
822 | davinci_soc_info_da850.pinmux_base = DA8XX_SYSCFG_VIRT(0x120); | ||
823 | |||
819 | davinci_common_init(&davinci_soc_info_da850); | 824 | davinci_common_init(&davinci_soc_info_da850); |
820 | } | 825 | } |