diff options
author | Shawn Guo <shawn.guo@freescale.com> | 2014-05-20 01:41:36 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-07-18 04:10:08 -0400 |
commit | 4ef5e3870113c5caab22d4363d882b372f2c6b57 (patch) | |
tree | 31e4fa2be5b0626364b7ed968fd51120cadcba5b /arch/arm/mach-imx/common.h | |
parent | 20484c13ca6c7f7d495800f19e39c038c7ab2dc5 (diff) |
ARM: imx5: reuse clock CCM mapping in pm code
The imx5 pm code needs to access CCM registers. Let's remove the use
of CCM static mapping in pm code by reusing the dynamic mapping created
in clock code.
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/mach-imx/common.h')
-rw-r--r-- | arch/arm/mach-imx/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 1d6cf4d55f57..8aa198c9b1d5 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h | |||
@@ -143,8 +143,10 @@ void imx6q_pm_set_ccm_base(void __iomem *base); | |||
143 | 143 | ||
144 | #ifdef CONFIG_PM | 144 | #ifdef CONFIG_PM |
145 | void imx5_pm_init(void); | 145 | void imx5_pm_init(void); |
146 | void imx5_pm_set_ccm_base(void __iomem *base); | ||
146 | #else | 147 | #else |
147 | static inline void imx5_pm_init(void) {} | 148 | static inline void imx5_pm_init(void) {} |
149 | static inline void imx5_pm_set_ccm_base(void __iomem *base) {} | ||
148 | #endif | 150 | #endif |
149 | 151 | ||
150 | #ifdef CONFIG_NEON | 152 | #ifdef CONFIG_NEON |