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

Commit e9f1ddcd authored by Tero Kristo's avatar Tero Kristo
Browse files

ARM: OMAP3+: PRM: add common APIs for prm_vp_check/clear_txdone 



PRM driver now only exports a generic API for clearing / checking
VP txdone status.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
parent 9cb6d363

arch/arm/mach-omap2/prm.h

+14 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ struct prm_ll_data { 
				     u16 offset);

	void (*reset_system)(void);

	int (*clear_mod_irqs)(s16 module, u8 regs, u32 wkst_mask);

	u32 (*vp_check_txdone)(u8 vp_id);

	void (*vp_clear_txdone)(u8 vp_id);

};



extern int prm_register(struct prm_ll_data *pld);
@@ -164,6 +166,18 @@ void omap_prm_reset_system(void); 
void omap_prm_reconfigure_io_chain(void);

int omap_prm_clear_mod_irqs(s16 module, u8 regs, u32 wkst_mask);



/*

 * Voltage Processor (VP) identifiers

 */

#define OMAP3_VP_VDD_MPU_ID	0

#define OMAP3_VP_VDD_CORE_ID	1

#define OMAP4_VP_VDD_CORE_ID	0

#define OMAP4_VP_VDD_IVA_ID	1

#define OMAP4_VP_VDD_MPU_ID	2



u32 omap_prm_vp_check_txdone(u8 vp_id);

void omap_prm_vp_clear_txdone(u8 vp_id);



#endif

arch/arm/mach-omap2/prm3xxx.c

+4 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ static struct omap3_vp omap3_vp[] = { 


#define MAX_VP_ID ARRAY_SIZE(omap3_vp);



u32 omap3_prm_vp_check_txdone(u8 vp_id)

static u32 omap3_prm_vp_check_txdone(u8 vp_id)

{

	struct omap3_vp *vp = &omap3_vp[vp_id];

	u32 irqstatus;
@@ -106,7 +106,7 @@ u32 omap3_prm_vp_check_txdone(u8 vp_id) 
	return irqstatus & vp->tranxdone_status;

}



void omap3_prm_vp_clear_txdone(u8 vp_id)

static void omap3_prm_vp_clear_txdone(u8 vp_id)

{

	struct omap3_vp *vp = &omap3_vp[vp_id];
@@ -665,6 +665,8 @@ static struct prm_ll_data omap3xxx_prm_ll_data = { 
	.is_hardreset_asserted = &omap2_prm_is_hardreset_asserted,

	.reset_system = &omap3xxx_prm_dpll3_reset,

	.clear_mod_irqs = &omap3xxx_prm_clear_mod_irqs,

	.vp_check_txdone = &omap3_prm_vp_check_txdone,

	.vp_clear_txdone = &omap3_prm_vp_clear_txdone,

};



int __init omap3xxx_prm_init(void)

arch/arm/mach-omap2/prm3xxx.h

+0 −4
Original line number Diff line number Diff line
@@ -132,10 +132,6 @@ 


#ifndef __ASSEMBLER__



/* OMAP3-specific VP functions */

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.

arch/arm/mach-omap2/prm44xx.c

+4 −2
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ static struct omap4_vp omap4_vp[] = { 
	},

};



u32 omap4_prm_vp_check_txdone(u8 vp_id)

static u32 omap4_prm_vp_check_txdone(u8 vp_id)

{

	struct omap4_vp *vp = &omap4_vp[vp_id];

	u32 irqstatus;
@@ -149,7 +149,7 @@ u32 omap4_prm_vp_check_txdone(u8 vp_id) 
	return irqstatus & vp->tranxdone_status;

}



void omap4_prm_vp_clear_txdone(u8 vp_id)

static void omap4_prm_vp_clear_txdone(u8 vp_id)

{

	struct omap4_vp *vp = &omap4_vp[vp_id];
@@ -699,6 +699,8 @@ static struct prm_ll_data omap44xx_prm_ll_data = { 
	.deassert_hardreset	= omap4_prminst_deassert_hardreset,

	.is_hardreset_asserted	= omap4_prminst_is_hardreset_asserted,

	.reset_system		= omap4_prminst_global_warm_sw_reset,

	.vp_check_txdone	= omap4_prm_vp_check_txdone,

	.vp_clear_txdone	= omap4_prm_vp_clear_txdone,

};



int __init omap44xx_prm_init(void)

arch/arm/mach-omap2/prm44xx_54xx.h

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ 
/* Function prototypes */

#ifndef __ASSEMBLER__



/* OMAP4/OMAP5-specific VP functions */

u32 omap4_prm_vp_check_txdone(u8 vp_id);

void omap4_prm_vp_clear_txdone(u8 vp_id);



/*

 * OMAP4/OMAP5 access functions for voltage controller (VC) and

 * voltage proccessor (VP) in the PRM.