diff options
Diffstat (limited to 'arch/arm/mach-omap2/prm2xxx_3xxx.c')
| -rw-r--r-- | arch/arm/mach-omap2/prm2xxx_3xxx.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c index 3b83763..8a20242 100644 --- a/arch/arm/mach-omap2/prm2xxx_3xxx.c +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c @@ -162,39 +162,39 @@ int omap2_prm_deassert_hardreset(s16 prm_mod, u8 rst_shift, u8 st_shift) /* PRM VP */ /* - * struct omap3_vp - OMAP3 VP register access description. + * struct omap3_prm_irq - OMAP3 PRM IRQ register access description. * @tranxdone_status: VP_TRANXDONE_ST bitmask in PRM_IRQSTATUS_MPU reg */ -struct omap3_vp { +struct omap3_prm_irq { u32 tranxdone_status; }; -struct omap3_vp omap3_vp[] = { - [OMAP3_VP_VDD_MPU_ID] = { +static struct omap3_prm_irq omap3_prm_irqs[] = { + [OMAP3_PRM_IRQ_VDD_MPU_ID] = { .tranxdone_status = OMAP3430_VP1_TRANXDONE_ST_MASK, }, - [OMAP3_VP_VDD_CORE_ID] = { + [OMAP3_PRM_IRQ_VDD_CORE_ID] = { .tranxdone_status = OMAP3430_VP2_TRANXDONE_ST_MASK, }, }; #define MAX_VP_ID ARRAY_SIZE(omap3_vp); -u32 omap3_prm_vp_check_txdone(u8 vp_id) +u32 omap3_prm_vp_check_txdone(u8 irq_id) { - struct omap3_vp *vp = &omap3_vp[vp_id]; + struct omap3_prm_irq *irq = &omap3_prm_irqs[irq_id]; u32 irqstatus; irqstatus = omap2_prm_read_mod_reg(OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET); - return irqstatus & vp->tranxdone_status; + return irqstatus & irq->tranxdone_status; } -void omap3_prm_vp_clear_txdone(u8 vp_id) +void omap3_prm_vp_clear_txdone(u8 irq_id) { - struct omap3_vp *vp = &omap3_vp[vp_id]; + struct omap3_prm_irq *irq = &omap3_prm_irqs[irq_id]; - omap2_prm_write_mod_reg(vp->tranxdone_status, + omap2_prm_write_mod_reg(irq->tranxdone_status, OCP_MOD, OMAP3_PRM_IRQSTATUS_MPU_OFFSET); } |