aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da830.c
diff options
context:
space:
mode:
authorCyril Chemparathy <cyril@ti.com>2010-05-07 17:06:38 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-05-13 13:05:29 -0400
commit779b0d53ca41873d59225eb776c5d4493a0abd0f (patch)
treecf47ab5746105d9116e6c9e33f7ad142ff726d7a /arch/arm/mach-davinci/da830.c
parentbd808947040ba53b2b0e52dde598a9414fb27bba (diff)
Davinci: pinmux - use ioremap()
This patch modifies the pinmux implementation so as to ioremap() the pinmux register area on first use. Signed-off-by: Cyril Chemparathy <cyril@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.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index 2c84f0702088..94fe971f276a 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -1191,6 +1191,7 @@ static struct davinci_soc_info davinci_soc_info_da830 = {
1191 .cpu_clks = da830_clks, 1191 .cpu_clks = da830_clks,
1192 .psc_bases = da830_psc_bases, 1192 .psc_bases = da830_psc_bases,
1193 .psc_bases_num = ARRAY_SIZE(da830_psc_bases), 1193 .psc_bases_num = ARRAY_SIZE(da830_psc_bases),
1194 .pinmux_base = DA8XX_SYSCFG0_BASE + 0x120,
1194 .pinmux_pins = da830_pins, 1195 .pinmux_pins = da830_pins,
1195 .pinmux_pins_num = ARRAY_SIZE(da830_pins), 1196 .pinmux_pins_num = ARRAY_SIZE(da830_pins),
1196 .intc_base = DA8XX_CP_INTC_BASE, 1197 .intc_base = DA8XX_CP_INTC_BASE,
@@ -1213,7 +1214,5 @@ void __init da830_init(void)
1213 if (WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module")) 1214 if (WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module"))
1214 return; 1215 return;
1215 1216
1216 davinci_soc_info_da830.pinmux_base = DA8XX_SYSCFG0_VIRT(0x120);
1217
1218 davinci_common_init(&davinci_soc_info_da830); 1217 davinci_common_init(&davinci_soc_info_da830);
1219} 1218}