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

Commit fac03f12 authored by Keerthy's avatar Keerthy Committed by Paul Walmsley
Browse files

ARM: OMAP4: PRM: Remove hardcoding of PRM_IO_PMCTRL_OFFSET register 



PRM_IO_PMCTRL_OFFSET need not be same for all SOCs hence
remove hardcoding and use the value provided by the omap_prcm_irq_setup
structure. This is done to support IO wakeup on am437x series.

Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Reviewed-by: default avatarPaul Walmsley <paul@pwsan.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent d770e558

arch/arm/mach-omap2/prcm-common.h

+2 −0
Original line number Diff line number Diff line
@@ -472,6 +472,7 @@ struct omap_prcm_irq { 
 * struct omap_prcm_irq_setup - PRCM interrupt controller details

 * @ack: PRM register offset for the first PRM_IRQSTATUS_MPU register

 * @mask: PRM register offset for the first PRM_IRQENABLE_MPU register

 * @pm_ctrl: PRM register offset for the PRM_IO_PMCTRL register

 * @nr_regs: number of PRM_IRQ{STATUS,ENABLE}_MPU* registers

 * @nr_irqs: number of entries in the @irqs array

 * @irqs: ptr to an array of PRCM interrupt bits (see @nr_irqs)
@@ -494,6 +495,7 @@ struct omap_prcm_irq { 
struct omap_prcm_irq_setup {

	u16 ack;

	u16 mask;

	u16 pm_ctrl;

	u8 nr_regs;

	u8 nr_irqs;

	const struct omap_prcm_irq *irqs;

arch/arm/mach-omap2/prm44xx.c

+6 −5
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ static const struct omap_prcm_irq omap4_prcm_irqs[] = { 
static struct omap_prcm_irq_setup omap4_prcm_irq_setup = {

	.ack			= OMAP4_PRM_IRQSTATUS_MPU_OFFSET,

	.mask			= OMAP4_PRM_IRQENABLE_MPU_OFFSET,

	.pm_ctrl		= OMAP4_PRM_IO_PMCTRL_OFFSET,

	.nr_regs		= 2,

	.irqs			= omap4_prcm_irqs,

	.nr_irqs		= ARRAY_SIZE(omap4_prcm_irqs),
@@ -306,10 +307,10 @@ static void omap44xx_prm_reconfigure_io_chain(void) 
	omap4_prm_rmw_inst_reg_bits(OMAP4430_WUCLK_CTRL_MASK,

				    OMAP4430_WUCLK_CTRL_MASK,

				    inst,

				    OMAP4_PRM_IO_PMCTRL_OFFSET);

				    omap4_prcm_irq_setup.pm_ctrl);

	omap_test_timeout(

		(((omap4_prm_read_inst_reg(inst,

					   OMAP4_PRM_IO_PMCTRL_OFFSET) &

					   omap4_prcm_irq_setup.pm_ctrl) &

		   OMAP4430_WUCLK_STATUS_MASK) >>

		  OMAP4430_WUCLK_STATUS_SHIFT) == 1),

		MAX_IOPAD_LATCH_TIME, i);
@@ -319,10 +320,10 @@ static void omap44xx_prm_reconfigure_io_chain(void) 
	/* Trigger WUCLKIN disable */

	omap4_prm_rmw_inst_reg_bits(OMAP4430_WUCLK_CTRL_MASK, 0x0,

				    inst,

				    OMAP4_PRM_IO_PMCTRL_OFFSET);

				    omap4_prcm_irq_setup.pm_ctrl);

	omap_test_timeout(

		(((omap4_prm_read_inst_reg(inst,

					   OMAP4_PRM_IO_PMCTRL_OFFSET) &

					   omap4_prcm_irq_setup.pm_ctrl) &

		   OMAP4430_WUCLK_STATUS_MASK) >>

		  OMAP4430_WUCLK_STATUS_SHIFT) == 0),

		MAX_IOPAD_LATCH_TIME, i);
@@ -350,7 +351,7 @@ static void __init omap44xx_prm_enable_io_wakeup(void) 
	omap4_prm_rmw_inst_reg_bits(OMAP4430_GLOBAL_WUEN_MASK,

				    OMAP4430_GLOBAL_WUEN_MASK,

				    inst,

				    OMAP4_PRM_IO_PMCTRL_OFFSET);

				    omap4_prcm_irq_setup.pm_ctrl);

}



/**