diff options
author | Olof Johansson <olof@lixom.net> | 2012-05-11 03:49:56 -0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-05-11 03:49:56 -0400 |
commit | 80b9abf973462499c1a0110df47f62cc90361e2c (patch) | |
tree | 4e67448ba08df9a68713611b93e9f2635bf8bb26 /arch/arm/plat-mxc | |
parent | d48b97b403d23f6df0b990cee652bdf9a52337a3 (diff) | |
parent | a010bc2b9e2ccc0b59057d4cc136d48a1f7cebcb (diff) |
Merge branch 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6 into staging/cleanup
By Shawn Guo
via Shawn Guo
* 'clean/late_initcall_v2' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: ux500: use machine specific hook for late init
ARM: tegra: use machine specific hook for late init
ARM: shmobile: use machine specific hook for late init
ARM: sa1100: use machine specific hook for late init
ARM: s3c64xx: use machine specific hook for late init
ARM: prima2: use machine specific hook for late init
ARM: pnx4008: use machine specific hook for late init
ARM: omap2: use machine specific hook for late init
ARM: omap1: use machine specific hook for late init
ARM: msm: use machine specific hook for late init
ARM: imx: use machine specific hook for late init
ARM: exynos: use machine specific hook for late init
ARM: ep93xx: use machine specific hook for late init
ARM: davinci: use machine specific hook for late init
ARM: provide a late_initcall hook for platform initialization
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index 0319c4a0caf..cf663d84e7c 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h | |||
@@ -53,6 +53,7 @@ extern void imx35_soc_init(void); | |||
53 | extern void imx50_soc_init(void); | 53 | extern void imx50_soc_init(void); |
54 | extern void imx51_soc_init(void); | 54 | extern void imx51_soc_init(void); |
55 | extern void imx53_soc_init(void); | 55 | extern void imx53_soc_init(void); |
56 | extern void imx51_init_late(void); | ||
56 | extern void epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq); | 57 | extern void epit_timer_init(struct clk *timer_clk, void __iomem *base, int irq); |
57 | extern void mxc_timer_init(struct clk *timer_clk, void __iomem *, int); | 58 | extern void mxc_timer_init(struct clk *timer_clk, void __iomem *, int); |
58 | extern int mx1_clocks_init(unsigned long fref); | 59 | extern int mx1_clocks_init(unsigned long fref); |
@@ -149,4 +150,10 @@ extern void imx6q_pm_init(void); | |||
149 | static inline void imx6q_pm_init(void) {} | 150 | static inline void imx6q_pm_init(void) {} |
150 | #endif | 151 | #endif |
151 | 152 | ||
153 | #ifdef CONFIG_NEON | ||
154 | extern int mx51_neon_fixup(void); | ||
155 | #else | ||
156 | static inline int mx51_neon_fixup(void) { return 0; } | ||
157 | #endif | ||
158 | |||
152 | #endif | 159 | #endif |