|
@@ -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);
|
|
|
}
|
|
|
|
|
|
/**
|