Blackfin: bf538: pull gpio/port logic out of core hibernate paths

Re-architect how we save/restore the gpio/port logic that only pertains
to bf538/bf539 parts by pulling it out of the core code paths and pushing
it out to bf538-specific locations.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>

2 files changed, 39 insertions, 1 deletions

diff --git a/arch/blackfin/mach-bf538/ext-gpio.c b/arch/blackfin/mach-bf538/ext-gpio.c
index 180b1252679f..471a9b184d5b 100644
--- a/arch/blackfin/mach-bf538/ext-gpio.c
+++ b/arch/blackfin/mach-bf538/ext-gpio.c
@@ -1,7 +1,7 @@
 /*
  * GPIOLIB interface for BF538/9 PORT C, D, and E GPIOs
  *
- * Copyright 2009 Analog Devices Inc.
+ * Copyright 2009-2011 Analog Devices Inc.
  *
  * Licensed under the GPL-2 or later.
  */
@@ -121,3 +121,38 @@ static int __init bf538_extgpio_setup(void)
                 gpiochip_add(&bf538_porte_chip);
 }
 arch_initcall(bf538_extgpio_setup);
+
+#ifdef CONFIG_PM
+static struct {
+        u16 data, dir, inen;
+} gpio_bank_saved[3];
+
+static void __iomem * const port_bases[3] = {
+        (void *)PORTCIO,
+        (void *)PORTDIO,
+        (void *)PORTEIO,
+};
+
+void bfin_special_gpio_pm_hibernate_suspend(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(port_bases); ++i) {
+                gpio_bank_saved[i].data = read_PORTIO(port_bases[i]);
+                gpio_bank_saved[i].inen = read_PORTIO_INEN(port_bases[i]);
+                gpio_bank_saved[i].dir = read_PORTIO_DIR(port_bases[i]);
+        }
+}
+
+void bfin_special_gpio_pm_hibernate_restore(void)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(port_bases); ++i) {
+                write_PORTIO_INEN(port_bases[i], gpio_bank_saved[i].inen);
+                write_PORTIO_SET(port_bases[i],
+                        gpio_bank_saved[i].data & gpio_bank_saved[i].dir);
+                write_PORTIO_DIR(port_bases[i], gpio_bank_saved[i].dir);
+        }
+}
+#endif
diff --git a/arch/blackfin/mach-bf538/include/mach/gpio.h b/arch/blackfin/mach-bf538/include/mach/gpio.h
index 8a5beeece996..3561c7d8935b 100644
--- a/arch/blackfin/mach-bf538/include/mach/gpio.h
+++ b/arch/blackfin/mach-bf538/include/mach/gpio.h
@@ -8,7 +8,10 @@
 #define _MACH_GPIO_H_
 
 #define MAX_BLACKFIN_GPIOS 16
+#ifdef CONFIG_GPIOLIB
+/* We only use the special logic with GPIOLIB devices */
 #define BFIN_SPECIAL_GPIO_BANKS 3
+#endif
 
 #define GPIO_PF0        0       /* PF */
 #define GPIO_PF1        1