From patchwork Fri Oct 1 11:56:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V2, 43/69] GIC: Added dummy handlers for Power Management Suspend Resume Date: Fri, 01 Oct 2010 01:56:03 -0000 From: Viresh KUMAR X-Patchwork-Id: 66360 Message-Id: To: linux-arm-kernel@lists.infradead.org, rtc-linux@googlegroups.com, a.zummo@towertech.it, dbrownell@users.sourceforge.net, linux-usb@vger.kernel.org, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, linux-mtd@lists.infradead.org, dwmw2@infradead.org Cc: Deepak Sikri , shiraz.hashim@st.com, vipin.kumar@st.com, armando.visconti@st.com, vipulkumar.samar@st.com, rajeev-dlh.kumar@st.com, pratyush.anand@st.com, bhupesh.sharma@st.com, Viresh Kumar From: Deepak Sikri enable_irq_wake() has a callback for interrupt controllers. But since gic handler did not had this call back associated, it was always returning -ENXIO, which was breaking the existing drivers. This patch adds dummy handlers in gic in order to avoid breaking of existing drivers. Signed-off-by: Deepak Sikri Signed-off-by: Viresh Kumar --- arch/arm/common/gic.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 7dfa9a8..e816ef1 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -201,6 +201,18 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) chip->unmask(irq); } +#ifdef CONFIG_PM + +static int gic_set_wake(unsigned int irq, unsigned int on) +{ + return 0; +} + +#else + +#define gic_set_wake NULL +#endif + static struct irq_chip gic_chip = { .name = "GIC", .ack = gic_ack_irq, @@ -210,6 +222,7 @@ static struct irq_chip gic_chip = { #ifdef CONFIG_SMP .set_affinity = gic_set_cpu, #endif + .set_wake = gic_set_wake, }; void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)