Merge branch 'for-linus' of git://www.jni.nu/cris

[linux-2.6] / arch / blackfin / kernel / bfin_gpio.c

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index 72477c252a94b7a31a62dab1eda522634eb4f5b9..b6d89d1644cc8515c1909865e01fdf83e9ede39f 100644 (file)
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -395,32 +395,6 @@ inline void portmux_setup(unsigned short portno, unsigned short function)
 # define portmux_setup(...)  do { } while (0)
 #endif
 
-#ifndef BF548_FAMILY
-static void default_gpio(unsigned gpio)
-{
-       unsigned short bank, bitmask;
-       unsigned long flags;
-
-       bank = gpio_bank(gpio);
-       bitmask = gpio_bit(gpio);
-
-       local_irq_save(flags);
-
-       gpio_bankb[bank]->maska_clear = bitmask;
-       gpio_bankb[bank]->maskb_clear = bitmask;
-       SSYNC();
-       gpio_bankb[bank]->inen &= ~bitmask;
-       gpio_bankb[bank]->dir &= ~bitmask;
-       gpio_bankb[bank]->polar &= ~bitmask;
-       gpio_bankb[bank]->both &= ~bitmask;
-       gpio_bankb[bank]->edge &= ~bitmask;
-       AWA_DUMMY_READ(edge);
-       local_irq_restore(flags);
-}
-#else
-# define default_gpio(...)  do { } while (0)
-#endif
-
 static int __init bfin_gpio_init(void)
 {
        printk(KERN_INFO "Blackfin GPIO Controller\n");
@@ -941,7 +915,7 @@ int peripheral_request(unsigned short per, const char *label)
 EXPORT_SYMBOL(peripheral_request);
 #endif
 
-int peripheral_request_list(unsigned short per[], const char *label)
+int peripheral_request_list(const unsigned short per[], const char *label)
 {
        u16 cnt;
        int ret;
@@ -994,7 +968,7 @@ void peripheral_free(unsigned short per)
 }
 EXPORT_SYMBOL(peripheral_free);
 
-void peripheral_free_list(unsigned short per[])
+void peripheral_free_list(const unsigned short per[])
 {
        u16 cnt;
        for (cnt = 0; per[cnt] != 0; cnt++)
@@ -1080,8 +1054,6 @@ void gpio_free(unsigned gpio)
                return;
        }
 
-       default_gpio(gpio);
-
        reserved_gpio_map[gpio_bank(gpio)] &= ~gpio_bit(gpio);
 
        set_label(gpio, "free");
@@ -1144,8 +1116,39 @@ int gpio_get_value(unsigned gpio)
 }
 EXPORT_SYMBOL(gpio_get_value);
 
+void bfin_gpio_irq_prepare(unsigned gpio)
+{
+       unsigned long flags;
+
+       port_setup(gpio, GPIO_USAGE);
+
+       local_irq_save(flags);
+       gpio_array[gpio_bank(gpio)]->port_dir_clear = gpio_bit(gpio);
+       gpio_array[gpio_bank(gpio)]->port_inen |= gpio_bit(gpio);
+       local_irq_restore(flags);
+}
+
 #else
 
+int gpio_get_value(unsigned gpio)
+{
+       unsigned long flags;
+       int ret;
+
+       if (unlikely(get_gpio_edge(gpio))) {
+               local_irq_save(flags);
+               set_gpio_edge(gpio, 0);
+               ret = get_gpio_data(gpio);
+               set_gpio_edge(gpio, 1);
+               local_irq_restore(flags);
+
+               return ret;
+       } else
+               return get_gpio_data(gpio);
+}
+EXPORT_SYMBOL(gpio_get_value);
+
+
 int gpio_direction_input(unsigned gpio)
 {
        unsigned long flags;
@@ -1210,6 +1213,11 @@ void bfin_gpio_reset_spi0_ssel1(void)
        udelay(1);
 }
 
+void bfin_gpio_irq_prepare(unsigned gpio)
+{
+       port_setup(gpio, GPIO_USAGE);
+}
+
 #endif /*BF548_FAMILY */
 
 #if defined(CONFIG_PROC_FS)