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

Commit 4bb73ade authored by Kevin Hilman's avatar Kevin Hilman
Browse files

OMAP2+: PRM: add register access functions for VC/VP 



On OMAP3+, the voltage controller (VC) and voltage processor (VP) are
inside the PRM.  Add some PRM helper functions for register access to
these module registers.

Thanks to Nishanth Menon for finding/fixing a sparse problem.

Cc: Nishanth Menon <nm@ti.com>
Signed-off-by: default avatarKevin Hilman <khilman@ti.com>
parent 842ec228

arch/arm/mach-omap2/prm2xxx_3xxx.c

+16 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ struct omap3_vp { 
	u32 tranxdone_status;

};



struct omap3_vp omap3_vp[] = {

static struct omap3_vp omap3_vp[] = {

	[OMAP3_VP_VDD_MPU_ID] = {

		.tranxdone_status = OMAP3430_VP1_TRANXDONE_ST_MASK,

	},
@@ -197,3 +197,18 @@ void omap3_prm_vp_clear_txdone(u8 vp_id) 
	omap2_prm_write_mod_reg(vp->tranxdone_status,

				OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET);

}



u32 omap3_prm_vcvp_read(u8 offset)

{

	return omap2_prm_read_mod_reg(OMAP3430_GR_MOD, offset);

}



void omap3_prm_vcvp_write(u32 val, u8 offset)

{

	omap2_prm_write_mod_reg(val, OMAP3430_GR_MOD, offset);

}



u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset)

{

	return omap2_prm_rmw_mod_reg_bits(mask, bits, OMAP3430_GR_MOD, offset);

}

arch/arm/mach-omap2/prm2xxx_3xxx.h

+8 −0
Original line number Diff line number Diff line
@@ -307,7 +307,15 @@ extern int omap2_prm_deassert_hardreset(s16 prm_mod, u8 rst_shift, u8 st_shift); 
u32 omap3_prm_vp_check_txdone(u8 vp_id);

void omap3_prm_vp_clear_txdone(u8 vp_id);



/*

 * OMAP3 access functions for voltage controller (VC) and

 * voltage proccessor (VP) in the PRM.

 */

extern u32 omap3_prm_vcvp_read(u8 offset);

extern void omap3_prm_vcvp_write(u32 val, u8 offset);

extern u32 omap3_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);

#endif	/* CONFIG_ARCH_OMAP4 */



#endif



/*

arch/arm/mach-omap2/prm44xx.c

+22 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 
#include "vp.h"

#include "prm44xx.h"

#include "prm-regbits-44xx.h"

#include "prcm44xx.h"

#include "prminst44xx.h"



/* PRM low-level functions */
@@ -99,3 +101,23 @@ void omap4_prm_vp_clear_txdone(u8 vp_id) 
				     OMAP4430_PRM_OCP_SOCKET_INST,

				     vp->irqstatus_mpu);

};



u32 omap4_prm_vcvp_read(u8 offset)

{

	return omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,

					   OMAP4430_PRM_DEVICE_INST, offset);

}



void omap4_prm_vcvp_write(u32 val, u8 offset)

{

	omap4_prminst_write_inst_reg(val, OMAP4430_PRM_PARTITION,

				     OMAP4430_PRM_DEVICE_INST, offset);

}



u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset)

{

	return omap4_prminst_rmw_inst_reg_bits(mask, bits,

					       OMAP4430_PRM_PARTITION,

					       OMAP4430_PRM_DEVICE_INST,

					       offset);

}

arch/arm/mach-omap2/prm44xx.h

+8 −0
Original line number Diff line number Diff line
@@ -755,6 +755,14 @@ extern u32 omap4_prm_rmw_inst_reg_bits(u32 mask, u32 bits, s16 inst, s16 idx); 
u32 omap4_prm_vp_check_txdone(u8 vp_id);

void omap4_prm_vp_clear_txdone(u8 vp_id);



/*

 * OMAP4 access functions for voltage controller (VC) and

 * voltage proccessor (VP) in the PRM.

 */

extern u32 omap4_prm_vcvp_read(u8 offset);

extern void omap4_prm_vcvp_write(u32 val, u8 offset);

extern u32 omap4_prm_vcvp_rmw(u32 mask, u32 bits, u8 offset);



# endif



#endif