4 files changed, 11 insertions, 0 deletions

diff --git a/arch/arm/mach-shmobile/intc-sh7372.c b/arch/arm/mach-shmobile/intc-sh7372.c
index d087b31b5d12..89afcaba99a1 100644
--- a/arch/arm/mach-shmobile/intc-sh7372.c
+++ b/arch/arm/mach-shmobile/intc-sh7372.c
@@ -535,6 +535,7 @@ static struct resource intcs_resources[] __initdata = {
 static struct intc_desc intcs_desc __initdata = {
         .name = "sh7372-intcs",
         .force_enable = ENABLED_INTCS,
+        .skip_syscore_suspend = true,
         .resource = intcs_resources,
         .num_resources = ARRAY_SIZE(intcs_resources),
         .hw = INTC_HW_DESC(intcs_vectors, intcs_groups, intcs_mask_registers,
diff --git a/drivers/sh/intc/core.c b/drivers/sh/intc/core.c
index 8b7a141ff35e..be5a025eeca3 100644
--- a/drivers/sh/intc/core.c
+++ b/drivers/sh/intc/core.c
@@ -354,6 +354,8 @@ int __init register_intc_controller(struct intc_desc *desc)
         if (desc->force_enable)
                 intc_enable_disable_enum(desc, d, desc->force_enable, 1);
 
+        d->skip_suspend = desc->skip_syscore_suspend;
+
         nr_intc_controllers++;
 
         return 0;
@@ -386,6 +388,9 @@ static int intc_suspend(void)
         list_for_each_entry(d, &intc_list, list) {
                 int irq;
 
+                if (d->skip_suspend)
+                        continue;
+
                 /* enable wakeup irqs belonging to this intc controller */
                 for_each_active_irq(irq) {
                         struct irq_data *data;
@@ -409,6 +414,9 @@ static void intc_resume(void)
         list_for_each_entry(d, &intc_list, list) {
                 int irq;
 
+                if (d->skip_suspend)
+                        continue;
+
                 for_each_active_irq(irq) {
                         struct irq_data *data;
                         struct irq_chip *chip;
diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h
index 5b934851efa8..b3fe1cf25a28 100644
--- a/drivers/sh/intc/internals.h
+++ b/drivers/sh/intc/internals.h
@@ -67,6 +67,7 @@ struct intc_desc_int {
         struct intc_window *window;
         unsigned int nr_windows;
         struct irq_chip chip;
+        bool skip_suspend;
 };
 
 
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h
index 5812fefbcedf..b160645f5599 100644
--- a/include/linux/sh_intc.h
+++ b/include/linux/sh_intc.h
@@ -95,6 +95,7 @@ struct intc_desc {
         unsigned int num_resources;
         intc_enum force_enable;
         intc_enum force_disable;
+        bool skip_syscore_suspend;
         struct intc_hw_desc hw;
 };