Merge tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux

Pull blackfin updates from Steven Miao:
 "Blackfin gpio changes, add adi pinctrl driver, and bug fixes"

* tag 'blackfin-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux:
  blackfin: fix build warning for unused variable
  smp: bf561: and smb_wmb()/smp_rmb() at ipi send/receive
  pm: use GFP_ATOMIC when pm core call this function
  blackfin: serial: Add serial port_fer and port_mux early platform resources.
  blackfin: pinctrl-adi2: code cleanup after using pinctrl-adi2
  blackfin: adi gpio driver and pinctrl driver support
  bf609: update default config for spi
  Blackfin: bfin_gpio: Use proper mask for comparing pfunc

16 files changed, 1025 insertions, 710 deletions

diff --git a/arch/blackfin/configs/BF609-EZKIT_defconfig b/arch/blackfin/configs/BF609-EZKIT_defconfig
index 13eb73231a9a..4ca39ab6b2bf 100644
--- a/arch/blackfin/configs/BF609-EZKIT_defconfig
+++ b/arch/blackfin/configs/BF609-EZKIT_defconfig
@@ -102,7 +102,7 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_BLACKFIN_TWI=y
 CONFIG_I2C_BLACKFIN_TWI_CLK_KHZ=100
 CONFIG_SPI=y
-CONFIG_SPI_BFIN6XX=y
+CONFIG_SPI_BFIN_V3=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
diff --git a/arch/blackfin/include/asm/irq.h b/arch/blackfin/include/asm/irq.h
index 4ae1144a4578..2fd04f10cc26 100644
--- a/arch/blackfin/include/asm/irq.h
+++ b/arch/blackfin/include/asm/irq.h
@@ -23,8 +23,7 @@
 /*
  * pm save bfin pint registers
  */
-struct bfin_pm_pint_save {
-        u32 mask_set;
+struct adi_pm_pint_save {
         u32 assign;
         u32 edge_set;
         u32 invert_set;
diff --git a/arch/blackfin/include/asm/irq_handler.h b/arch/blackfin/include/asm/irq_handler.h
index 4fbf83575db1..4b2a992794d7 100644
--- a/arch/blackfin/include/asm/irq_handler.h
+++ b/arch/blackfin/include/asm/irq_handler.h
@@ -12,11 +12,11 @@
 #include <mach/irq.h>
 
 /* init functions only */
-extern int __init init_arch_irq(void);
+extern int init_arch_irq(void);
 extern void init_exception_vectors(void);
-extern void __init program_IAR(void);
+extern void program_IAR(void);
 #ifdef init_mach_irq
-extern void __init init_mach_irq(void);
+extern void init_mach_irq(void);
 #else
 # define init_mach_irq()
 #endif
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index ed978f1c5cb9..a017359c1826 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -11,11 +11,8 @@
 #include <linux/err.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <asm/blackfin.h>
-#include <asm/gpio.h>
-#include <asm/portmux.h>
+#include <linux/gpio.h>
 #include <linux/irq.h>
-#include <asm/irq_handler.h>
 
 #if ANOMALY_05000311 || ANOMALY_05000323
 enum {
@@ -58,19 +55,6 @@ 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) 
-        (struct gpio_port_t *)PORTA_FER,
-        (struct gpio_port_t *)PORTB_FER,
-        (struct gpio_port_t *)PORTC_FER,
-        (struct gpio_port_t *)PORTD_FER,
-        (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
@@ -169,12 +153,6 @@ DECLARE_RESERVED_MAP(gpio_irq, GPIO_BANK_NUM);
 
 inline int check_gpio(unsigned gpio)
 {
-#if defined(CONFIG_BF54x)
-        if (gpio == GPIO_PB15 || gpio == GPIO_PC14 || gpio == GPIO_PC15
-            || gpio == GPIO_PH14 || gpio == GPIO_PH15
-            || gpio == GPIO_PJ14 || gpio == GPIO_PJ15)
-                return -EINVAL;
-#endif
         if (gpio >= MAX_BLACKFIN_GPIOS)
                 return -EINVAL;
         return 0;
@@ -212,12 +190,6 @@ 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)
-        if (usage == GPIO_USAGE)
-                gpio_array[gpio_bank(gpio)]->port_fer &= ~gpio_bit(gpio);
-        else
-                gpio_array[gpio_bank(gpio)]->port_fer |= gpio_bit(gpio);
-        SSYNC();
 #endif
 }
 
@@ -255,7 +227,7 @@ static int portmux_group_check(unsigned short per)
         u16 ident = P_IDENT(per);
         u16 function = P_FUNCT2MUX(per);
         s8 offset = port_mux[ident];
-        u16 m, pmux, pfunc;
+        u16 m, pmux, pfunc, mask;
 
         if (offset < 0)
                 return 0;
@@ -270,10 +242,12 @@ static int portmux_group_check(unsigned short per)
                         continue;
 
                 if (offset == 1)
-                        pfunc = (pmux >> offset) & 3;
+                        mask = 3;
                 else
-                        pfunc = (pmux >> offset) & 1;
-                if (pfunc != function) {
+                        mask = 1;
+
+                pfunc = (pmux >> offset) & mask;
+                if (pfunc != (function & mask)) {
                         pr_err("pin group conflict! request pin %d func %d conflict with pin %d func %d\n",
                                 ident, function, m, pfunc);
                         return -EINVAL;
@@ -288,43 +262,21 @@ static void portmux_setup(unsigned short per)
         u16 ident = P_IDENT(per);
         u16 function = P_FUNCT2MUX(per);
         s8 offset = port_mux[ident];
-        u16 pmux;
+        u16 pmux, mask;
 
         if (offset == -1)
                 return;
 
         pmux = bfin_read_PORT_MUX();
-        if (offset != 1)
+        if (offset == 1)