Blackfin arch: fix bug can not wakeup from sleep via push buttons

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 8cefed8cf5d9d771d470674b48ed77132db1f2e5..bb1f4fb2467c119251d2b14417998500f6de4827 100644 (file)
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -494,19 +494,24 @@ u32 gpio_pm_setup(void)
                        gpio_bank_saved[bank].dir   = gpio_bankb[bank]->dir;
                        gpio_bank_saved[bank].edge  = gpio_bankb[bank]->edge;
                        gpio_bank_saved[bank].both  = gpio_bankb[bank]->both;
+                       gpio_bank_saved[bank].reserved = reserved_map[bank];
 
                        gpio = i;
 
                        while (mask) {
                                if (mask & 1) {
-                                       bfin_gpio_wakeup_type(gpio, wakeup_flags_map[gpio]);
+                                       reserved_map[gpio_bank(gpio)] |=
+                                                       gpio_bit(gpio);
+                                       bfin_gpio_wakeup_type(gpio,
+                                               wakeup_flags_map[gpio]);
                                        set_gpio_data(gpio, 0); /*Clear*/
                                }
                                gpio++;
                                mask >>= 1;
                        }
 
-                       sic_iwr |= 1 << (sic_iwr_irqs[bank] - (IRQ_CORETMR + 1));
+                       sic_iwr |= 1 <<
+                               (sic_iwr_irqs[bank] - (IRQ_CORETMR + 1));
                        gpio_bankb[bank]->maskb_set = wakeup_map[gpio_bank(i)];
                }
        }
@@ -535,6 +540,9 @@ void gpio_pm_restore(void)
                        gpio_bankb[bank]->polar = gpio_bank_saved[bank].polar;
                        gpio_bankb[bank]->edge  = gpio_bank_saved[bank].edge;
                        gpio_bankb[bank]->both  = gpio_bank_saved[bank].both;
+
+                       reserved_map[bank] = gpio_bank_saved[bank].reserved;
+
                }
 
                gpio_bankb[bank]->maskb = gpio_bank_saved[bank].maskb;

diff --git a/include/asm-blackfin/gpio.h b/include/asm-blackfin/gpio.h
index aa0d5503e232f4512ae26da27518bb93107c8ad8..d98d77ad71f76ac48a1525eeb1f9c668cbb7d6eb 100644 (file)
--- a/include/asm-blackfin/gpio.h
+++ b/include/asm-blackfin/gpio.h
@@ -332,6 +332,7 @@ struct gpio_port_s {
        unsigned short inen;
 
        unsigned short fer;
+       unsigned short reserved;
 };
 #endif /*CONFIG_PM*/