Blackfin SPI Driver: add timeout while waiting for SPIF in dma irq handler
[safe/jmp/linux-2.6] / drivers / spi / spi_bfin5xx.c
index c99a2af..e706de1 100644 (file)
@@ -1,37 +1,11 @@
 /*
- * File:       drivers/spi/bfin5xx_spi.c
- * Maintainer:
- *             Bryan Wu <bryan.wu@analog.com>
- * Original Author:
- *             Luke Yang (Analog Devices Inc.)
- *
- * Created:    March. 10th 2006
- * Description:        SPI controller driver for Blackfin BF5xx
- * Bugs:       Enter bugs at http://blackfin.uclinux.org/
- *
- * Modified:
- *     March 10, 2006  bfin5xx_spi.c Created. (Luke Yang)
- *      August 7, 2006  added full duplex mode (Axel Weiss & Luke Yang)
- *      July  17, 2007  add support for BF54x SPI0 controller (Bryan Wu)
- *      July  30, 2007  add platfrom_resource interface to support multi-port
- *                      SPI controller (Bryan Wu)
+ * Blackfin On-Chip SPI Driver
  *
  * Copyright 2004-2007 Analog Devices Inc.
  *
- * This program is free software ;  you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation ;  either version 2, or (at your option)
- * any later version.
+ * Enter bugs at http://blackfin.uclinux.org/
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY ;  without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program ;  see the file COPYING.
- * If not, write to the Free Software Foundation,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Licensed under the GPL-2 or later.
  */
 
 #include <linux/init.h>
 #include <asm/dma.h>
 #include <asm/portmux.h>
 #include <asm/bfin5xx_spi.h>
+#include <asm/cacheflush.h>
 
 #define DRV_NAME       "bfin-spi"
 #define DRV_AUTHOR     "Bryan Wu, Luke Yang"
-#define DRV_DESC       "Blackfin BF5xx on-chip SPI Contoller Driver"
+#define DRV_DESC       "Blackfin BF5xx on-chip SPI Controller Driver"
 #define DRV_VERSION    "1.0"
 
 MODULE_AUTHOR(DRV_AUTHOR);
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_LICENSE("GPL");
 
-#define IS_DMA_ALIGNED(x) (((u32)(x)&0x07)==0)
-
-static u32 spi_dma_ch;
-static u32 spi_regs_base;
+#define IS_DMA_ALIGNED(x) (((u32)(x)&0x07) == 0)
 
-#define DEFINE_SPI_REG(reg, off) \
-static inline u16 read_##reg(void) \
-       { return bfin_read16(spi_regs_base + off); } \
-static inline void write_##reg(u16 v) \
-       {bfin_write16(spi_regs_base + off, v); }
-
-DEFINE_SPI_REG(CTRL, 0x00)
-DEFINE_SPI_REG(FLAG, 0x04)
-DEFINE_SPI_REG(STAT, 0x08)
-DEFINE_SPI_REG(TDBR, 0x0C)
-DEFINE_SPI_REG(RDBR, 0x10)
-DEFINE_SPI_REG(BAUD, 0x14)
-DEFINE_SPI_REG(SHAW, 0x18)
-#define START_STATE ((void*)0)
-#define RUNNING_STATE ((void*)1)
-#define DONE_STATE ((void*)2)
-#define ERROR_STATE ((void*)-1)
-#define QUEUE_RUNNING 0
-#define QUEUE_STOPPED 1
-int dma_requested;
+#define START_STATE    ((void *)0)
+#define RUNNING_STATE  ((void *)1)
+#define DONE_STATE     ((void *)2)
+#define ERROR_STATE    ((void *)-1)
+#define QUEUE_RUNNING  0
+#define QUEUE_STOPPED  1
 
 struct driver_data {
        /* Driver model hookup */
@@ -94,6 +52,12 @@ struct driver_data {
        /* SPI framework hookup */
        struct spi_master *master;
 
+       /* Regs base of SPI controller */
+       void __iomem *regs_base;
+
+       /* Pin request list */
+       u16 *pin_req;
+
        /* BFIN hookup */
        struct bfin5xx_spi_master *master_info;
 
@@ -118,9 +82,14 @@ struct driver_data {
        void *tx_end;
        void *rx;
        void *rx_end;
+
+       /* DMA stuffs */
+       int dma_channel;
        int dma_mapped;
+       int dma_requested;
        dma_addr_t rx_dma;
        dma_addr_t tx_dma;
+
        size_t rx_map_len;
        size_t tx_map_len;
        u8 n_bytes;
@@ -141,26 +110,40 @@ struct chip_data {
        u8 enable_dma;
        u8 bits_per_word;       /* 8 or 16 */
        u8 cs_change_per_word;
-       u8 cs_chg_udelay;
+       u16 cs_chg_udelay;      /* Some devices require > 255usec delay */
        void (*write) (struct driver_data *);
        void (*read) (struct driver_data *);
        void (*duplex) (struct driver_data *);
 };
 
+#define DEFINE_SPI_REG(reg, off) \
+static inline u16 read_##reg(struct driver_data *drv_data) \
+       { return bfin_read16(drv_data->regs_base + off); } \
+static inline void write_##reg(struct driver_data *drv_data, u16 v) \
+       { bfin_write16(drv_data->regs_base + off, v); }
+
+DEFINE_SPI_REG(CTRL, 0x00)
+DEFINE_SPI_REG(FLAG, 0x04)
+DEFINE_SPI_REG(STAT, 0x08)
+DEFINE_SPI_REG(TDBR, 0x0C)
+DEFINE_SPI_REG(RDBR, 0x10)
+DEFINE_SPI_REG(BAUD, 0x14)
+DEFINE_SPI_REG(SHAW, 0x18)
+
 static void bfin_spi_enable(struct driver_data *drv_data)
 {
        u16 cr;
 
-       cr = read_CTRL();
-       write_CTRL(cr | BIT_CTL_ENABLE);
+       cr = read_CTRL(drv_data);
+       write_CTRL(drv_data, (cr | BIT_CTL_ENABLE));
 }
 
 static void bfin_spi_disable(struct driver_data *drv_data)
 {
        u16 cr;
 
-       cr = read_CTRL();
-       write_CTRL(cr & (~BIT_CTL_ENABLE));
+       cr = read_CTRL(drv_data);
+       write_CTRL(drv_data, (cr & (~BIT_CTL_ENABLE)));
 }
 
 /* Caculate the SPI_BAUD register value based on input HZ */
@@ -172,6 +155,9 @@ static u16 hz_to_spi_baud(u32 speed_hz)
        if ((sclk % (2 * speed_hz)) > 0)
                spi_baud++;
 
+       if (spi_baud < MIN_SPI_BAUD_VAL)
+               spi_baud = MIN_SPI_BAUD_VAL;
+
        return spi_baud;
 }
 
@@ -180,69 +166,61 @@ static int flush(struct driver_data *drv_data)
        unsigned long limit = loops_per_jiffy << 1;
 
        /* wait for stop and clear stat */
-       while (!(read_STAT() & BIT_STAT_SPIF) && limit--)
-               continue;
+       while (!(read_STAT(drv_data) & BIT_STAT_SPIF) && limit--)
+               cpu_relax();
 
-       write_STAT(BIT_STAT_CLR);
+       write_STAT(drv_data, BIT_STAT_CLR);
 
        return limit;
 }
 
 /* Chip select operation functions for cs_change flag */
-static void cs_active(struct chip_data *chip)
+static void cs_active(struct driver_data *drv_data, struct chip_data *chip)
 {
-       u16 flag = read_FLAG();
+       u16 flag = read_FLAG(drv_data);
 
        flag |= chip->flag;
        flag &= ~(chip->flag << 8);
 
-       write_FLAG(flag);
+       write_FLAG(drv_data, flag);
 }
 
-static void cs_deactive(struct chip_data *chip)
+static void cs_deactive(struct driver_data *drv_data, struct chip_data *chip)
 {
-       u16 flag = read_FLAG();
+       u16 flag = read_FLAG(drv_data);
 
        flag |= (chip->flag << 8);
 
-       write_FLAG(flag);
-}
+       write_FLAG(drv_data, flag);
 
-#define MAX_SPI_SSEL   7
+       /* Move delay here for consistency */
+       if (chip->cs_chg_udelay)
+               udelay(chip->cs_chg_udelay);
+}
 
 /* stop controller and re-config current chip*/
-static int restore_state(struct driver_data *drv_data)
+static void restore_state(struct driver_data *drv_data)
 {
        struct chip_data *chip = drv_data->cur_chip;
-       int ret = 0;
 
        /* Clear status and disable clock */
-       write_STAT(BIT_STAT_CLR);
+       write_STAT(drv_data, BIT_STAT_CLR);
        bfin_spi_disable(drv_data);
        dev_dbg(&drv_data->pdev->dev, "restoring spi ctl state\n");
 
        /* Load the registers */
-       cs_deactive(chip);
-       write_BAUD(chip->baud);
-       chip->ctl_reg &= (~BIT_CTL_TIMOD);
-       chip->ctl_reg |= (chip->width << 8);
-       write_CTRL(chip->ctl_reg);
+       write_CTRL(drv_data, chip->ctl_reg);
+       write_BAUD(drv_data, chip->baud);
 
        bfin_spi_enable(drv_data);
-
-       if (ret)
-               dev_dbg(&drv_data->pdev->dev,
-                       ": request chip select number %d failed\n",
-                       chip->chip_select_num);
-
-       return ret;
+       cs_active(drv_data, chip);
 }
 
 /* used to kick off transfer in rx mode */
-static unsigned short dummy_read(void)
+static unsigned short dummy_read(struct driver_data *drv_data)
 {
        unsigned short tmp;
-       tmp = read_RDBR();
+       tmp = read_RDBR(drv_data);
        return tmp;
 }
 
@@ -251,9 +229,9 @@ static void null_writer(struct driver_data *drv_data)
        u8 n_bytes = drv_data->n_bytes;
 
        while (drv_data->tx < drv_data->tx_end) {
-               write_TDBR(0);
-               while ((read_STAT() & BIT_STAT_TXS))
-                       continue;
+               write_TDBR(drv_data, 0);
+               while ((read_STAT(drv_data) & BIT_STAT_TXS))
+                       cpu_relax();
                drv_data->tx += n_bytes;
        }
 }
@@ -261,12 +239,12 @@ static void null_writer(struct driver_data *drv_data)
 static void null_reader(struct driver_data *drv_data)
 {
        u8 n_bytes = drv_data->n_bytes;
-       dummy_read();
+       dummy_read(drv_data);
 
        while (drv_data->rx < drv_data->rx_end) {
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               dummy_read();
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               dummy_read(drv_data);
                drv_data->rx += n_bytes;
        }
 }
@@ -274,18 +252,18 @@ static void null_reader(struct driver_data *drv_data)
 static void u8_writer(struct driver_data *drv_data)
 {
        dev_dbg(&drv_data->pdev->dev,
-               "cr8-s is 0x%x\n", read_STAT());
+               "cr8-s is 0x%x\n", read_STAT(drv_data));
 
        while (drv_data->tx < drv_data->tx_end) {
-               write_TDBR(*(u8 *) (drv_data->tx));
-               while (read_STAT() & BIT_STAT_TXS)
-                       continue;
+               write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
+               while (read_STAT(drv_data) & BIT_STAT_TXS)
+                       cpu_relax();
                ++drv_data->tx;
        }
 
-       /* poll for SPI completion before returning */
-       while (!(read_STAT() & BIT_STAT_SPIF))
-               continue;
+       /* poll for SPI completion before return */
+       while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+               cpu_relax();
 }
 
 static void u8_cs_chg_writer(struct driver_data *drv_data)
@@ -293,43 +271,44 @@ static void u8_cs_chg_writer(struct driver_data *drv_data)
        struct chip_data *chip = drv_data->cur_chip;
 
        while (drv_data->tx < drv_data->tx_end) {
-               cs_active(chip);
+               cs_active(drv_data, chip);
+
+               write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
+               while (read_STAT(drv_data) & BIT_STAT_TXS)
+                       cpu_relax();
+               while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                       cpu_relax();
 
-               write_TDBR(*(u8 *) (drv_data->tx));
-               while (read_STAT() & BIT_STAT_TXS)
-                       continue;
-               cs_deactive(chip);
+               cs_deactive(drv_data, chip);
 
-               if (chip->cs_chg_udelay)
-                       udelay(chip->cs_chg_udelay);
                ++drv_data->tx;
        }
-
-       /* poll for SPI completion before returning */
-       while (!(read_STAT() & BIT_STAT_SPIF))
-               continue;
 }
 
 static void u8_reader(struct driver_data *drv_data)
 {
        dev_dbg(&drv_data->pdev->dev,
-               "cr-8 is 0x%x\n", read_STAT());
+               "cr-8 is 0x%x\n", read_STAT(drv_data));
+
+       /* poll for SPI completion before start */
+       while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+               cpu_relax();
 
        /* clear TDBR buffer before read(else it will be shifted out) */
-       write_TDBR(0xFFFF);
+       write_TDBR(drv_data, 0xFFFF);
 
-       dummy_read();
+       dummy_read(drv_data);
 
        while (drv_data->rx < drv_data->rx_end - 1) {
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               *(u8 *) (drv_data->rx) = read_RDBR();
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               *(u8 *) (drv_data->rx) = read_RDBR(drv_data);
                ++drv_data->rx;
        }
 
-       while (!(read_STAT() & BIT_STAT_RXS))
-               continue;
-       *(u8 *) (drv_data->rx) = read_SHAW();
+       while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+               cpu_relax();
+       *(u8 *) (drv_data->rx) = read_SHAW(drv_data);
        ++drv_data->rx;
 }
 
@@ -337,49 +316,35 @@ static void u8_cs_chg_reader(struct driver_data *drv_data)
 {
        struct chip_data *chip = drv_data->cur_chip;
 
-       /* clear TDBR buffer before read(else it will be shifted out) */
-       write_TDBR(0xFFFF);
-
-       cs_active(chip);
-       dummy_read();
+       while (drv_data->rx < drv_data->rx_end) {
+               cs_active(drv_data, chip);
+               read_RDBR(drv_data);    /* kick off */
 
-       while (drv_data->rx < drv_data->rx_end - 1) {
-               cs_deactive(chip);
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                       cpu_relax();
 
-               if (chip->cs_chg_udelay)
-                       udelay(chip->cs_chg_udelay);
+               *(u8 *) (drv_data->rx) = read_SHAW(drv_data);
+               cs_deactive(drv_data, chip);
 
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               cs_active(chip);
-               *(u8 *) (drv_data->rx) = read_RDBR();
                ++drv_data->rx;
        }
-       cs_deactive(chip);
-
-       while (!(read_STAT() & BIT_STAT_RXS))
-               continue;
-       *(u8 *) (drv_data->rx) = read_SHAW();
-       ++drv_data->rx;
 }
 
 static void u8_duplex(struct driver_data *drv_data)
 {
        /* in duplex mode, clk is triggered by writing of TDBR */
        while (drv_data->rx < drv_data->rx_end) {
-               write_TDBR(*(u8 *) (drv_data->tx));
-               while (read_STAT() & BIT_STAT_TXS)
-                       continue;
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               *(u8 *) (drv_data->rx) = read_RDBR();
+               write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
+               while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                       cpu_relax();
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               *(u8 *) (drv_data->rx) = read_RDBR(drv_data);
                ++drv_data->rx;
                ++drv_data->tx;
        }
-
-       /* poll for SPI completion before returning */
-       while (!(read_STAT() & BIT_STAT_SPIF))
-               continue;
 }
 
 static void u8_cs_chg_duplex(struct driver_data *drv_data)
@@ -387,42 +352,38 @@ static void u8_cs_chg_duplex(struct driver_data *drv_data)
        struct chip_data *chip = drv_data->cur_chip;
 
        while (drv_data->rx < drv_data->rx_end) {
-               cs_active(chip);
-
-               write_TDBR(*(u8 *) (drv_data->tx));
-               while (read_STAT() & BIT_STAT_TXS)
-                       continue;
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               *(u8 *) (drv_data->rx) = read_RDBR();
-               cs_deactive(chip);
-
-               if (chip->cs_chg_udelay)
-                       udelay(chip->cs_chg_udelay);
+               cs_active(drv_data, chip);
+
+               write_TDBR(drv_data, (*(u8 *) (drv_data->tx)));
+
+               while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                       cpu_relax();
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               *(u8 *) (drv_data->rx) = read_RDBR(drv_data);
+
+               cs_deactive(drv_data, chip);
+
                ++drv_data->rx;
                ++drv_data->tx;
        }
-
-       /* poll for SPI completion before returning */
-       while (!(read_STAT() & BIT_STAT_SPIF))
-               continue;
 }
 
 static void u16_writer(struct driver_data *drv_data)
 {
        dev_dbg(&drv_data->pdev->dev,
-               "cr16 is 0x%x\n", read_STAT());
+               "cr16 is 0x%x\n", read_STAT(drv_data));
 
        while (drv_data->tx < drv_data->tx_end) {
-               write_TDBR(*(u16 *) (drv_data->tx));
-               while ((read_STAT() & BIT_STAT_TXS))
-                       continue;
+               write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
+               while ((read_STAT(drv_data) & BIT_STAT_TXS))
+                       cpu_relax();
                drv_data->tx += 2;
        }
 
-       /* poll for SPI completion before returning */
-       while (!(read_STAT() & BIT_STAT_SPIF))
-               continue;
+       /* poll for SPI completion before return */
+       while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+               cpu_relax();
 }
 
 static void u16_cs_chg_writer(struct driver_data *drv_data)
@@ -430,43 +391,44 @@ static void u16_cs_chg_writer(struct driver_data *drv_data)
        struct chip_data *chip = drv_data->cur_chip;
 
        while (drv_data->tx < drv_data->tx_end) {
-               cs_active(chip);
+               cs_active(drv_data, chip);
+
+               write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
+               while ((read_STAT(drv_data) & BIT_STAT_TXS))
+                       cpu_relax();
+               while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                       cpu_relax();
 
-               write_TDBR(*(u16 *) (drv_data->tx));
-               while ((read_STAT() & BIT_STAT_TXS))
-                       continue;
-               cs_deactive(chip);
+               cs_deactive(drv_data, chip);
 
-               if (chip->cs_chg_udelay)
-                       udelay(chip->cs_chg_udelay);
                drv_data->tx += 2;
        }
-
-       /* poll for SPI completion before returning */
-       while (!(read_STAT() & BIT_STAT_SPIF))
-               continue;
 }
 
 static void u16_reader(struct driver_data *drv_data)
 {
        dev_dbg(&drv_data->pdev->dev,
-               "cr-16 is 0x%x\n", read_STAT());
+               "cr-16 is 0x%x\n", read_STAT(drv_data));
+
+       /* poll for SPI completion before start */
+       while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+               cpu_relax();
 
        /* clear TDBR buffer before read(else it will be shifted out) */
-       write_TDBR(0xFFFF);
+       write_TDBR(drv_data, 0xFFFF);
 
-       dummy_read();
+       dummy_read(drv_data);
 
        while (drv_data->rx < (drv_data->rx_end - 2)) {
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               *(u16 *) (drv_data->rx) = read_RDBR();
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               *(u16 *) (drv_data->rx) = read_RDBR(drv_data);
                drv_data->rx += 2;
        }
 
-       while (!(read_STAT() & BIT_STAT_RXS))
-               continue;
-       *(u16 *) (drv_data->rx) = read_SHAW();
+       while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+               cpu_relax();
+       *(u16 *) (drv_data->rx) = read_SHAW(drv_data);
        drv_data->rx += 2;
 }
 
@@ -474,29 +436,30 @@ static void u16_cs_chg_reader(struct driver_data *drv_data)
 {
        struct chip_data *chip = drv_data->cur_chip;
 
-       /* clear TDBR buffer before read(else it will be shifted out) */
-       write_TDBR(0xFFFF);
+       /* poll for SPI completion before start */
+       while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+               cpu_relax();
 
-       cs_active(chip);
-       dummy_read();
+       /* clear TDBR buffer before read(else it will be shifted out) */
+       write_TDBR(drv_data, 0xFFFF);
 
-       while (drv_data->rx < drv_data->rx_end) {
-               cs_deactive(chip);
+       cs_active(drv_data, chip);
+       dummy_read(drv_data);
 
-               if (chip->cs_chg_udelay)
-                       udelay(chip->cs_chg_udelay);
+       while (drv_data->rx < drv_data->rx_end - 2) {
+               cs_deactive(drv_data, chip);
 
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               cs_active(chip);
-               *(u16 *) (drv_data->rx) = read_RDBR();
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               cs_active(drv_data, chip);
+               *(u16 *) (drv_data->rx) = read_RDBR(drv_data);
                drv_data->rx += 2;
        }
-       cs_deactive(chip);
+       cs_deactive(drv_data, chip);
 
-       while (!(read_STAT() & BIT_STAT_RXS))
-               continue;
-       *(u16 *) (drv_data->rx) = read_SHAW();
+       while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+               cpu_relax();
+       *(u16 *) (drv_data->rx) = read_SHAW(drv_data);
        drv_data->rx += 2;
 }
 
@@ -504,19 +467,15 @@ static void u16_duplex(struct driver_data *drv_data)
 {
        /* in duplex mode, clk is triggered by writing of TDBR */
        while (drv_data->tx < drv_data->tx_end) {
-               write_TDBR(*(u16 *) (drv_data->tx));
-               while (read_STAT() & BIT_STAT_TXS)
-                       continue;
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               *(u16 *) (drv_data->rx) = read_RDBR();
+               write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
+               while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                       cpu_relax();
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               *(u16 *) (drv_data->rx) = read_RDBR(drv_data);
                drv_data->rx += 2;
                drv_data->tx += 2;
        }
-
-       /* poll for SPI completion before returning */
-       while (!(read_STAT() & BIT_STAT_SPIF))
-               continue;
 }
 
 static void u16_cs_chg_duplex(struct driver_data *drv_data)
@@ -524,25 +483,20 @@ static void u16_cs_chg_duplex(struct driver_data *drv_data)
        struct chip_data *chip = drv_data->cur_chip;
 
        while (drv_data->tx < drv_data->tx_end) {
-               cs_active(chip);
-
-               write_TDBR(*(u16 *) (drv_data->tx));
-               while (read_STAT() & BIT_STAT_TXS)
-                       continue;
-               while (!(read_STAT() & BIT_STAT_RXS))
-                       continue;
-               *(u16 *) (drv_data->rx) = read_RDBR();
-               cs_deactive(chip);
-
-               if (chip->cs_chg_udelay)
-                       udelay(chip->cs_chg_udelay);
+               cs_active(drv_data, chip);
+
+               write_TDBR(drv_data, (*(u16 *) (drv_data->tx)));
+               while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                       cpu_relax();
+               while (!(read_STAT(drv_data) & BIT_STAT_RXS))
+                       cpu_relax();
+               *(u16 *) (drv_data->rx) = read_RDBR(drv_data);
+
+               cs_deactive(drv_data, chip);
+
                drv_data->rx += 2;
                drv_data->tx += 2;
        }
-
-       /* poll for SPI completion before returning */
-       while (!(read_STAT() & BIT_STAT_SPIF))
-               continue;
 }
 
 /* test if ther is more transfer to be done */
@@ -587,12 +541,12 @@ static void giveback(struct driver_data *drv_data)
 
        /* disable chip select signal. And not stop spi in autobuffer mode */
        if (drv_data->tx_dma != 0xFFFF) {
-               cs_deactive(chip);
+               cs_deactive(drv_data, chip);
                bfin_spi_disable(drv_data);
        }
 
        if (!drv_data->cs_change)
-               cs_deactive(chip);
+               cs_deactive(drv_data, chip);
 
        if (msg->complete)
                msg->complete(msg->context);
@@ -600,16 +554,22 @@ static void giveback(struct driver_data *drv_data)
 
 static irqreturn_t dma_irq_handler(int irq, void *dev_id)
 {
-       struct driver_data *drv_data = (struct driver_data *)dev_id;
-       struct spi_message *msg = drv_data->cur_msg;
+       struct driver_data *drv_data = dev_id;
        struct chip_data *chip = drv_data->cur_chip;
+       struct spi_message *msg = drv_data->cur_msg;
+       unsigned long timeout;
+       unsigned short dmastat = get_dma_curr_irqstat(drv_data->dma_channel);
+       u16 spistat = read_STAT(drv_data);
+
+       dev_dbg(&drv_data->pdev->dev,
+               "in dma_irq_handler dmastat:0x%x spistat:0x%x\n",
+               dmastat, spistat);
 
-       dev_dbg(&drv_data->pdev->dev, "in dma_irq_handler\n");
-       clear_dma_irqstat(spi_dma_ch);
+       clear_dma_irqstat(drv_data->dma_channel);
 
        /* Wait for DMA to complete */
-       while (get_dma_curr_irqstat(spi_dma_ch) & DMA_RUN)
-               continue;
+       while (get_dma_curr_irqstat(drv_data->dma_channel) & DMA_RUN)
+               cpu_relax();
 
        /*
         * wait for the last transaction shifted out.  HRM states:
@@ -618,21 +578,35 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
         * register until it goes low for 2 successive reads
         */
        if (drv_data->tx != NULL) {
-               while ((read_STAT() & TXS) ||
-                      (read_STAT() & TXS))
-                       continue;
+               while ((read_STAT(drv_data) & TXS) ||
+                      (read_STAT(drv_data) & TXS))
+                       cpu_relax();
        }
 
-       while (!(read_STAT() & SPIF))
-               continue;
-
-       msg->actual_length += drv_data->len_in_bytes;
+       dev_dbg(&drv_data->pdev->dev,
+               "in dma_irq_handler dmastat:0x%x spistat:0x%x\n",
+               dmastat, read_STAT(drv_data));
+
+       timeout = jiffies + HZ;
+       while (!(read_STAT(drv_data) & SPIF))
+               if (!time_before(jiffies, timeout)) {
+                       dev_warn(&drv_data->pdev->dev, "timeout waiting for SPIF");
+                       break;
+               } else
+                       cpu_relax();
+
+       if ((dmastat & DMA_ERR) && (spistat & RBSY)) {
+               msg->state = ERROR_STATE;
+               dev_err(&drv_data->pdev->dev, "dma receive: fifo/buffer overflow\n");
+       } else {
+               msg->actual_length += drv_data->len_in_bytes;
 
-       if (drv_data->cs_change)
-               cs_deactive(chip);
+               if (drv_data->cs_change)
+                       cs_deactive(drv_data, chip);
 
-       /* Move to next transfer */
-       msg->state = next_transfer(drv_data);
+               /* Move to next transfer */
+               msg->state = next_transfer(drv_data);
+       }
 
        /* Schedule transfer tasklet */
        tasklet_schedule(&drv_data->pump_transfers);
@@ -640,8 +614,8 @@ static irqreturn_t dma_irq_handler(int irq, void *dev_id)
        /* free the irq handler before next transfer */
        dev_dbg(&drv_data->pdev->dev,
                "disable dma channel irq%d\n",
-               spi_dma_ch);
-       dma_disable_irq(spi_dma_ch);
+               drv_data->dma_channel);
+       dma_disable_irq(drv_data->dma_channel);
 
        return IRQ_HANDLED;
 }
@@ -656,17 +630,20 @@ static void pump_transfers(unsigned long data)
        u8 width;
        u16 cr, dma_width, dma_config;
        u32 tranf_success = 1;
+       u8 full_duplex = 0;
 
        /* Get current state information */
        message = drv_data->cur_msg;
        transfer = drv_data->cur_transfer;
        chip = drv_data->cur_chip;
+
        /*
         * if msg is error or done, report it back using complete() callback
         */
 
         /* Handle for abort */
        if (message->state == ERROR_STATE) {
+               dev_dbg(&drv_data->pdev->dev, "transfer: we've hit an error\n");
                message->status = -EIO;
                giveback(drv_data);
                return;
@@ -674,6 +651,7 @@ static void pump_transfers(unsigned long data)
 
        /* Handle end of message */
        if (message->state == DONE_STATE) {
+               dev_dbg(&drv_data->pdev->dev, "transfer: all done!\n");
                message->status = 0;
                giveback(drv_data);
                return;
@@ -681,6 +659,7 @@ static void pump_transfers(unsigned long data)
 
        /* Delay if requested at end of transfer */
        if (message->state == RUNNING_STATE) {
+               dev_dbg(&drv_data->pdev->dev, "transfer: still running ...\n");
                previous = list_entry(transfer->transfer_list.prev,
                                      struct spi_transfer, transfer_list);
                if (previous->delay_usecs)
@@ -705,6 +684,7 @@ static void pump_transfers(unsigned long data)
        }
 
        if (transfer->rx_buf != NULL) {
+               full_duplex = transfer->tx_buf != NULL;
                drv_data->rx = transfer->rx_buf;
                drv_data->rx_end = drv_data->rx + transfer->len;
                dev_dbg(&drv_data->pdev->dev, "rx_buf is %p, rx_end is %p\n",
@@ -718,115 +698,180 @@ static void pump_transfers(unsigned long data)
        drv_data->len_in_bytes = transfer->len;
        drv_data->cs_change = transfer->cs_change;
 
-       width = chip->width;
+       /* Bits per word setup */
+       switch (transfer->bits_per_word) {
+       case 8:
+               drv_data->n_bytes = 1;
+               width = CFG_SPI_WORDSIZE8;
+               drv_data->read = chip->cs_change_per_word ?
+                       u8_cs_chg_reader : u8_reader;
+               drv_data->write = chip->cs_change_per_word ?
+                       u8_cs_chg_writer : u8_writer;
+               drv_data->duplex = chip->cs_change_per_word ?
+                       u8_cs_chg_duplex : u8_duplex;
+               break;
+
+       case 16:
+               drv_data->n_bytes = 2;
+               width = CFG_SPI_WORDSIZE16;
+               drv_data->read = chip->cs_change_per_word ?
+                       u16_cs_chg_reader : u16_reader;
+               drv_data->write = chip->cs_change_per_word ?
+                       u16_cs_chg_writer : u16_writer;
+               drv_data->duplex = chip->cs_change_per_word ?
+                       u16_cs_chg_duplex : u16_duplex;
+               break;
+
+       default:
+               /* No change, the same as default setting */
+               drv_data->n_bytes = chip->n_bytes;
+               width = chip->width;
+               drv_data->write = drv_data->tx ? chip->write : null_writer;
+               drv_data->read = drv_data->rx ? chip->read : null_reader;
+               drv_data->duplex = chip->duplex ? chip->duplex : null_writer;
+               break;
+       }
+       cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
+       cr |= (width << 8);
+       write_CTRL(drv_data, cr);
+
        if (width == CFG_SPI_WORDSIZE16) {
                drv_data->len = (transfer->len) >> 1;
        } else {
                drv_data->len = transfer->len;
        }
-       drv_data->write = drv_data->tx ? chip->write : null_writer;
-       drv_data->read = drv_data->rx ? chip->read : null_reader;
-       drv_data->duplex = chip->duplex ? chip->duplex : null_writer;
-       dev_dbg(&drv_data->pdev->dev, "transfer: ",
-               "drv_data->write is %p, chip->write is %p, null_wr is %p\n",
+       dev_dbg(&drv_data->pdev->dev,
+               "transfer: drv_data->write is %p, chip->write is %p, null_wr is %p\n",
                drv_data->write, chip->write, null_writer);
 
        /* speed and width has been set on per message */
        message->state = RUNNING_STATE;
        dma_config = 0;
 
-       write_STAT(BIT_STAT_CLR);
-       cr = (read_CTRL() & (~BIT_CTL_TIMOD));
-       cs_active(chip);
+       /* Speed setup (surely valid because already checked) */
+       if (transfer->speed_hz)
+               write_BAUD(drv_data, hz_to_spi_baud(transfer->speed_hz));
+       else
+               write_BAUD(drv_data, chip->baud);
+
+       write_STAT(drv_data, BIT_STAT_CLR);
+       cr = (read_CTRL(drv_data) & (~BIT_CTL_TIMOD));
+       cs_active(drv_data, chip);
 
        dev_dbg(&drv_data->pdev->dev,
                "now pumping a transfer: width is %d, len is %d\n",
                width, transfer->len);
 
        /*
-        * Try to map dma buffer and do a dma transfer if
-        * successful use different way to r/w according to
-        * drv_data->cur_chip->enable_dma
+        * Try to map dma buffer and do a dma transfer.  If successful use,
+        * different way to r/w according to the enable_dma settings and if
+        * we are not doing a full duplex transfer (since the hardware does
+        * not support full duplex DMA transfers).
         */
-       if (drv_data->cur_chip->enable_dma && drv_data->len > 6) {
+       if (!full_duplex && drv_data->cur_chip->enable_dma
+                               && drv_data->len > 6) {
+
+               unsigned long dma_start_addr, flags;
 
-               disable_dma(spi_dma_ch);
-               clear_dma_irqstat(spi_dma_ch);
+               disable_dma(drv_data->dma_channel);
+               clear_dma_irqstat(drv_data->dma_channel);
 
                /* config dma channel */
                dev_dbg(&drv_data->pdev->dev, "doing dma transfer\n");
+               set_dma_x_count(drv_data->dma_channel, drv_data->len);
                if (width == CFG_SPI_WORDSIZE16) {
-                       set_dma_x_count(spi_dma_ch, drv_data->len);
-                       set_dma_x_modify(spi_dma_ch, 2);
+                       set_dma_x_modify(drv_data->dma_channel, 2);
                        dma_width = WDSIZE_16;
                } else {
-                       set_dma_x_count(spi_dma_ch, drv_data->len);
-                       set_dma_x_modify(spi_dma_ch, 1);
+                       set_dma_x_modify(drv_data->dma_channel, 1);
                        dma_width = WDSIZE_8;
                }
 
+               /* poll for SPI completion before start */
+               while (!(read_STAT(drv_data) & BIT_STAT_SPIF))
+                       cpu_relax();
+
                /* dirty hack for autobuffer DMA mode */
                if (drv_data->tx_dma == 0xFFFF) {
                        dev_dbg(&drv_data->pdev->dev,
                                "doing autobuffer DMA out.\n");
 
-                       /* set SPI transfer mode */
-                       write_CTRL(cr | CFG_SPI_DMAWRITE);
-
                        /* no irq in autobuffer mode */
                        dma_config =
                            (DMAFLOW_AUTO | RESTART | dma_width | DI_EN);
-                       set_dma_config(spi_dma_ch, dma_config);
-                       set_dma_start_addr(spi_dma_ch,
+                       set_dma_config(drv_data->dma_channel, dma_config);
+                       set_dma_start_addr(drv_data->dma_channel,
                                        (unsigned long)drv_data->tx);
-                       enable_dma(spi_dma_ch);
+                       enable_dma(drv_data->dma_channel);
 
-                       /* just return here, there can only be one transfer in this mode */
+                       /* start SPI transfer */
+                       write_CTRL(drv_data, cr | BIT_CTL_TIMOD_DMA_TX);
+
+                       /* just return here, there can only be one transfer
+                        * in this mode
+                        */
                        message->status = 0;
                        giveback(drv_data);
                        return;
                }
 
                /* In dma mode, rx or tx must be NULL in one transfer */
+               dma_config = (RESTART | dma_width | DI_EN);
                if (drv_data->rx != NULL) {
                        /* set transfer mode, and enable SPI */
-                       dev_dbg(&drv_data->pdev->dev, "doing DMA in.\n");
+                       dev_dbg(&drv_data->pdev->dev, "doing DMA in to %p (size %zx)\n",
+                               drv_data->rx, drv_data->len_in_bytes);
 
-                       /* set SPI transfer mode */
-                       write_CTRL(cr | CFG_SPI_DMAREAD);
+                       /* invalidate caches, if needed */
+                       if (bfin_addr_dcachable((unsigned long) drv_data->rx))
+                               invalidate_dcache_range((unsigned long) drv_data->rx,
+                                                       (unsigned long) (drv_data->rx +
+                                                       drv_data->len_in_bytes));
 
                        /* clear tx reg soformer data is not shifted out */
-                       write_TDBR(0xFFFF);
+                       write_TDBR(drv_data, 0xFFFF);
 
-                       set_dma_x_count(spi_dma_ch, drv_data->len);
-
-                       /* start dma */
-                       dma_enable_irq(spi_dma_ch);
-                       dma_config = (WNR | RESTART | dma_width | DI_EN);
-                       set_dma_config(spi_dma_ch, dma_config);
-                       set_dma_start_addr(spi_dma_ch,
-                                       (unsigned long)drv_data->rx);
-                       enable_dma(spi_dma_ch);
+                       dma_config |= WNR;
+                       dma_start_addr = (unsigned long)drv_data->rx;
+                       cr |= BIT_CTL_TIMOD_DMA_RX | BIT_CTL_SENDOPT;
 
                } else if (drv_data->tx != NULL) {
                        dev_dbg(&drv_data->pdev->dev, "doing DMA out.\n");
 
-                       /* set SPI transfer mode */
-                       write_CTRL(cr | CFG_SPI_DMAWRITE);
+                       /* flush caches, if needed */
+                       if (bfin_addr_dcachable((unsigned long) drv_data->tx))
+                               flush_dcache_range((unsigned long) drv_data->tx,
+                                               (unsigned long) (drv_data->tx +
+                                               drv_data->len_in_bytes));
+
+                       dma_start_addr = (unsigned long)drv_data->tx;
+                       cr |= BIT_CTL_TIMOD_DMA_TX;
+
+               } else
+                       BUG();
+
+               /* oh man, here there be monsters ... and i dont mean the
+                * fluffy cute ones from pixar, i mean the kind that'll eat
+                * your data, kick your dog, and love it all.  do *not* try
+                * and change these lines unless you (1) heavily test DMA
+                * with SPI flashes on a loaded system (e.g. ping floods),
+                * (2) know just how broken the DMA engine interaction with
+                * the SPI peripheral is, and (3) have someone else to blame
+                * when you screw it all up anyways.
+                */
+               set_dma_start_addr(drv_data->dma_channel, dma_start_addr);
+               set_dma_config(drv_data->dma_channel, dma_config);
+               local_irq_save(flags);
+               enable_dma(drv_data->dma_channel);
+               write_CTRL(drv_data, cr);
+               dma_enable_irq(drv_data->dma_channel);
+               local_irq_restore(flags);
 
-                       /* start dma */
-                       dma_enable_irq(spi_dma_ch);
-                       dma_config = (RESTART | dma_width | DI_EN);
-                       set_dma_config(spi_dma_ch, dma_config);
-                       set_dma_start_addr(spi_dma_ch,
-                                       (unsigned long)drv_data->tx);
-                       enable_dma(spi_dma_ch);
-               }
        } else {
                /* IO mode write then read */
                dev_dbg(&drv_data->pdev->dev, "doing IO transfer\n");
 
-               if (drv_data->tx != NULL && drv_data->rx != NULL) {
+               if (full_duplex) {
                        /* full duplex mode */
                        BUG_ON((drv_data->tx_end - drv_data->tx) !=
                               (drv_data->rx_end - drv_data->rx));
@@ -834,7 +879,7 @@ static void pump_transfers(unsigned long data)
                                "IO duplex: cr is 0x%x\n", cr);
 
                        /* set SPI transfer mode */
-                       write_CTRL(cr | CFG_SPI_WRITE);
+                       write_CTRL(drv_data, (cr | CFG_SPI_WRITE));
 
                        drv_data->duplex(drv_data);
 
@@ -846,7 +891,7 @@ static void pump_transfers(unsigned long data)
                                "IO write: cr is 0x%x\n", cr);
 
                        /* set SPI transfer mode */
-                       write_CTRL(cr | CFG_SPI_WRITE);
+                       write_CTRL(drv_data, (cr | CFG_SPI_WRITE));
 
                        drv_data->write(drv_data);
 
@@ -858,7 +903,7 @@ static void pump_transfers(unsigned long data)
                                "IO read: cr is 0x%x\n", cr);
 
                        /* set SPI transfer mode */
-                       write_CTRL(cr | CFG_SPI_READ);
+                       write_CTRL(drv_data, (cr | CFG_SPI_READ));
 
                        drv_data->read(drv_data);
                        if (drv_data->rx != drv_data->rx_end)
@@ -871,7 +916,7 @@ static void pump_transfers(unsigned long data)
                        message->state = ERROR_STATE;
                } else {
                        /* Update total byte transfered */
-                       message->actual_length += drv_data->len;
+                       message->actual_length += drv_data->len_in_bytes;
 
                        /* Move to next transfer of this msg */
                        message->state = next_transfer(drv_data);
@@ -912,10 +957,7 @@ static void pump_messages(struct work_struct *work)
 
        /* Setup the SSP using the per chip configuration */
        drv_data->cur_chip = spi_get_ctldata(drv_data->cur_msg->spi);
-       if (restore_state(drv_data)) {
-               spin_unlock_irqrestore(&drv_data->lock, flags);
-               return;
-       };
+       restore_state(drv_data);
 
        list_del_init(&drv_data->cur_msg->queue);
 
@@ -973,7 +1015,7 @@ static int transfer(struct spi_device *spi, struct spi_message *msg)
 
 #define MAX_SPI_SSEL   7
 
-static u16 ssel[3][MAX_SPI_SSEL] = {
+static u16 ssel[][MAX_SPI_SSEL] = {
        {P_SPI0_SSEL1, P_SPI0_SSEL2, P_SPI0_SSEL3,
        P_SPI0_SSEL4, P_SPI0_SSEL5,
        P_SPI0_SSEL6, P_SPI0_SSEL7},
@@ -1055,20 +1097,20 @@ static int setup(struct spi_device *spi)
         * if any one SPI chip is registered and wants DMA, request the
         * DMA channel for it
         */
-       if (chip->enable_dma && !dma_requested) {
+       if (chip->enable_dma && !drv_data->dma_requested) {
                /* register dma irq handler */
-               if (request_dma(spi_dma_ch, "BF53x_SPI_DMA") < 0) {
+               if (request_dma(drv_data->dma_channel, "BFIN_SPI_DMA") < 0) {
                        dev_dbg(&spi->dev,
                                "Unable to request BlackFin SPI DMA channel\n");
                        return -ENODEV;
                }
-               if (set_dma_callback(spi_dma_ch, (void *)dma_irq_handler,
-                       drv_data) < 0) {
+               if (set_dma_callback(drv_data->dma_channel,
+                   dma_irq_handler, drv_data) < 0) {
                        dev_dbg(&spi->dev, "Unable to set dma callback\n");
                        return -EPERM;
                }
-               dma_disable_irq(spi_dma_ch);
-               dma_requested = 1;
+               dma_disable_irq(drv_data->dma_channel);
+               drv_data->dma_requested = 1;
        }
 
        /*
@@ -1121,7 +1163,9 @@ static int setup(struct spi_device *spi)
        if ((chip->chip_select_num > 0)
                && (chip->chip_select_num <= spi->master->num_chipselect))
                peripheral_request(ssel[spi->master->bus_num]
-                       [chip->chip_select_num-1], DRV_NAME);
+                       [chip->chip_select_num-1], spi->modalias);
+
+       cs_deactive(drv_data, chip);
 
        return 0;
 }
@@ -1156,8 +1200,8 @@ static inline int init_queue(struct driver_data *drv_data)
 
        /* init messages workqueue */
        INIT_WORK(&drv_data->pump_messages, pump_messages);
-       drv_data->workqueue =
-           create_singlethread_workqueue(drv_data->master->dev.parent->bus_id);
+       drv_data->workqueue = create_singlethread_workqueue(
+                               dev_name(drv_data->master->dev.parent));
        if (drv_data->workqueue == NULL)
                return -EBUSY;
 
@@ -1228,25 +1272,6 @@ static inline int destroy_queue(struct driver_data *drv_data)
        return 0;
 }
 
-static int setup_pin_mux(int action, int bus_num)
-{
-
-       u16 pin_req[3][4] = {
-               {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
-               {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},
-               {P_SPI2_SCK, P_SPI2_MISO, P_SPI2_MOSI, 0},
-       };
-
-       if (action) {
-               if (peripheral_request_list(pin_req[bus_num], DRV_NAME))
-                       return -EFAULT;
-       } else {
-               peripheral_free_list(pin_req[bus_num]);
-       }
-
-       return 0;
-}
-
 static int __init bfin5xx_spi_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -1269,6 +1294,7 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
        drv_data->master = master;
        drv_data->master_info = platform_info;
        drv_data->pdev = pdev;
+       drv_data->pin_req = platform_info->pin_req;
 
        master->bus_num = pdev->id;
        master->num_chipselect = platform_info->num_chipselect;
@@ -1284,15 +1310,15 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
                goto out_error_get_res;
        }
 
-       spi_regs_base = (u32) ioremap(res->start, (res->end - res->start)+1);
-       if (!spi_regs_base) {
+       drv_data->regs_base = ioremap(res->start, (res->end - res->start + 1));
+       if (drv_data->regs_base == NULL) {
                dev_err(dev, "Cannot map IO\n");
                status = -ENXIO;
                goto out_error_ioremap;
        }
 
-       spi_dma_ch = platform_get_irq(pdev, 0);
-       if (spi_dma_ch < 0) {
+       drv_data->dma_channel = platform_get_irq(pdev, 0);
+       if (drv_data->dma_channel < 0) {
                dev_err(dev, "No DMA channel specified\n");
                status = -ENOENT;
                goto out_error_no_dma_ch;
@@ -1311,6 +1337,12 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
                goto out_error_queue_alloc;
        }
 
+       status = peripheral_request_list(drv_data->pin_req, DRV_NAME);
+       if (status != 0) {
+               dev_err(&pdev->dev, ": Requesting Peripherals failed\n");
+               goto out_error_queue_alloc;
+       }
+
        /* Register with the SPI framework */
        platform_set_drvdata(pdev, drv_data);
        status = spi_register_master(master);
@@ -1319,22 +1351,17 @@ static int __init bfin5xx_spi_probe(struct platform_device *pdev)
                goto out_error_queue_alloc;
        }
 
-       if (setup_pin_mux(1, master->bus_num)) {
-               dev_err(&pdev->dev, ": Requesting Peripherals failed\n");
-               goto out_error;
-       }
-
-       dev_info(dev, "%s, Version %s, regs_base @ 0x%08x\n",
-               DRV_DESC, DRV_VERSION, spi_regs_base);
+       dev_info(dev, "%s, Version %s, regs_base@%p, dma channel@%d\n",
+               DRV_DESC, DRV_VERSION, drv_data->regs_base,
+               drv_data->dma_channel);
        return status;
 
 out_error_queue_alloc:
        destroy_queue(drv_data);
 out_error_no_dma_ch:
-       iounmap((void *) spi_regs_base);
+       iounmap((void *) drv_data->regs_base);
 out_error_ioremap:
 out_error_get_res:
-out_error:
        spi_master_put(master);
 
        return status;
@@ -1359,14 +1386,14 @@ static int __devexit bfin5xx_spi_remove(struct platform_device *pdev)
 
        /* Release DMA */
        if (drv_data->master_info->enable_dma) {
-               if (dma_channel_active(spi_dma_ch))
-                       free_dma(spi_dma_ch);
+               if (dma_channel_active(drv_data->dma_channel))
+                       free_dma(drv_data->dma_channel);
        }
 
        /* Disconnect from the SPI framework */
        spi_unregister_master(drv_data->master);
 
-       setup_pin_mux(0, drv_data->master->bus_num);
+       peripheral_free_list(drv_data->pin_req);
 
        /* Prevent double remove */
        platform_set_drvdata(pdev, NULL);
@@ -1412,7 +1439,7 @@ static int bfin5xx_spi_resume(struct platform_device *pdev)
 #define bfin5xx_spi_resume NULL
 #endif                         /* CONFIG_PM */
 
-MODULE_ALIAS("bfin-spi-master");       /* for platform bus hotplug */
+MODULE_ALIAS("platform:bfin-spi");
 static struct platform_driver bfin5xx_spi_driver = {
        .driver = {
                .name   = DRV_NAME,