Commit 8a680ea2 authored by Tero Kristo's avatar Tero Kristo Committed by Paul Walmsley
Browse files

ARM: OMAP3+: PRM: Enable IO wake up 



Enable IO Wake up for OMAP3/4 as part of PRM Init. Currently this has been
managed in cpuidle path which is not the right place. Subsequent patch
will remove IO Daisy chain handling in cpuidle path once daisy chain is
handled as part of hwmod mux. This patch also moves the OMAP4 IO wakeup
enable code from the trigger function to init time setup.

Signed-off-by: default avatarTero Kristo <t-kristo@ti.com>
Reviewed-by: default avatarRajendra Nayak <rnayak@ti.com>
[paul@pwsan.com: harmonize function names with other PRM functions; add
 kerneldoc; resolve checkpatch warnings]
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent dea6200b

arch/arm/mach-omap2/prm2xxx_3xxx.c

+19 −1
Original line number Diff line number Diff line
@@ -332,10 +332,28 @@ void omap3xxx_prm_reconfigure_io_chain(void) 
	omap2_prm_read_mod_reg(WKUP_MOD, PM_WKST);

}



/**

 * omap3xxx_prm_enable_io_wakeup - enable wakeup events from I/O wakeup latches

 *

 * Activates the I/O wakeup event latches and allows events logged by

 * those latches to signal a wakeup event to the PRCM.  For I/O

 * wakeups to occur, WAKEUPENABLE bits must be set in the pad mux

 * registers, and omap3xxx_prm_reconfigure_io_chain() must be called.

 * No return value.

 */

static void __init omap3xxx_prm_enable_io_wakeup(void)

{

	if (omap3_has_io_wakeup())

		omap2_prm_set_mod_reg_bits(OMAP3430_EN_IO_MASK, WKUP_MOD,

					   PM_WKEN);

}



static int __init omap3xxx_prcm_init(void)

{

	if (cpu_is_omap34xx())

	if (cpu_is_omap34xx()) {

		omap3xxx_prm_enable_io_wakeup();

		return omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);

	}

	return 0;

}

subsys_initcall(omap3xxx_prcm_init);

arch/arm/mach-omap2/prm44xx.c

+19 −12
Original line number Diff line number Diff line
@@ -245,17 +245,6 @@ void omap44xx_prm_restore_irqen(u32 *saved_mask) 
void omap44xx_prm_reconfigure_io_chain(void)

{

	int i = 0;

	u32 v;



	v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,

				    OMAP4_PRM_IO_PMCTRL_OFFSET);



	/* Enable GLOBAL_WUEN */

	if (!(v & OMAP4430_GLOBAL_WUEN_MASK))

		omap4_prm_rmw_inst_reg_bits(OMAP4430_GLOBAL_WUEN_MASK,

					    OMAP4430_GLOBAL_WUEN_MASK,

					    OMAP4430_PRM_DEVICE_INST,

					    OMAP4_PRM_IO_PMCTRL_OFFSET);



	/* Trigger WUCLKIN enable */

	omap4_prm_rmw_inst_reg_bits(OMAP4430_WUCLK_CTRL_MASK,
@@ -287,10 +276,28 @@ void omap44xx_prm_reconfigure_io_chain(void) 
	return;

}



/**

 * omap44xx_prm_enable_io_wakeup - enable wakeup events from I/O wakeup latches

 *

 * Activates the I/O wakeup event latches and allows events logged by

 * those latches to signal a wakeup event to the PRCM.  For I/O wakeups

 * to occur, WAKEUPENABLE bits must be set in the pad mux registers, and

 * omap44xx_prm_reconfigure_io_chain() must be called.  No return value.

 */

static void __init omap44xx_prm_enable_io_wakeup(void)

{

	omap4_prm_rmw_inst_reg_bits(OMAP4430_GLOBAL_WUEN_MASK,

				    OMAP4430_GLOBAL_WUEN_MASK,

				    OMAP4430_PRM_DEVICE_INST,

				    OMAP4_PRM_IO_PMCTRL_OFFSET);

}



static int __init omap4xxx_prcm_init(void)

{

	if (cpu_is_omap44xx())

	if (cpu_is_omap44xx()) {

		omap44xx_prm_enable_io_wakeup();

		return omap_prcm_register_chain_handler(&omap4_prcm_irq_setup);

	}

	return 0;

}

subsys_initcall(omap4xxx_prcm_init);

CRA Git | Maintained and supported by SUSTech CRA and CCSE