Merge remote branch 'gcl/next' into next

5 files changed, 37 insertions, 14 deletions

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index 154529aacc03..a067046c9da2 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -352,8 +352,12 @@ atmel_spi_dma_map_xfer(struct atmel_spi *as, struct spi_transfer *xfer)
 
         xfer->tx_dma = xfer->rx_dma = INVALID_DMA_ADDRESS;
         if (xfer->tx_buf) {
+                /* tx_buf is a const void* where we need a void * for the dma
+                 * mapping */
+                void *nonconst_tx = (void *)xfer->tx_buf;
+
                 xfer->tx_dma = dma_map_single(dev,
-                                (void *) xfer->tx_buf, xfer->len,
+                                nonconst_tx, xfer->len,
                                 DMA_TO_DEVICE);
                 if (dma_mapping_error(dev, xfer->tx_dma))
                         return -ENOMEM;
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c
index 90439314cf67..0838c79861e4 100644
--- a/drivers/spi/dw_spi.c
+++ b/drivers/spi/dw_spi.c
@@ -413,6 +413,11 @@ static void poll_transfer(struct dw_spi *dws)
 {
         while (dws->write(dws))
                 dws->read(dws);
+        /*
+         * There is a possibility that the last word of a transaction
+         * will be lost if data is not ready. Re-read to solve this issue.
+         */
+        dws->read(dws);
 
         transfer_complete(dws);
 }
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c
index ec9f0b1bf864..84439f655601 100644
--- a/drivers/spi/mpc52xx_spi.c
+++ b/drivers/spi/mpc52xx_spi.c
@@ -563,7 +563,7 @@ static struct of_platform_driver mpc52xx_spi_of_driver = {
                 .of_match_table = mpc52xx_spi_match,
         },
         .probe = mpc52xx_spi_probe,
-        .remove = __exit_p(mpc52xx_spi_remove),
+        .remove = __devexit_p(mpc52xx_spi_remove),
 };
 
 static int __init mpc52xx_spi_init(void)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 709c836607de..b02d0cbce890 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -584,8 +584,7 @@ void spi_unregister_master(struct spi_master *master)
         list_del(&master->list);
         mutex_unlock(&board_lock);
 
-        dummy = device_for_each_child(master->dev.parent, &master->dev,
-                                        __unregister);
+        dummy = device_for_each_child(&master->dev, NULL, __unregister);
         device_unregister(&master->dev);
 }
 EXPORT_SYMBOL_GPL(spi_unregister_master);
diff --git a/drivers/spi/spi_fsl_espi.c b/drivers/spi/spi_fsl_espi.c
index e3b4f6451966..a99e2333b949 100644
--- a/drivers/spi/spi_fsl_espi.c
+++ b/drivers/spi/spi_fsl_espi.c
@@ -258,18 +258,18 @@ static int fsl_espi_bufs(struct spi_device *spi, struct spi_transfer *t)
         return mpc8xxx_spi->count;
 }
 
-static void fsl_espi_addr2cmd(unsigned int addr, u8 *cmd)
+static inline void fsl_espi_addr2cmd(unsigned int addr, u8 *cmd)
 {
-        if (cmd[1] && cmd[2] && cmd[3]) {
+        if (cmd) {
                 cmd[1] = (u8)(addr >> 16);
                 cmd[2] = (u8)(addr >> 8);
                 cmd[3] = (u8)(addr >> 0);
         }
 }
 
-static unsigned int fsl_espi_cmd2addr(u8 *cmd)
+static inline unsigned int fsl_espi_cmd2addr(u8 *cmd)
 {
-        if (cmd[1] && cmd[2] && cmd[3])
+        if (cmd)
                 return cmd[1] << 16 | cmd[2] << 8 | cmd[3] << 0;
 
         return 0;
@@ -395,9 +395,11 @@ static void fsl_espi_rw_trans(struct spi_message *m,
                         }
                 }
 
-                addr = fsl_espi_cmd2addr(local_buf);
-                addr += pos;
-                fsl_espi_addr2cmd(addr, local_buf);
+                if (pos > 0) {
+                        addr = fsl_espi_cmd2addr(local_buf);
+                        addr += pos;
+                        fsl_espi_addr2cmd(addr, local_buf);
+                }
 
                 espi_trans->n_tx = n_tx;
                 espi_trans->n_rx = trans_len;
@@ -507,16 +509,29 @@ void fsl_espi_cpu_irq(struct mpc8xxx_spi *mspi, u32 events)
 
         /* We need handle RX first */
         if (events & SPIE_NE) {
-                u32 rx_data;
+                u32 rx_data, tmp;
+                u8 rx_data_8;
 
                 /* Spin until RX is done */
                 while (SPIE_RXCNT(events) < min(4, mspi->len)) {
                         cpu_relax();
                         events = mpc8xxx_spi_read_reg(&reg_base->event);
                 }
-                mspi->len -= 4;
 
-                rx_data = mpc8xxx_spi_read_reg(&reg_base->receive);
+                if (mspi->len >= 4) {
+                        rx_data = mpc8xxx_spi_read_reg(&reg_base->receive);
+                } else {
+                        tmp = mspi->len;
+                        rx_data = 0;
+                        while (tmp--) {
+                                rx_data_8 = in_8((u8 *)&reg_base->receive);
+                                rx_data |= (rx_data_8 << (tmp * 8));
+                        }
+
+                        rx_data <<= (4 - mspi->len) * 8;
+                }
+
+                mspi->len -= 4;
 
                 if (mspi->rx)
                         mspi->get_rx(rx_data, mspi);