diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-01-30 08:07:14 -0500 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-01-30 08:07:14 -0500 |
| commit | 1d7180e24e22a608cc4d7e8fd425a19a9394a7ed (patch) | |
| tree | bd747993fe7943d0f28578e371f426e4f6227ad3 /arch/arm/mach-imx/common.h | |
| parent | a49f0d1ea3ec94fc7cf33a7c36a16343b74bd565 (diff) | |
| parent | 7356420cd34e40fe27bf26555b0bf3f2849a43dd (diff) | |
Merge tag 'imx-cleanup-3.9' into imx6q-cpuidle
Diffstat (limited to 'arch/arm/mach-imx/common.h')
| -rw-r--r-- | arch/arm/mach-imx/common.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 7191ab4434e5..972c9f8cc97a 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h | |||
| @@ -21,7 +21,6 @@ extern void mx25_map_io(void); | |||
| 21 | extern void mx27_map_io(void); | 21 | extern void mx27_map_io(void); |
| 22 | extern void mx31_map_io(void); | 22 | extern void mx31_map_io(void); |
| 23 | extern void mx35_map_io(void); | 23 | extern void mx35_map_io(void); |
| 24 | extern void mx50_map_io(void); | ||
| 25 | extern void mx51_map_io(void); | 24 | extern void mx51_map_io(void); |
| 26 | extern void mx53_map_io(void); | 25 | extern void mx53_map_io(void); |
| 27 | extern void imx1_init_early(void); | 26 | extern void imx1_init_early(void); |
| @@ -30,7 +29,6 @@ extern void imx25_init_early(void); | |||
| 30 | extern void imx27_init_early(void); | 29 | extern void imx27_init_early(void); |
| 31 | extern void imx31_init_early(void); | 30 | extern void imx31_init_early(void); |
| 32 | extern void imx35_init_early(void); | 31 | extern void imx35_init_early(void); |
| 33 | extern void imx50_init_early(void); | ||
| 34 | extern void imx51_init_early(void); | 32 | extern void imx51_init_early(void); |
| 35 | extern void imx53_init_early(void); | 33 | extern void imx53_init_early(void); |
| 36 | extern void mxc_init_irq(void __iomem *); | 34 | extern void mxc_init_irq(void __iomem *); |
| @@ -41,7 +39,6 @@ extern void mx25_init_irq(void); | |||
| 41 | extern void mx27_init_irq(void); | 39 | extern void mx27_init_irq(void); |
| 42 | extern void mx31_init_irq(void); | 40 | extern void mx31_init_irq(void); |
| 43 | extern void mx35_init_irq(void); | 41 | extern void mx35_init_irq(void); |
| 44 | extern void mx50_init_irq(void); | ||
| 45 | extern void mx51_init_irq(void); | 42 | extern void mx51_init_irq(void); |
| 46 | extern void mx53_init_irq(void); | 43 | extern void mx53_init_irq(void); |
| 47 | extern void imx1_soc_init(void); | 44 | extern void imx1_soc_init(void); |
| @@ -50,7 +47,6 @@ extern void imx25_soc_init(void); | |||
| 50 | extern void imx27_soc_init(void); | 47 | extern void imx27_soc_init(void); |
| 51 | extern void imx31_soc_init(void); | 48 | extern void imx31_soc_init(void); |
| 52 | extern void imx35_soc_init(void); | 49 | extern void imx35_soc_init(void); |
| 53 | extern void imx50_soc_init(void); | ||
| 54 | extern void imx51_soc_init(void); | 50 | extern void imx51_soc_init(void); |
| 55 | extern void imx51_init_late(void); | 51 | extern void imx51_init_late(void); |
| 56 | extern void imx53_init_late(void); | 52 | extern void imx53_init_late(void); |
| @@ -109,18 +105,12 @@ void tzic_handle_irq(struct pt_regs *); | |||
| 109 | #define imx27_handle_irq avic_handle_irq | 105 | #define imx27_handle_irq avic_handle_irq |
| 110 | #define imx31_handle_irq avic_handle_irq | 106 | #define imx31_handle_irq avic_handle_irq |
| 111 | #define imx35_handle_irq avic_handle_irq | 107 | #define imx35_handle_irq avic_handle_irq |
| 112 | #define imx50_handle_irq tzic_handle_irq | ||
| 113 | #define imx51_handle_irq tzic_handle_irq | 108 | #define imx51_handle_irq tzic_handle_irq |
| 114 | #define imx53_handle_irq tzic_handle_irq | 109 | #define imx53_handle_irq tzic_handle_irq |
| 115 | #define imx6q_handle_irq gic_handle_irq | 110 | #define imx6q_handle_irq gic_handle_irq |
| 116 | 111 | ||
| 117 | extern void imx_enable_cpu(int cpu, bool enable); | 112 | extern void imx_enable_cpu(int cpu, bool enable); |
| 118 | extern void imx_set_cpu_jump(int cpu, void *jump_addr); | 113 | extern void imx_set_cpu_jump(int cpu, void *jump_addr); |
| 119 | #ifdef CONFIG_DEBUG_LL | ||
| 120 | extern void imx_lluart_map_io(void); | ||
| 121 | #else | ||
| 122 | static inline void imx_lluart_map_io(void) {} | ||
| 123 | #endif | ||
| 124 | extern void v7_cpu_resume(void); | 114 | extern void v7_cpu_resume(void); |
| 125 | extern u32 *pl310_get_save_ptr(void); | 115 | extern u32 *pl310_get_save_ptr(void); |
| 126 | #ifdef CONFIG_SMP | 116 | #ifdef CONFIG_SMP |
| @@ -139,7 +129,6 @@ extern void imx_gpc_init(void); | |||
| 139 | extern void imx_gpc_pre_suspend(void); | 129 | extern void imx_gpc_pre_suspend(void); |
| 140 | extern void imx_gpc_post_resume(void); | 130 | extern void imx_gpc_post_resume(void); |
| 141 | extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); | 131 | extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode); |
| 142 | extern void imx6q_clock_map_io(void); | ||
| 143 | 132 | ||
| 144 | extern void imx_cpu_die(unsigned int cpu); | 133 | extern void imx_cpu_die(unsigned int cpu); |
| 145 | 134 | ||