Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2650d6e authored by Tero Kristo's avatar Tero Kristo Committed by Tony Lindgren
Browse files

ARM: OMAP2+: CM: make clkdm_hwsup operations static 



These are not accessed outside the cm*.c files themselves, so make them
static.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Acked-by: default avatarPaul Walmsley <paul@pwsan.com>
Tested-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a8ae5afa

arch/arm/mach-omap2/cm2xxx.c

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static void _write_clktrctrl(u8 c, s16 module, u32 mask) 
	omap2_cm_write_mod_reg(v, module, OMAP2_CM_CLKSTCTRL);

}



bool omap2xxx_cm_is_clkdm_in_hwsup(s16 module, u32 mask)

static bool omap2xxx_cm_is_clkdm_in_hwsup(s16 module, u32 mask)

{

	u32 v;
@@ -64,12 +64,12 @@ bool omap2xxx_cm_is_clkdm_in_hwsup(s16 module, u32 mask) 
	return (v == OMAP24XX_CLKSTCTRL_ENABLE_AUTO) ? 1 : 0;

}



void omap2xxx_cm_clkdm_enable_hwsup(s16 module, u32 mask)

static void omap2xxx_cm_clkdm_enable_hwsup(s16 module, u32 mask)

{

	_write_clktrctrl(OMAP24XX_CLKSTCTRL_ENABLE_AUTO, module, mask);

}



void omap2xxx_cm_clkdm_disable_hwsup(s16 module, u32 mask)

static void omap2xxx_cm_clkdm_disable_hwsup(s16 module, u32 mask)

{

	_write_clktrctrl(OMAP24XX_CLKSTCTRL_DISABLE_AUTO, module, mask);

}

arch/arm/mach-omap2/cm2xxx.h

+0 −4
Original line number Diff line number Diff line
@@ -46,9 +46,6 @@ 


#ifndef __ASSEMBLER__



extern void omap2xxx_cm_clkdm_enable_hwsup(s16 module, u32 mask);

extern void omap2xxx_cm_clkdm_disable_hwsup(s16 module, u32 mask);



extern void omap2xxx_cm_set_dpll_disable_autoidle(void);

extern void omap2xxx_cm_set_dpll_auto_low_power_stop(void);
@@ -57,7 +54,6 @@ extern void omap2xxx_cm_set_apll54_auto_low_power_stop(void); 
extern void omap2xxx_cm_set_apll96_disable_autoidle(void);

extern void omap2xxx_cm_set_apll96_auto_low_power_stop(void);



extern bool omap2xxx_cm_is_clkdm_in_hwsup(s16 module, u32 mask);

int omap2xxx_cm_wait_module_ready(u8 part, s16 prcm_mod, u16 idlest_id,

				  u8 idlest_shift);

extern int omap2xxx_cm_split_idlest_reg(void __iomem *idlest_reg,

arch/arm/mach-omap2/cm33xx.c

+5 −5
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ static void _clktrctrl_write(u8 c, u16 inst, u16 cdoffs) 
 * Returns true if the clockdomain referred to by (@inst, @cdoffs)

 * is in hardware-supervised idle mode, or 0 otherwise.

 */

bool am33xx_cm_is_clkdm_in_hwsup(u16 inst, u16 cdoffs)

static bool am33xx_cm_is_clkdm_in_hwsup(u16 inst, u16 cdoffs)

{

	u32 v;
@@ -175,7 +175,7 @@ bool am33xx_cm_is_clkdm_in_hwsup(u16 inst, u16 cdoffs) 
 * Put a clockdomain referred to by (@inst, @cdoffs) into

 * hardware-supervised idle mode.  No return value.

 */

void am33xx_cm_clkdm_enable_hwsup(u16 inst, u16 cdoffs)

static void am33xx_cm_clkdm_enable_hwsup(u16 inst, u16 cdoffs)

{

	_clktrctrl_write(OMAP34XX_CLKSTCTRL_ENABLE_AUTO, inst, cdoffs);

}
@@ -189,7 +189,7 @@ void am33xx_cm_clkdm_enable_hwsup(u16 inst, u16 cdoffs) 
 * software-supervised idle mode, i.e., controlled manually by the

 * Linux OMAP clockdomain code.  No return value.

 */

void am33xx_cm_clkdm_disable_hwsup(u16 inst, u16 cdoffs)

static void am33xx_cm_clkdm_disable_hwsup(u16 inst, u16 cdoffs)

{

	_clktrctrl_write(OMAP34XX_CLKSTCTRL_DISABLE_AUTO, inst, cdoffs);

}
@@ -202,7 +202,7 @@ void am33xx_cm_clkdm_disable_hwsup(u16 inst, u16 cdoffs) 
 * Put a clockdomain referred to by (@inst, @cdoffs) into idle

 * No return value.

 */

void am33xx_cm_clkdm_force_sleep(u16 inst, u16 cdoffs)

static void am33xx_cm_clkdm_force_sleep(u16 inst, u16 cdoffs)

{

	_clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_SLEEP, inst, cdoffs);

}
@@ -215,7 +215,7 @@ void am33xx_cm_clkdm_force_sleep(u16 inst, u16 cdoffs) 
 * Take a clockdomain referred to by (@inst, @cdoffs) out of idle,

 * waking it up.  No return value.

 */

void am33xx_cm_clkdm_force_wakeup(u16 inst, u16 cdoffs)

static void am33xx_cm_clkdm_force_wakeup(u16 inst, u16 cdoffs)

{

	_clktrctrl_write(OMAP34XX_CLKSTCTRL_FORCE_WAKEUP, inst, cdoffs);

}

arch/arm/mach-omap2/cm33xx.h

+0 −5
Original line number Diff line number Diff line
@@ -374,11 +374,6 @@ 




#ifndef __ASSEMBLER__

bool am33xx_cm_is_clkdm_in_hwsup(u16 inst, u16 cdoffs);

void am33xx_cm_clkdm_enable_hwsup(u16 inst, u16 cdoffs);

void am33xx_cm_clkdm_disable_hwsup(u16 inst, u16 cdoffs);

void am33xx_cm_clkdm_force_sleep(u16 inst, u16 cdoffs);

void am33xx_cm_clkdm_force_wakeup(u16 inst, u16 cdoffs);

int am33xx_cm_init(void);



#if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)

arch/arm/mach-omap2/cm3xxx.c

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void _write_clktrctrl(u8 c, s16 module, u32 mask) 
	omap2_cm_write_mod_reg(v, module, OMAP2_CM_CLKSTCTRL);

}



bool omap3xxx_cm_is_clkdm_in_hwsup(s16 module, u32 mask)

static bool omap3xxx_cm_is_clkdm_in_hwsup(s16 module, u32 mask)

{

	u32 v;
@@ -53,22 +53,22 @@ bool omap3xxx_cm_is_clkdm_in_hwsup(s16 module, u32 mask) 
	return (v == OMAP34XX_CLKSTCTRL_ENABLE_AUTO) ? 1 : 0;

}



void omap3xxx_cm_clkdm_enable_hwsup(s16 module, u32 mask)

static void omap3xxx_cm_clkdm_enable_hwsup(s16 module, u32 mask)

{

	_write_clktrctrl(OMAP34XX_CLKSTCTRL_ENABLE_AUTO, module, mask);

}



void omap3xxx_cm_clkdm_disable_hwsup(s16 module, u32 mask)

static void omap3xxx_cm_clkdm_disable_hwsup(s16 module, u32 mask)

{

	_write_clktrctrl(OMAP34XX_CLKSTCTRL_DISABLE_AUTO, module, mask);

}



void omap3xxx_cm_clkdm_force_sleep(s16 module, u32 mask)

static void omap3xxx_cm_clkdm_force_sleep(s16 module, u32 mask)

{

	_write_clktrctrl(OMAP34XX_CLKSTCTRL_FORCE_SLEEP, module, mask);

}



void omap3xxx_cm_clkdm_force_wakeup(s16 module, u32 mask)

static void omap3xxx_cm_clkdm_force_wakeup(s16 module, u32 mask)

{

	_write_clktrctrl(OMAP34XX_CLKSTCTRL_FORCE_WAKEUP, module, mask);

}