aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da850.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 10:05:29 -0700
commit779b0d53ca41873d59225eb776c5d4493a0abd0f (patch)
treecf47ab5746105d9116e6c9e33f7ad142ff726d7a /arch/arm/mach-davinci/da850.c
parentbd808947040ba53b2b0e52dde598a9414fb27bba (diff)
downloadkernel_samsung_smdk4412-779b0d53ca41873d59225eb776c5d4493a0abd0f.zip
kernel_samsung_smdk4412-779b0d53ca41873d59225eb776c5d4493a0abd0f.tar.gz
kernel_samsung_smdk4412-779b0d53ca41873d59225eb776c5d4493a0abd0f.tar.bz2
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/da850.c')
-rw-r--r--arch/arm/mach-davinci/da850.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 6f5ea2a..74d4e49 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1076,6 +1076,7 @@ static struct davinci_soc_info davinci_soc_info_da850 = {
.cpu_clks = da850_clks,
.psc_bases = da850_psc_bases,
.psc_bases_num = ARRAY_SIZE(da850_psc_bases),
+ .pinmux_base = DA8XX_SYSCFG0_BASE + 0x120,
.pinmux_pins = da850_pins,
.pinmux_pins_num = ARRAY_SIZE(da850_pins),
.intc_base = DA8XX_CP_INTC_BASE,
@@ -1106,8 +1107,6 @@ void __init da850_init(void)
if (WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module"))
return;
- davinci_soc_info_da850.pinmux_base = DA8XX_SYSCFG0_VIRT(0x120);
-
davinci_common_init(&davinci_soc_info_da850);
/*