diff options
author | Olof Johansson <olof@lixom.net> | 2012-06-30 16:13:15 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-06-30 16:13:15 -0700 |
commit | 839ab0c18fe4cf83dd99ca814f2b4cf822cd99be (patch) | |
tree | 868e835a3cee2d3bb5071a0f00eb98bcce8ebdea /arch/arm/plat-mxc/include/mach/common.h | |
parent | 6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff) | |
parent | b9d18dc3a05d59894d60d5e173ebfb89a4b91bdf (diff) | |
download | talos-op-linux-839ab0c18fe4cf83dd99ca814f2b4cf822cd99be.tar.gz talos-op-linux-839ab0c18fe4cf83dd99ca814f2b4cf822cd99be.zip |
Merge branch 'imx/cpuidle' into next/pm
* imx/cpuidle:
ARM: imx: Add imx6q cpuidle driver
ARM: imx: Add imx5 cpuidle
ARM: imx: Add common imx cpuidle init functionality.
ARM: imx: Enable imx53 low power idle
ARM: imx: clean and consolidate imx5 suspend and idle code
ARM: imx: Add comments to tzic_enable_waker()
ARM: imx: Modify IMX_IO_P2V macro
Resolved trivial context conflict in arch/arm/plat-mxc/include/mach/common.h
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/common.h')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index e429ca1b814a..7ca15044154f 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h @@ -54,6 +54,7 @@ extern void imx50_soc_init(void); extern void imx51_soc_init(void); extern void imx53_soc_init(void); extern void imx51_init_late(void); +extern void imx53_init_late(void); extern void epit_timer_init(void __iomem *base, int irq); extern void mxc_timer_init(void __iomem *, int); extern int mx1_clocks_init(unsigned long fref); @@ -95,7 +96,6 @@ enum mx3_cpu_pwr_mode { }; extern void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode); -extern void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode); extern void imx_print_silicon_rev(const char *cpu, int srev); void avic_handle_irq(struct pt_regs *); @@ -146,8 +146,12 @@ extern void imx6q_clock_map_io(void); #ifdef CONFIG_PM extern void imx6q_pm_init(void); +extern void imx51_pm_init(void); +extern void imx53_pm_init(void); #else static inline void imx6q_pm_init(void) {} +static inline void imx51_pm_init(void) {} +static inline void imx53_pm_init(void) {} #endif #ifdef CONFIG_NEON |