diff options
| author | Cyril Chemparathy <cyril@ti.com> | 2010-05-07 23:06:39 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-05-13 19:05:31 +0200 |
| commit | bcd6a1c695c8b404bfde22b276186ac52a20291b (patch) | |
| tree | 548f1308faa72bd90308632d16fb656718cf6090 /arch/arm/mach-davinci/da830.c | |
| parent | Davinci: pinmux - use ioremap() (diff) | |
| download | linux-bcd6a1c695c8b404bfde22b276186ac52a20291b.tar.xz linux-bcd6a1c695c8b404bfde22b276186ac52a20291b.zip | |
Davinci: iotable based ioremap() interception
This patch allows for a more flexible ioremap() interception based on iotable
contents.
With this patch, the ioremap() interception code can properly translate
addresses only after davinci_soc_info has been initialized. Consequently,
in soc-specific init functions, davinci_common_init() has to happen before any
ioremap() attempts. The da8xx init sequence has been suitably modified to meet
this restriction.
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.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index 94fe971f276a..3a7a96fe7b84 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -1210,9 +1210,8 @@ static struct davinci_soc_info davinci_soc_info_da830 = { void __init da830_init(void) { - da8xx_syscfg0_base = ioremap(DA8XX_SYSCFG0_BASE, SZ_4K); - if (WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module")) - return; - davinci_common_init(&davinci_soc_info_da830); + + da8xx_syscfg0_base = ioremap(DA8XX_SYSCFG0_BASE, SZ_4K); + WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module"); } |