From 3d0babf00dc3f164c021e9e79ae2d79d5201e98a Mon Sep 17 00:00:00 2001 From: Sekhar Nori Date: Mon, 16 Nov 2009 17:21:30 +0530 Subject: [PATCH] --- yaml --- r: 178823 b: refs/heads/master c: 2d3f595016f982294c1669ee87aa91179d88502b h: refs/heads/master i: 178821: 01b2a3ff65183d8d2730461fd466f5bd4b87a552 178819: 992bf7c6df387d801371f013cd11fde5fa9dc06b 178815: 11c0afa984f6064b2408a556028f8b0292be26cf v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/cp_intc.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a184197d2ff1..3c5fb60c0462 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 077639f443294a25b16e4040ca06a1611700a4ae +refs/heads/master: 2d3f595016f982294c1669ee87aa91179d88502b diff --git a/trunk/arch/arm/mach-davinci/cp_intc.c b/trunk/arch/arm/mach-davinci/cp_intc.c index 52b287cf3a42..37311d1830eb 100644 --- a/trunk/arch/arm/mach-davinci/cp_intc.c +++ b/trunk/arch/arm/mach-davinci/cp_intc.c @@ -81,12 +81,23 @@ static int cp_intc_set_irq_type(unsigned int irq, unsigned int flow_type) return 0; } +/* + * Faking this allows us to to work with suspend functions of + * generic drivers which call {enable|disable}_irq_wake for + * wake up interrupt sources (eg RTC on DA850). + */ +static int cp_intc_set_wake(unsigned int irq, unsigned int on) +{ + return 0; +} + static struct irq_chip cp_intc_irq_chip = { .name = "cp_intc", .ack = cp_intc_ack_irq, .mask = cp_intc_mask_irq, .unmask = cp_intc_unmask_irq, .set_type = cp_intc_set_irq_type, + .set_wake = cp_intc_set_wake, }; void __init cp_intc_init(void __iomem *base, unsigned short num_irq,