diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 20:43:53 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-23 20:43:53 -0400 |
commit | a5ebba6b54bc8038a38d3eacac3a79bbeaf3ee24 (patch) | |
tree | d36eb26a7efd4e00381bc9f6474ea3ec31340585 /arch/arm/plat-mxc/include/mach/common.h | |
parent | e81218f5f0fd219bd75768d845159ba4810bdd48 (diff) | |
parent | 6b21a9ce0402e0c5fd2adfa3d41328fdd8f55a9a (diff) |
Merge tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull arm-soc power management changes from Arnd Bergmann:
"These are various power management related changes, mainly concerning
cpuidle on i.MX and OMAP, as well as a the move of the omap
smartreflex driver to live in the power subsystem."
Fix up conflicts in arch/arm/mach-{imx/mach-imx6q.c,omap2/prm2xxx_3xxx.h}
* tag 'pm' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (37 commits)
ARM: OMAP2+: PM: fix IRQ_NOAUTOEN removal by mis-merge
ARM: OMAP2+: do not allow SmartReflex to be built as a module
ARM: OMAP2: Use hwmod to initialize mmc for 2420
ARM: OMAP3: PM: cpuidle: optimize the clkdm idle latency in C1 state
ARM: OMAP3: PM: cpuidle: optimize the PER latency in C1 state
ARM: OMAP3: PM: cpuidle: default to C1 in next_valid_state
ARM: OMAP3: PM: cleanup cam_pwrdm leftovers
ARM: OMAP3: PM: call pre/post transition per powerdomain
ARM: OMAP2+: powerdomain: allow pre/post transtion to be per pwrdm
ARM: OMAP3: PM: Remove IO Daisychain control from cpuidle
ARM: OMAP3PLUS: hwmod: reconfigure IO Daisychain during hwmod mux
ARM: OMAP3+: PRM: Enable IO wake up
ARM: OMAP4: PRM: Add IO Daisychain support
ARM: OMAP3: PM: Move IO Daisychain function to omap3 prm file
ARM: OMAP3: PM: correct enable/disable of daisy io chain
ARM: OMAP2+: PRM: fix compile for OMAP4-only build
W1: OMAP HDQ1W: use runtime PM
ARM: OMAP2+: HDQ1W: use omap_device
W1: OMAP HDQ1W: use 32-bit register accesses
W1: OMAP HDQ1W: allow driver to be built on all OMAP2+
...
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 7cfcc44537f..7128e971041 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); | |||
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 imx51_init_late(void); |
57 | extern void imx53_init_late(void); | ||
57 | extern void epit_timer_init(void __iomem *base, int irq); | 58 | extern void epit_timer_init(void __iomem *base, int irq); |
58 | extern void mxc_timer_init(void __iomem *, int); | 59 | extern void mxc_timer_init(void __iomem *, int); |
59 | extern int mx1_clocks_init(unsigned long fref); | 60 | extern int mx1_clocks_init(unsigned long fref); |
@@ -96,7 +97,6 @@ enum mx3_cpu_pwr_mode { | |||
96 | }; | 97 | }; |
97 | 98 | ||
98 | extern void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode); | 99 | extern void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode); |
99 | extern void mx5_cpu_lp_set(enum mxc_cpu_pwr_mode mode); | ||
100 | extern void imx_print_silicon_rev(const char *cpu, int srev); | 100 | extern void imx_print_silicon_rev(const char *cpu, int srev); |
101 | 101 | ||
102 | void avic_handle_irq(struct pt_regs *); | 102 | void avic_handle_irq(struct pt_regs *); |
@@ -147,8 +147,12 @@ extern void imx6q_clock_map_io(void); | |||
147 | 147 | ||
148 | #ifdef CONFIG_PM | 148 | #ifdef CONFIG_PM |
149 | extern void imx6q_pm_init(void); | 149 | extern void imx6q_pm_init(void); |
150 | extern void imx51_pm_init(void); | ||
151 | extern void imx53_pm_init(void); | ||
150 | #else | 152 | #else |
151 | static inline void imx6q_pm_init(void) {} | 153 | static inline void imx6q_pm_init(void) {} |
154 | static inline void imx51_pm_init(void) {} | ||
155 | static inline void imx53_pm_init(void) {} | ||
152 | #endif | 156 | #endif |
153 | 157 | ||
154 | #ifdef CONFIG_NEON | 158 | #ifdef CONFIG_NEON |