diff options
| author | Ziyann <jaraidaniel@gmail.com> | 2014-07-11 12:38:51 +0200 |
|---|---|---|
| committer | Ziyann <jaraidaniel@gmail.com> | 2014-11-19 21:12:45 +0100 |
| commit | c93d3931edb2ece1f7cc05146b996d1614aef86f (patch) | |
| tree | 48862e25890c4794393adb2e6d6bc51cd07ed3af /arch/arm/mach-omap2/pm44xx.c | |
| parent | 893e1f46b96f1bdd562ce77103f5dfe5d91d649b (diff) | |
| download | kernel_samsung_tuna-c93d3931edb2ece1f7cc05146b996d1614aef86f.zip kernel_samsung_tuna-c93d3931edb2ece1f7cc05146b996d1614aef86f.tar.gz kernel_samsung_tuna-c93d3931edb2ece1f7cc05146b996d1614aef86f.tar.bz2 | |
Revert "OMAP4: HSI: mux: remove unused mux platform data"
This reverts commit 638b74f2f7800f5c3ea81f9157e823b01c26143f.
Diffstat (limited to 'arch/arm/mach-omap2/pm44xx.c')
| -rwxr-xr-x | arch/arm/mach-omap2/pm44xx.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pm44xx.c b/arch/arm/mach-omap2/pm44xx.c index 7b73df2..adf6eac 100755 --- a/arch/arm/mach-omap2/pm44xx.c +++ b/arch/arm/mach-omap2/pm44xx.c @@ -1340,6 +1340,7 @@ void omap_pm_clear_dsp_wake_up(void) static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id) { u32 irqenable_mpu, irqstatus_mpu; + int hsi_port; irqenable_mpu = omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST, OMAP4_PRM_IRQENABLE_MPU_OFFSET); @@ -1354,7 +1355,16 @@ static irqreturn_t prcm_interrupt_handler (int irq, void *dev_id) /* Check if a IO_ST interrupt */ if (irqstatus_mpu & OMAP4430_IO_ST_MASK) { /* Check if HSI caused the IO wakeup */ - omap_hsi_io_wakeup_check(); + + /* HACK: check CAWAKE wakeup event */ + if (cawake_event_flag) { + hsi_port = 1; + cawake_event_flag = 0; + omap_hsi_wakeup(hsi_port); + } else + if (omap_hsi_is_io_wakeup_from_hsi(&hsi_port)) + omap_hsi_wakeup(hsi_port); + omap_uart_resume_idle(); if (!machine_is_tuna()) usbhs_wakeup(); |