aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/da850.c
diff options
context:
space:
mode:
authorCyril Chemparathy <cyril@ti.com>2010-05-07 17:06:39 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-05-13 13:05:31 -0400
commitbcd6a1c695c8b404bfde22b276186ac52a20291b (patch)
tree548f1308faa72bd90308632d16fb656718cf6090 /arch/arm/mach-davinci/da850.c
parent779b0d53ca41873d59225eb776c5d4493a0abd0f (diff)
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/da850.c')
-rw-r--r--arch/arm/mach-davinci/da850.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 74d4e49d4064..6b8331bf8cf3 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -1099,6 +1099,8 @@ void __init da850_init(void)
1099{ 1099{
1100 unsigned int v; 1100 unsigned int v;
1101 1101
1102 davinci_common_init(&davinci_soc_info_da850);
1103
1102 da8xx_syscfg0_base = ioremap(DA8XX_SYSCFG0_BASE, SZ_4K); 1104 da8xx_syscfg0_base = ioremap(DA8XX_SYSCFG0_BASE, SZ_4K);
1103 if (WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module")) 1105 if (WARN(!da8xx_syscfg0_base, "Unable to map syscfg0 module"))
1104 return; 1106 return;
@@ -1107,8 +1109,6 @@ void __init da850_init(void)
1107 if (WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module")) 1109 if (WARN(!da8xx_syscfg1_base, "Unable to map syscfg1 module"))
1108 return; 1110 return;
1109 1111
1110 davinci_common_init(&davinci_soc_info_da850);
1111
1112 /* 1112 /*
1113 * Move the clock source of Async3 domain to PLL1 SYSCLK2. 1113 * Move the clock source of Async3 domain to PLL1 SYSCLK2.
1114 * This helps keeping the peripherals on this domain insulated 1114 * This helps keeping the peripherals on this domain insulated