Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework

Conflicts:
	arch/sh/kernel/cpu/sh2/setup-sh7619.c
	arch/sh/kernel/cpu/sh2a/setup-mxg.c
	arch/sh/kernel/cpu/sh2a/setup-sh7201.c
	arch/sh/kernel/cpu/sh2a/setup-sh7203.c
	arch/sh/kernel/cpu/sh2a/setup-sh7206.c
	arch/sh/kernel/cpu/sh3/setup-sh7705.c
	arch/sh/kernel/cpu/sh3/setup-sh770x.c
	arch/sh/kernel/cpu/sh3/setup-sh7710.c
	arch/sh/kernel/cpu/sh3/setup-sh7720.c
	arch/sh/kernel/cpu/sh4/setup-sh4-202.c
	arch/sh/kernel/cpu/sh4/setup-sh7750.c
	arch/sh/kernel/cpu/sh4/setup-sh7760.c
	arch/sh/kernel/cpu/sh4a/setup-sh7343.c
	arch/sh/kernel/cpu/sh4a/setup-sh7366.c
	arch/sh/kernel/cpu/sh4a/setup-sh7722.c
	arch/sh/kernel/cpu/sh4a/setup-sh7723.c
	arch/sh/kernel/cpu/sh4a/setup-sh7724.c
	arch/sh/kernel/cpu/sh4a/setup-sh7763.c
	arch/sh/kernel/cpu/sh4a/setup-sh7770.c
	arch/sh/kernel/cpu/sh4a/setup-sh7780.c
	arch/sh/kernel/cpu/sh4a/setup-sh7785.c
	arch/sh/kernel/cpu/sh4a/setup-sh7786.c
	arch/sh/kernel/cpu/sh4a/setup-shx3.c
	arch/sh/kernel/cpu/sh5/setup-sh5.c
	drivers/serial/sh-sci.c
	drivers/serial/sh-sci.h
	include/linux/serial_sci.h

1 files changed, 22 insertions, 5 deletions

diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c
index f5b3fdbb1e27..a067046c9da2 100644
--- a/drivers/spi/atmel_spi.c
+++ b/drivers/spi/atmel_spi.c
@@ -18,6 +18,7 @@
 #include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/spi/spi.h>
+#include <linux/slab.h>
 
 #include <asm/io.h>
 #include <mach/board.h>
@@ -189,14 +190,14 @@ static void atmel_spi_next_xfer_data(struct spi_master *master,
 
         /* use scratch buffer only when rx or tx data is unspecified */
         if (xfer->rx_buf)
-                *rx_dma = xfer->rx_dma + xfer->len - len;
+                *rx_dma = xfer->rx_dma + xfer->len - *plen;
         else {
                 *rx_dma = as->buffer_dma;
                 if (len > BUFFER_SIZE)
                         len = BUFFER_SIZE;
         }
         if (xfer->tx_buf)
-                *tx_dma = xfer->tx_dma + xfer->len - len;
+                *tx_dma = xfer->tx_dma + xfer->len - *plen;
         else {
                 *tx_dma = as->buffer_dma;
                 if (len > BUFFER_SIZE)
@@ -351,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;
@@ -653,6 +658,8 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
         struct spi_transfer     *xfer;
         unsigned long           flags;
         struct device           *controller = spi->master->dev.parent;
+        u8                      bits;
+        struct atmel_spi_device *asd;
 
         as = spi_master_get_devdata(spi->master);
 
@@ -671,8 +678,18 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
                         return -EINVAL;
                 }
 
+                if (xfer->bits_per_word) {
+                        asd = spi->controller_state;
+                        bits = (asd->csr >> 4) & 0xf;
+                        if (bits != xfer->bits_per_word - 8) {
+                                dev_dbg(&spi->dev, "you can't yet change "
+                                         "bits_per_word in transfers\n");
+                                return -ENOPROTOOPT;
+                        }
+                }
+
                 /* FIXME implement these protocol options!! */
-                if (xfer->bits_per_word || xfer->speed_hz) {
+                if (xfer->speed_hz) {
                         dev_dbg(&spi->dev, "no protocol options yet\n");
                         return -ENOPROTOOPT;
                 }
@@ -788,7 +805,7 @@ static int __init atmel_spi_probe(struct platform_device *pdev)
         spin_lock_init(&as->lock);
         INIT_LIST_HEAD(&as->queue);
         as->pdev = pdev;
-        as->regs = ioremap(regs->start, (regs->end - regs->start) + 1);
+        as->regs = ioremap(regs->start, resource_size(regs));
         if (!as->regs)
                 goto out_free_buffer;
         as->irq = irq;