summaryrefslogtreecommitdiff
path: root/arch/arm/plat-mxc
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r--arch/arm/plat-mxc/tzic.c4
-rw-r--r--arch/arm/plat-mxc/usb_common.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/tzic.c b/arch/arm/plat-mxc/tzic.c
index bcca6ac465a2..8707744fd3d1 100644
--- a/arch/arm/plat-mxc/tzic.c
+++ b/arch/arm/plat-mxc/tzic.c
@@ -105,6 +105,10 @@ static int mxc_set_wake_irq(unsigned int irq, unsigned int enable)
return 0;
}
+void mxc_get_wake_irq(u32 * wake_src[])
+{
+ *wake_src = wakeup_intr;
+}
static struct irq_chip mxc_tzic_chip = {
.name = "MXC_TZIC",
diff --git a/arch/arm/plat-mxc/usb_common.c b/arch/arm/plat-mxc/usb_common.c
index c8b8ba41b559..2f5f597f806e 100644
--- a/arch/arm/plat-mxc/usb_common.c
+++ b/arch/arm/plat-mxc/usb_common.c
@@ -447,7 +447,6 @@ static int usb_register_remote_wakeup(struct platform_device *pdev)
}
irq = res->start;
pdev->dev.power.can_wakeup = 1;
- enable_irq_wake(irq);
return 0;
}