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

Commit ff00fcc9 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Turn CM and PRM access into functions 



Otherwise compiling in omap2 and omap3 will not work.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent a58caad1

arch/arm/mach-omap2/clock.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ long omap2_clksel_round_rate(struct clk *clk, unsigned long target_rate); 
int omap2_clksel_set_rate(struct clk *clk, unsigned long rate);

u32 omap2_get_dpll_rate(struct clk *clk);

int omap2_wait_clock_ready(void __iomem *reg, u32 cval, const char *name);

void omap2_clk_prepare_for_reboot(void);



extern u8 cpu_mask;

arch/arm/mach-omap2/cm.h

+11 −0
Original line number Diff line number Diff line
@@ -99,6 +99,17 @@ 


extern u32 cm_read_mod_reg(s16 module, u16 idx);

extern void cm_write_mod_reg(u32 val, s16 module, u16 idx);

extern u32 cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx);



static inline u32 cm_set_mod_reg_bits(u32 bits, s16 module, s16 idx)

{

	return cm_rmw_mod_reg_bits(bits, bits, module, idx);

}



static inline u32 cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)

{

	return cm_rmw_mod_reg_bits(bits, 0x0, module, idx);

}



#endif

arch/arm/mach-omap2/prcm.c

+38 −7
Original line number Diff line number Diff line
@@ -28,10 +28,9 @@ 
static void __iomem *prm_base;

static void __iomem *cm_base;



extern void omap2_clk_prepare_for_reboot(void);



u32 omap_prcm_get_reset_sources(void)

{

	/* XXX This presumably needs modification for 34XX */

	return prm_read_mod_reg(WKUP_MOD, RM_RSTST) & 0x7f;

}

EXPORT_SYMBOL(omap_prcm_get_reset_sources);
@@ -39,13 +38,17 @@ EXPORT_SYMBOL(omap_prcm_get_reset_sources); 
/* Resets clock rates and reboots the system. Only called from system.h */

void omap_prcm_arch_reset(char mode)

{

	u32 wkup;

	s16 prcm_offs;

	omap2_clk_prepare_for_reboot();



	if (cpu_is_omap24xx()) {

		wkup = prm_read_mod_reg(WKUP_MOD, RM_RSTCTRL) | OMAP_RST_DPLL3;

		prm_write_mod_reg(wkup, WKUP_MOD, RM_RSTCTRL);

	}

	if (cpu_is_omap24xx())

		prcm_offs = WKUP_MOD;

	else if (cpu_is_omap34xx())

		prcm_offs = OMAP3430_GR_MOD;

	else

		WARN_ON(1);



	prm_set_mod_reg_bits(OMAP_RST_DPLL3, prcm_offs, RM_RSTCTRL);

}



static inline u32 __omap_prcm_read(void __iomem *base, s16 module, u16 reg)
@@ -75,6 +78,20 @@ void prm_write_mod_reg(u32 val, s16 module, u16 idx) 
}

EXPORT_SYMBOL(prm_write_mod_reg);



/* Read-modify-write a register in a PRM module. Caller must lock */

u32 prm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx)

{

	u32 v;



	v = prm_read_mod_reg(module, idx);

	v &= ~mask;

	v |= bits;

	prm_write_mod_reg(v, module, idx);



	return v;

}

EXPORT_SYMBOL(prm_rmw_mod_reg_bits);



/* Read a register in a CM module */

u32 cm_read_mod_reg(s16 module, u16 idx)

{
@@ -89,6 +106,20 @@ void cm_write_mod_reg(u32 val, s16 module, u16 idx) 
}

EXPORT_SYMBOL(cm_write_mod_reg);



/* Read-modify-write a register in a CM module. Caller must lock */

u32 cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx)

{

	u32 v;



	v = cm_read_mod_reg(module, idx);

	v &= ~mask;

	v |= bits;

	cm_write_mod_reg(v, module, idx);



	return v;

}

EXPORT_SYMBOL(cm_rmw_mod_reg_bits);



void __init omap2_set_globals_prcm(struct omap_globals *omap2_globals)

{

	prm_base = omap2_globals->prm;

arch/arm/mach-omap2/prm.h

+12 −0
Original line number Diff line number Diff line
@@ -168,6 +168,18 @@ 
/* Power/reset management domain register get/set */

extern u32 prm_read_mod_reg(s16 module, u16 idx);

extern void prm_write_mod_reg(u32 val, s16 module, u16 idx);

extern u32 prm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, s16 idx);



/* Read-modify-write bits in a PRM register (by domain) */

static inline u32 prm_set_mod_reg_bits(u32 bits, s16 module, s16 idx)

{

	return prm_rmw_mod_reg_bits(bits, bits, module, idx);

}



static inline u32 prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)

{

	return prm_rmw_mod_reg_bits(bits, 0x0, module, idx);

}



#endif