Patched in Tegra support.

1 files changed, 15 insertions, 17 deletions

diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index ed978f1c5cb..02796b88443 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -58,7 +58,7 @@ static struct gpio_port_t * const gpio_array[] = {
         (struct gpio_port_t *) FIO0_FLAG_D,
         (struct gpio_port_t *) FIO1_FLAG_D,
         (struct gpio_port_t *) FIO2_FLAG_D,
-#elif defined(CONFIG_BF54x) || defined(CONFIG_BF60x) 
+#elif defined(CONFIG_BF54x)
         (struct gpio_port_t *)PORTA_FER,
         (struct gpio_port_t *)PORTB_FER,
         (struct gpio_port_t *)PORTC_FER,
@@ -66,11 +66,9 @@ static struct gpio_port_t * const gpio_array[] = {
         (struct gpio_port_t *)PORTE_FER,
         (struct gpio_port_t *)PORTF_FER,
         (struct gpio_port_t *)PORTG_FER,
-# if defined(CONFIG_BF54x)
         (struct gpio_port_t *)PORTH_FER,
         (struct gpio_port_t *)PORTI_FER,
         (struct gpio_port_t *)PORTJ_FER,
-# endif
 #else
 # error no gpio arrays defined
 #endif
@@ -212,7 +210,7 @@ static void port_setup(unsigned gpio, unsigned short usage)
         else
                 *port_fer[gpio_bank(gpio)] |= gpio_bit(gpio);
         SSYNC();
-#elif defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
+#elif defined(CONFIG_BF54x)
         if (usage == GPIO_USAGE)
                 gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
         else
@@ -301,7 +299,7 @@ static void portmux_setup(unsigned short per)
         pmux |= (function << offset);
         bfin_write_PORT_MUX(pmux);
 }
-#elif defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
+#elif defined(CONFIG_BF54x)
 inline void portmux_setup(unsigned short per)
 {
         u16 ident = P_IDENT(per);
@@ -379,7 +377,7 @@ static int portmux_group_check(unsigned short per)
 }
 #endif
 
-#if !(defined(CONFIG_BF54x) || defined(CONFIG_BF60x))
+#ifndef CONFIG_BF54x
 /***********************************************************
 *
 * FUNCTIONS: Blackfin General Purpose Ports Access Functions
@@ -682,7 +680,7 @@ void bfin_gpio_pm_hibernate_restore(void)
 
 
 #endif
-#else /* CONFIG_BF54x || CONFIG_BF60x */
+#else /* CONFIG_BF54x */
 #ifdef CONFIG_PM
 
 int bfin_pm_standby_ctrl(unsigned ctrl)
@@ -728,7 +726,7 @@ unsigned short get_gpio_dir(unsigned gpio)
 }
 EXPORT_SYMBOL(get_gpio_dir);
 
-#endif /* CONFIG_BF54x || CONFIG_BF60x */
+#endif /* CONFIG_BF54x */
 
 /***********************************************************
 *
@@ -785,7 +783,7 @@ int peripheral_request(unsigned short per, const char *label)
                  * be requested and used by several drivers
                  */
 
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
+#ifdef CONFIG_BF54x
                 if (!((per & P_MAYSHARE) && get_portmux(per) == P_FUNCT2MUX(per))) {
 #else
                 if (!(per & P_MAYSHARE)) {
@@ -939,7 +937,7 @@ int bfin_gpio_request(unsigned gpio, const char *label)
                 printk(KERN_NOTICE "bfin-gpio: GPIO %d is already reserved as gpio-irq!"
                        " (Documentation/blackfin/bfin-gpio-notes.txt)\n", gpio);
         }
-#if !(defined(CONFIG_BF54x) || defined(CONFIG_BF60x))
+#ifndef CONFIG_BF54x
         else {  /* Reset POLAR setting when acquiring a gpio for the first time */
                 set_gpio_polar(gpio, 0);
         }
@@ -1112,7 +1110,7 @@ void bfin_gpio_irq_free(unsigned gpio)
 
 static inline void __bfin_gpio_direction_input(unsigned gpio)
 {
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
+#ifdef CONFIG_BF54x
         gpio_array[gpio_bank(gpio)]->dir_clear = gpio_bit(gpio);
 #else
         gpio_array[gpio_bank(gpio)]->dir &= ~gpio_bit(gpio);
@@ -1140,13 +1138,13 @@ EXPORT_SYMBOL(bfin_gpio_direction_input);
 
 void bfin_gpio_irq_prepare(unsigned gpio)
 {
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
+#ifdef CONFIG_BF54x
         unsigned long flags;
 #endif
 
         port_setup(gpio, GPIO_USAGE);
 
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
+#ifdef CONFIG_BF54x
         flags = hard_local_irq_save();
         __bfin_gpio_direction_input(gpio);
         hard_local_irq_restore(flags);
@@ -1175,7 +1173,7 @@ int bfin_gpio_direction_output(unsigned gpio, int value)
 
         gpio_array[gpio_bank(gpio)]->inen &= ~gpio_bit(gpio);
         gpio_set_value(gpio, value);
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
+#ifdef CONFIG_BF54x
         gpio_array[gpio_bank(gpio)]->dir_set = gpio_bit(gpio);
 #else
         gpio_array[gpio_bank(gpio)]->dir |= gpio_bit(gpio);
@@ -1190,7 +1188,7 @@ EXPORT_SYMBOL(bfin_gpio_direction_output);
 
 int bfin_gpio_get_value(unsigned gpio)
 {
-#if defined(CONFIG_BF54x) || defined(CONFIG_BF60x)
+#ifdef CONFIG_BF54x
         return (1 & (gpio_array[gpio_bank(gpio)]->data >> gpio_sub_n(gpio)));
 #else
         unsigned long flags;
@@ -1265,8 +1263,8 @@ static __init int gpio_register_proc(void)
 {
         struct proc_dir_entry *proc_gpio;
 
-        proc_gpio = proc_create("gpio", 0, NULL, &gpio_proc_ops);
-        return proc_gpio == NULL;
+        proc_gpio = proc_create("gpio", S_IRUGO, NULL, &gpio_proc_ops);
+        return proc_gpio != NULL;
 }
 __initcall(gpio_register_proc);
 #endif