diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-05-09 21:13:44 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-06-17 03:45:10 -0400 |
commit | 18cb680f1a003a1a1ec0e6097d7b763516a27f04 (patch) | |
tree | f9ef6d5b1fe540a4bb070fcbd1a222c11458afb1 /arch/arm/mach-imx/mm-imx3.c | |
parent | 24a83fe4b039ef3779efd6b1fc88ee020e8af52f (diff) |
ARM: imx: move clk_prepare() out from mxc_restart()
It's inappropriate to call clk_prepare() in mxc_restart(), because the
restart routine could be called in atomic context. Move clk_get() and
clk_prepare() into mxc_arch_reset_init() and only have the atomic part
clk_enable() be called in mxc_restart().
As a result, mxc_arch_reset_init() needs to be called after clk gets
initialized.
While there, it also changes printk(KERN_ERR ...) to pr_err() and adds
__init annotation for mxc_arch_reset_init().
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/mm-imx3.c')
-rw-r--r-- | arch/arm/mach-imx/mm-imx3.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c index e0e69a682174..8f0f60697f55 100644 --- a/arch/arm/mach-imx/mm-imx3.c +++ b/arch/arm/mach-imx/mm-imx3.c | |||
@@ -138,7 +138,6 @@ void __init mx31_map_io(void) | |||
138 | void __init imx31_init_early(void) | 138 | void __init imx31_init_early(void) |
139 | { | 139 | { |
140 | mxc_set_cpu_type(MXC_CPU_MX31); | 140 | mxc_set_cpu_type(MXC_CPU_MX31); |
141 | mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR)); | ||
142 | arch_ioremap_caller = imx3_ioremap_caller; | 141 | arch_ioremap_caller = imx3_ioremap_caller; |
143 | arm_pm_idle = imx3_idle; | 142 | arm_pm_idle = imx3_idle; |
144 | mx3_ccm_base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR); | 143 | mx3_ccm_base = MX31_IO_ADDRESS(MX31_CCM_BASE_ADDR); |
@@ -174,6 +173,7 @@ void __init imx31_soc_init(void) | |||
174 | 173 | ||
175 | imx3_init_l2x0(); | 174 | imx3_init_l2x0(); |
176 | 175 | ||
176 | mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR)); | ||
177 | mxc_device_init(); | 177 | mxc_device_init(); |
178 | 178 | ||
179 | mxc_register_gpio("imx31-gpio", 0, MX31_GPIO1_BASE_ADDR, SZ_16K, MX31_INT_GPIO1, 0); | 179 | mxc_register_gpio("imx31-gpio", 0, MX31_GPIO1_BASE_ADDR, SZ_16K, MX31_INT_GPIO1, 0); |
@@ -216,7 +216,6 @@ void __init imx35_init_early(void) | |||
216 | { | 216 | { |
217 | mxc_set_cpu_type(MXC_CPU_MX35); | 217 | mxc_set_cpu_type(MXC_CPU_MX35); |
218 | mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR)); | 218 | mxc_iomux_v3_init(MX35_IO_ADDRESS(MX35_IOMUXC_BASE_ADDR)); |
219 | mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR)); | ||
220 | arm_pm_idle = imx3_idle; | 219 | arm_pm_idle = imx3_idle; |
221 | arch_ioremap_caller = imx3_ioremap_caller; | 220 | arch_ioremap_caller = imx3_ioremap_caller; |
222 | mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR); | 221 | mx3_ccm_base = MX35_IO_ADDRESS(MX35_CCM_BASE_ADDR); |
@@ -272,6 +271,7 @@ void __init imx35_soc_init(void) | |||
272 | 271 | ||
273 | imx3_init_l2x0(); | 272 | imx3_init_l2x0(); |
274 | 273 | ||
274 | mxc_arch_reset_init(MX35_IO_ADDRESS(MX35_WDOG_BASE_ADDR)); | ||
275 | mxc_device_init(); | 275 | mxc_device_init(); |
276 | 276 | ||
277 | mxc_register_gpio("imx35-gpio", 0, MX35_GPIO1_BASE_ADDR, SZ_16K, MX35_INT_GPIO1, 0); | 277 | mxc_register_gpio("imx35-gpio", 0, MX35_GPIO1_BASE_ADDR, SZ_16K, MX35_INT_GPIO1, 0); |