aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-omap2/cm2xxx.c5
-rw-r--r--arch/arm/mach-omap2/cm2xxx.h2
-rw-r--r--arch/arm/mach-omap2/cm3xxx.c5
-rw-r--r--arch/arm/mach-omap2/cm3xxx.h3
4 files changed, 6 insertions, 9 deletions
diff --git a/arch/arm/mach-omap2/cm2xxx.c b/arch/arm/mach-omap2/cm2xxx.c
index 365df9e32d1c..a96d901b1d5d 100644
--- a/arch/arm/mach-omap2/cm2xxx.c
+++ b/arch/arm/mach-omap2/cm2xxx.c
@@ -204,8 +204,9 @@ void omap2xxx_cm_apll96_disable(void)
204 * XXX This function is only needed until absolute register addresses are 204 * XXX This function is only needed until absolute register addresses are
205 * removed from the OMAP struct clk records. 205 * removed from the OMAP struct clk records.
206 */ 206 */
207int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst, 207static int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg,
208 u8 *idlest_reg_id) 208 s16 *prcm_inst,
209 u8 *idlest_reg_id)
209{ 210{
210 unsigned long offs; 211 unsigned long offs;
211 u8 idlest_offs; 212 u8 idlest_offs;
diff --git a/arch/arm/mach-omap2/cm2xxx.h b/arch/arm/mach-omap2/cm2xxx.h
index a14094bbed1a..c89502b168ae 100644
--- a/arch/arm/mach-omap2/cm2xxx.h
+++ b/arch/arm/mach-omap2/cm2xxx.h
@@ -56,8 +56,6 @@ extern void omap2xxx_cm_set_apll96_auto_low_power_stop(void);
56 56
57int omap2xxx_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_id, 57int omap2xxx_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_id,
58 u8 idlest_shift); 58 u8 idlest_shift);
59extern int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg,
60 s16 *prcm_inst, u8 *idlest_reg_id);
61extern int omap2xxx_cm_fclks_active(void); 59extern int omap2xxx_cm_fclks_active(void);
62extern int omap2xxx_cm_mpu_retention_allowed(void); 60extern int omap2xxx_cm_mpu_retention_allowed(void);
63extern u32 omap2xxx_cm_get_core_clk_src(void); 61extern u32 omap2xxx_cm_get_core_clk_src(void);
diff --git a/arch/arm/mach-omap2/cm3xxx.c b/arch/arm/mach-omap2/cm3xxx.c
index 018063b96cbc..ebead8f035f9 100644
--- a/arch/arm/mach-omap2/cm3xxx.c
+++ b/arch/arm/mach-omap2/cm3xxx.c
@@ -118,8 +118,9 @@ static int omap3xxx_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_id,
118 * XXX This function is only needed until absolute register addresses are 118 * XXX This function is only needed until absolute register addresses are
119 * removed from the OMAP struct clk records. 119 * removed from the OMAP struct clk records.
120 */ 120 */
121int omap3xxx_cm_split_idlest_reg(void __iomem *idlest_reg, s16 *prcm_inst, 121static int omap3xxx_cm_split_idlest_reg(void __iomem *idlest_reg,
122 u8 *idlest_reg_id) 122 s16 *prcm_inst,
123 u8 *idlest_reg_id)
123{ 124{
124 unsigned long offs; 125 unsigned long offs;
125 u8 idlest_offs; 126 u8 idlest_offs;
diff --git a/arch/arm/mach-omap2/cm3xxx.h b/arch/arm/mach-omap2/cm3xxx.h
index 33491c746b4c..734a8581c0c4 100644
--- a/arch/arm/mach-omap2/cm3xxx.h
+++ b/arch/arm/mach-omap2/cm3xxx.h
@@ -68,9 +68,6 @@
68 68
69#ifndef __ASSEMBLER__ 69#ifndef __ASSEMBLER__
70 70
71extern int omap3xxx_cm_split_idlest_reg(void __iomem *idlest_reg,
72 s16 *prcm_inst, u8 *idlest_reg_id);
73
74extern void omap3_cm_save_context(void); 71extern void omap3_cm_save_context(void);
75extern void omap3_cm_restore_context(void); 72extern void omap3_cm_restore_context(void);
76extern void omap3_cm_save_scratchpad_contents(u32 *ptr); 73extern void omap3_cm_save_scratchpad_contents(u32 *ptr);