diff options
| author | Shawn Guo <shawn.guo@freescale.com> | 2014-05-20 15:34:06 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@freescale.com> | 2014-07-18 16:10:09 +0800 |
| commit | ff4ab2311a902e30cd579339a83679bab944e1bc (patch) | |
| tree | 01a361eac48fd9d63b7591a8dee2fdc22f30925d /arch/arm/mach-imx/mach-imx53.c | |
| parent | 36b66c3fc20ad9a50ae7f19b3c807c68259753df (diff) | |
| download | lwn-ff4ab2311a902e30cd579339a83679bab944e1bc.tar.gz lwn-ff4ab2311a902e30cd579339a83679bab944e1bc.zip | |
ARM: imx5: move init hooks into mach-imx5x.c
These imx5 init_early[late] hooks are called only from mach-imx5x.c.
Let's move them into mach-imx5x.c.
While at it, replace the static mapping in imx51_ipu_mipi_setup() with
dynamic mapping. Also this function and imx_src_init() do not
necessarily to be called at .init_early hook, so move them into
.init_machine.
The mxc_iomux_v3_init() is dropped from imx51_init_early() in the
moving, since it's only needed by non-DT boot.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/mach-imx53.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-imx53.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-imx53.c b/arch/arm/mach-imx/mach-imx53.c index 9a066af3a205..62fb2a2d742b 100644 --- a/arch/arm/mach-imx/mach-imx53.c +++ b/arch/arm/mach-imx/mach-imx53.c @@ -24,13 +24,24 @@ #include "hardware.h" #include "mx53.h" +static void __init imx53_init_early(void) +{ + mxc_set_cpu_type(MXC_CPU_MX53); +} + static void __init imx53_dt_init(void) { mxc_arch_reset_init_dt(); + imx_src_init(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } +static void __init imx53_init_late(void) +{ + imx53_pm_init(); +} + static const char *imx53_dt_board_compat[] __initconst = { "fsl,imx53", NULL |