16 files changed, 155 insertions, 196 deletions

diff --git a/Documentation/devicetree/bindings/spi/spi-bus.txt b/Documentation/devicetree/bindings/spi/spi-bus.txt
index 800dafe5b01b..e5a4d1b4acfe 100644
--- a/Documentation/devicetree/bindings/spi/spi-bus.txt
+++ b/Documentation/devicetree/bindings/spi/spi-bus.txt
@@ -67,7 +67,7 @@ only 1(SINGLE), 2(DUAL) and 4(QUAD).
 Dual/Quad mode is not allowed when 3-wire mode is used.
 
 If a gpio chipselect is used for the SPI slave the gpio number will be passed
-via the cs_gpio
+via the SPI master node cs-gpios property.
 
 SPI example for an MPC5200 SPI bus:
         spi@f00 {
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 94964af1428d..710599f54cc5 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -307,6 +307,7 @@ config SPI_OMAP_UWIRE
 
 config SPI_OMAP24XX
         tristate "McSPI driver for OMAP"
+        depends on ARM || ARM64 || AVR32 || HEXAGON || MIPS || SH
         depends on ARCH_OMAP2PLUS || COMPILE_TEST
         help
           SPI master controller for OMAP24XX and later Multichannel SPI
@@ -413,7 +414,8 @@ config SPI_SC18IS602
 
 config SPI_SH_MSIOF
         tristate "SuperH MSIOF SPI controller"
-        depends on (SUPERH || ARCH_SHMOBILE) && HAVE_CLK
+        depends on HAVE_CLK
+        depends on SUPERH || ARCH_SHMOBILE || COMPILE_TEST
         select SPI_BITBANG
         help
           SPI driver for SuperH and SH Mobile MSIOF blocks.
diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index d4603efbd9bf..3f3dc1226edf 100644
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -125,7 +125,7 @@ static int spi_resume(struct pci_dev *pdev)
 #define spi_resume      NULL
 #endif
 
-static DEFINE_PCI_DEVICE_TABLE(pci_ids) = {
+static const struct pci_device_id pci_ids[] = {
         /* Intel MID platform SPI controller 0 */
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
         {},
diff --git a/drivers/spi/spi-fsl-espi.c b/drivers/spi/spi-fsl-espi.c
index 80d8f40f7e05..428dc7a6b62e 100644
--- a/drivers/spi/spi-fsl-espi.c
+++ b/drivers/spi/spi-fsl-espi.c
@@ -705,7 +705,7 @@ static int of_fsl_espi_probe(struct platform_device *ofdev)
                 goto err;
 
         irq = irq_of_parse_and_map(np, 0);
-        if (!ret) {
+        if (!irq) {
                 ret = -EINVAL;
                 goto err;
         }
@@ -727,6 +727,66 @@ static int of_fsl_espi_remove(struct platform_device *dev)
         return mpc8xxx_spi_remove(&dev->dev);
 }
 
+#ifdef CONFIG_PM_SLEEP
+static int of_fsl_espi_suspend(struct device *dev)
+{
+        struct spi_master *master = dev_get_drvdata(dev);
+        struct mpc8xxx_spi *mpc8xxx_spi;
+        struct fsl_espi_reg *reg_base;
+        u32 regval;
+        int ret;
+
+        mpc8xxx_spi = spi_master_get_devdata(master);
+        reg_base = mpc8xxx_spi->reg_base;
+
+        ret = spi_master_suspend(master);
+        if (ret) {
+                dev_warn(dev, "cannot suspend master\n");
+                return ret;
+        }
+
+        regval = mpc8xxx_spi_read_reg(&reg_base->mode);
+        regval &= ~SPMODE_ENABLE;
+        mpc8xxx_spi_write_reg(&reg_base->mode, regval);
+
+        return 0;
+}
+
+static int of_fsl_espi_resume(struct device *dev)
+{
+        struct fsl_spi_platform_data *pdata = dev_get_platdata(dev);
+        struct spi_master *master = dev_get_drvdata(dev);
+        struct mpc8xxx_spi *mpc8xxx_spi;
+        struct fsl_espi_reg *reg_base;
+        u32 regval;
+        int i;
+
+        mpc8xxx_spi = spi_master_get_devdata(master);
+        reg_base = mpc8xxx_spi->reg_base;
+
+        /* SPI controller initializations */
+        mpc8xxx_spi_write_reg(&reg_base->mode, 0);
+        mpc8xxx_spi_write_reg(&reg_base->mask, 0);
+        mpc8xxx_spi_write_reg(&reg_base->command, 0);
+        mpc8xxx_spi_write_reg(&reg_base->event, 0xffffffff);
+
+        /* Init eSPI CS mode register */
+        for (i = 0; i < pdata->max_chipselect; i++)
+                mpc8xxx_spi_write_reg(&reg_base->csmode[i], CSMODE_INIT_VAL);
+
+        /* Enable SPI interface */
+        regval = pdata->initial_spmode | SPMODE_INIT_VAL | SPMODE_ENABLE;
+
+        mpc8xxx_spi_write_reg(&reg_base->mode, regval);
+
+        return spi_master_resume(master);
+}
+#endif /* CONFIG_PM_SLEEP */
+
+static const struct dev_pm_ops espi_pm = {
+        SET_SYSTEM_SLEEP_PM_OPS(of_fsl_espi_suspend, of_fsl_espi_resume)
+};
+
 static const struct of_device_id of_fsl_espi_match[] = {
         { .compatible = "fsl,mpc8536-espi" },
         {}
@@ -738,6 +798,7 @@ static struct platform_driver fsl_espi_driver = {
                 .name = "fsl_espi",
                 .owner = THIS_MODULE,
                 .of_match_table = of_fsl_espi_match,
+                .pm = &espi_pm,
         },
         .probe          = of_fsl_espi_probe,
         .remove         = of_fsl_espi_remove,
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
index 3fb09f981980..7beeb29472ac 100644
--- a/drivers/spi/spi-gpio.c
+++ b/drivers/spi/spi-gpio.c
@@ -115,17 +115,17 @@ spi_to_pdata(const struct spi_device *spi)
 
 static inline void setsck(const struct spi_device *spi, int is_on)
 {
-        gpio_set_value(SPI_SCK_GPIO, is_on);
+        gpio_set_value_cansleep(SPI_SCK_GPIO, is_on);
 }
 
 static inline void setmosi(const struct spi_device *spi, int is_on)
 {
-        gpio_set_value(SPI_MOSI_GPIO, is_on);
+        gpio_set_value_cansleep(SPI_MOSI_GPIO, is_on);
 }
 
 static inline int getmiso(const struct spi_device *spi)
 {
-        return !!gpio_get_value(SPI_MISO_GPIO);
+        return !!gpio_get_value_cansleep(SPI_MISO_GPIO);
 }
 
 #undef pdata
@@ -229,7 +229,7 @@ static void spi_gpio_chipselect(struct spi_device *spi, int is_active)
 
         if (cs != SPI_GPIO_NO_CHIPSELECT) {
                 /* SPI is normally active-low */
-                gpio_set_value(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active);
+                gpio_set_value_cansleep(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active);
         }
 }
 
diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 87676587d783..46d2313f7c6f 100644
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -504,7 +504,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
         master->cleanup = mpc512x_psc_spi_cleanup;
         master->dev.of_node = dev->of_node;
 
-        tempp = ioremap(regaddr, size);
+        tempp = devm_ioremap(dev, regaddr, size);
         if (!tempp) {
                 dev_err(dev, "could not ioremap I/O port range\n");
                 ret = -EFAULT;
@@ -513,9 +513,8 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
         mps->psc = tempp;
         mps->fifo =
                 (struct mpc512x_psc_fifo *)(tempp + sizeof(struct mpc52xx_psc));
-
-        ret = request_irq(mps->irq, mpc512x_psc_spi_isr, IRQF_SHARED,
-                          "mpc512x-psc-spi", mps);
+        ret = devm_request_irq(dev, mps->irq, mpc512x_psc_spi_isr, IRQF_SHARED,
+                                "mpc512x-psc-spi", mps);
         if (ret)
                 goto free_master;
         init_completion(&mps->txisrdone);
@@ -525,11 +524,11 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
         clk = devm_clk_get(dev, clk_name);
         if (IS_ERR(clk)) {
                 ret = PTR_ERR(clk);
-                goto free_irq;
+                goto free_master;
         }
         ret = clk_prepare_enable(clk);
         if (ret)
-                goto free_irq;
+                goto free_master;
         mps->clk_mclk = clk;
         mps->mclk_rate = clk_get_rate(clk);
 
@@ -545,11 +544,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr,
 
 free_clock:
         clk_disable_unprepare(mps->clk_mclk);
-free_irq:
-        free_irq(mps->irq, mps);
 free_master:
-        if (mps->psc)
-                iounmap(mps->psc);
         spi_master_put(master);
 
         return ret;
@@ -561,9 +556,6 @@ static int mpc512x_psc_spi_do_remove(struct device *dev)
         struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);
 
         clk_disable_unprepare(mps->clk_mclk);
-        free_irq(mps->irq, mps);
-        if (mps->psc)
-                iounmap(mps->psc);
 
         return 0;
 }
diff --git a/drivers/spi/spi-nuc900.c b/drivers/spi/spi-nuc900.c
index e0c32bc69ee2..50406306bc20 100644
--- a/drivers/spi/spi-nuc900.c
+++ b/drivers/spi/spi-nuc900.c
@@ -57,7 +57,6 @@ struct nuc900_spi {
         const unsigned char     *tx;
         unsigned char           *rx;
         struct clk              *clk;
-        struct resource         *ioarea;
         struct spi_master       *master;
         struct spi_device       *curdev;
         struct device           *dev;
@@ -344,8 +343,7 @@ static int nuc900_spi_probe(struct platform_device *pdev)
         master = spi_alloc_master(&pdev->dev, sizeof(struct nuc900_spi));
         if (master == NULL) {
                 dev_err(&pdev->dev, "No memory for spi_master\n");
-                err = -ENOMEM;
-                goto err_nomem;
+                return -ENOMEM;
         }
 
         hw = spi_master_get_devdata(master);
@@ -370,46 +368,31 @@ static int nuc900_spi_probe(struct platform_device *pdev)
         hw->bitbang.txrx_bufs      = nuc900_spi_txrx;
 
         hw->res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (hw->res == NULL) {
-                dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n");
-                err = -ENOENT;
-                goto err_pdata;
-        }
-
-        hw->ioarea = request_mem_region(hw->res->start,
-                                        resource_size(hw->res), pdev->name);
-
-        if (hw->ioarea == NULL) {
-                dev_err(&pdev->dev, "Cannot reserve region\n");
-                err = -ENXIO;
+        hw->regs = devm_ioremap_resource(&pdev->dev, hw->res);
+        if (IS_ERR(hw->regs)) {
+                err = PTR_ERR(hw->regs);
                 goto err_pdata;
         }
 
-        hw->regs = ioremap(hw->res->start, resource_size(hw->res));
-        if (hw->regs == NULL) {
-                dev_err(&pdev->dev, "Cannot map IO\n");
-                err = -ENXIO;
-                goto err_iomap;
-        }
-
         hw->irq = platform_get_irq(pdev, 0);
         if (hw->irq < 0) {
                 dev_err(&pdev->dev, "No IRQ specified\n");
                 err = -ENOENT;
-                goto err_irq;
+                goto err_pdata;
         }
 
-        err = request_irq(hw->irq, nuc900_spi_irq, 0, pdev->name, hw);
+        err = devm_request_irq(&pdev->dev, hw->irq, nuc900_spi_irq, 0,
+                                pdev->name, hw);
         if (err) {
                 dev_err(&pdev->dev, "Cannot claim IRQ\n");
-                goto err_irq;
+                goto err_pdata;
         }
 
-        hw->clk = clk_get(&pdev->dev, "spi");
+        hw->clk = devm_clk_get(&pdev->dev, "spi");
         if (IS_ERR(hw->clk)) {
                 dev_err(&pdev->dev, "No clock for device\n");
                 err = PTR_ERR(hw->clk);
-                goto err_clk;
+                goto err_pdata;
         }
 
         mfp_set_groupg(&pdev->dev, NULL);
@@ -425,17 +408,8 @@ static int nuc900_spi_probe(struct platform_device *pdev)
 
 err_register:
         clk_disable(hw->clk);
-        clk_put(hw->clk);
-err_clk:
-        free_irq(hw->irq, hw);
-err_irq:
-        iounmap(hw->regs);
-err_iomap:
-        release_mem_region(hw->res->start, resource_size(hw->res));
-        kfree(hw->ioarea);
 err_pdata:
         spi_master_put(hw->master);
-err_nomem:
         return err;
 }
 
@@ -443,18 +417,8 @@ static int nuc900_spi_remove(struct platform_device *dev)
 {
         struct nuc900_spi *hw = platform_get_drvdata(dev);
 
-        free_irq(hw->irq, hw);
-
         spi_bitbang_stop(&hw->bitbang);
-
         clk_disable(hw->clk);
-        clk_put(hw->clk);
-
-        iounmap(hw->regs);
-
-        release_mem_region(hw->res->start, resource_size(hw->res));
-        kfree(hw->ioarea);
-
         spi_master_put(hw->master);
         return 0;
 }
diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index 91c668596202..f7c896e2981e 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -153,62 +153,22 @@ static int tiny_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t)
                 }
 
                 wait_for_completion(&hw->done);
-        } else if (txp && rxp) {
-                /* we need to tighten the transfer loop */
-                writeb(*txp++, hw->base + TINY_SPI_TXDATA);
-                if (t->len > 1) {
-                        writeb(*txp++, hw->base + TINY_SPI_TXDATA);
-                        for (i = 2; i < t->len; i++) {
-                                u8 rx, tx = *txp++;
-                                tiny_spi_wait_txr(hw);
-                                rx = readb(hw->base + TINY_SPI_TXDATA);
-                                writeb(tx, hw->base + TINY_SPI_TXDATA);
-                                *rxp++ = rx;
-                        }
-                        tiny_spi_wait_txr(hw);
-                        *rxp++ = readb(hw->base + TINY_SPI_TXDATA);
-                }
-                tiny_spi_wait_txe(hw);
-                *rxp++ = readb(hw->base + TINY_SPI_RXDATA);
-        } else if (rxp) {
-                writeb(0, hw->base + TINY_SPI_TXDATA);
-                if (t->len > 1) {
-                        writeb(0,
-                               hw->base + TINY_SPI_TXDATA);
-                        for (i = 2; i < t->len; i++) {
-                                u8 rx;
-                                tiny_spi_wait_txr(hw);
-                                rx = readb(hw->base + TINY_SPI_TXDATA);
-                                writeb(0, hw->base + TINY_SPI_TXDATA);
-                                *rxp++ = rx;
-                        }
-                        tiny_spi_wait_txr(hw);
-                        *rxp++ = readb(hw->base + TINY_SPI_TXDATA);
-                }
-                tiny_spi_wait_txe(hw);
-                *rxp++ = readb(hw->base + TINY_SPI_RXDATA);
-        } else if (txp) {
-                writeb(*txp++, hw->base + TINY_SPI_TXDATA);
-                if (t->len > 1) {
-                        writeb(*txp++, hw->base + TINY_SPI_TXDATA);
-                        for (i = 2; i < t->len; i++) {
-                                u8 tx = *txp++;
-                                tiny_spi_wait_txr(hw);
-                                writeb(tx, hw->base + TINY_SPI_TXDATA);
-                        }
-                }
-                tiny_spi_wait_txe(hw);
         } else {
-                writeb(0, hw->base + TINY_SPI_TXDATA);
-                if (t->len > 1) {
-                        writeb(0, hw->base + TINY_SPI_TXDATA);
-                        for (i = 2; i < t->len; i++) {
+                /* we need to tighten the transfer loop */
+                writeb(txp ? *txp++ : 0, hw->base + TINY_SPI_TXDATA);
+                for (i = 1; i < t->len; i++) {
+                        writeb(txp ? *txp++ : 0, hw->base + TINY_SPI_TXDATA);
+
+                        if (rxp || (i != t->len - 1))
                                 tiny_spi_wait_txr(hw);
-                                writeb(0, hw->base + TINY_SPI_TXDATA);
-                        }
+                        if (rxp)
+                                *rxp++ = readb(hw->base + TINY_SPI_TXDATA);
                 }
                 tiny_spi_wait_txe(hw);
+                if (rxp)
+                        *rxp++ = readb(hw->base + TINY_SPI_RXDATA);
         }
+
         return t->len;
 }
 
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c
index b6ed82beb01d..0d32054bfc0d 100644
--- a/drivers/spi/spi-omap-100k.c
+++ b/drivers/spi/spi-omap-100k.c
@@ -470,31 +470,12 @@ err:
         return status;
 }
 
-static int omap1_spi100k_remove(struct platform_device *pdev)
-{
-        struct spi_master       *master;
-        struct omap1_spi100k    *spi100k;
-        struct resource         *r;
-        int                     status = 0;
-
-        master = platform_get_drvdata(pdev);
-        spi100k = spi_master_get_devdata(master);
-
-        if (status != 0)
-                return status;
-
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-
-        return 0;
-}
-
 static struct platform_driver omap1_spi100k_driver = {
         .driver = {
                 .name           = "omap1_spi100k",
                 .owner          = THIS_MODULE,
         },
         .probe          = omap1_spi100k_probe,
-        .remove         = omap1_spi100k_remove,
 };
 
 module_platform_driver(omap1_spi100k_driver);
@@ -502,4 +483,3 @@ module_platform_driver(omap1_spi100k_driver);
 MODULE_DESCRIPTION("OMAP7xx SPI 100k controller driver");
 MODULE_AUTHOR("Fabrice Crohas <fcrohas@gmail.com>");
 MODULE_LICENSE("GPL");
-
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 443df39840bc..a72127f08e39 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -157,14 +157,14 @@ static inline void mcspi_write_reg(struct spi_master *master,
 {
         struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
 
-        __raw_writel(val, mcspi->base + idx);
+        writel_relaxed(val, mcspi->base + idx);
 }
 
 static inline u32 mcspi_read_reg(struct spi_master *master, int idx)
 {
         struct omap2_mcspi *mcspi = spi_master_get_devdata(master);
 
-        return __raw_readl(mcspi->base + idx);
+        return readl_relaxed(mcspi->base + idx);
 }
 
 static inline void mcspi_write_cs_reg(const struct spi_device *spi,
@@ -172,14 +172,14 @@ static inline void mcspi_write_cs_reg(const struct spi_device *spi,
 {
         struct omap2_mcspi_cs   *cs = spi->controller_state;
 
-        __raw_writel(val, cs->base +  idx);
+        writel_relaxed(val, cs->base +  idx);
 }
 
 static inline u32 mcspi_read_cs_reg(const struct spi_device *spi, int idx)
 {
         struct omap2_mcspi_cs   *cs = spi->controller_state;
 
-        return __raw_readl(cs->base + idx);
+        return readl_relaxed(cs->base + idx);
 }
 
 static inline u32 mcspi_cached_chconf0(const struct spi_device *spi)
@@ -338,7 +338,7 @@ static void omap2_mcspi_restore_ctx(struct omap2_mcspi *mcspi)
         mcspi_write_reg(spi_cntrl, OMAP2_MCSPI_WAKEUPENABLE, ctx->wakeupenable);
 
         list_for_each_entry(cs, &ctx->cs, node)
-                __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
+                writel_relaxed(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
 }
 
 static int mcspi_wait_for_reg_bit(void __iomem *reg, unsigned long bit)
@@ -346,9 +346,9 @@ static int mcspi_wait_for_reg_bit(void __iomem *reg, unsigned long bit)
         unsigned long timeout;
 
         timeout = jiffies + msecs_to_jiffies(1000);
-        while (!(__raw_readl(reg) & bit)) {
+        while (!(readl_relaxed(reg) & bit)) {
                 if (time_after(jiffies, timeout)) {
-                        if (!(__raw_readl(reg) & bit))
+                        if (!(readl_relaxed(reg) & bit))
                                 return -ETIMEDOUT;
                         else
                                 return 0;
@@ -675,7 +675,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 }
                                 dev_vdbg(&spi->dev, "write-%d %02x\n",
                                                 word_len, *tx);
-                                __raw_writel(*tx++, tx_reg);
+                                writel_relaxed(*tx++, tx_reg);
                         }
                         if (rx != NULL) {
                                 if (mcspi_wait_for_reg_bit(chstat_reg,
@@ -687,7 +687,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 if (c == 1 && tx == NULL &&
                                     (l & OMAP2_MCSPI_CHCONF_TURBO)) {
                                         omap2_mcspi_set_enable(spi, 0);
-                                        *rx++ = __raw_readl(rx_reg);
+                                        *rx++ = readl_relaxed(rx_reg);
                                         dev_vdbg(&spi->dev, "read-%d %02x\n",
                                                     word_len, *(rx - 1));
                                         if (mcspi_wait_for_reg_bit(chstat_reg,
@@ -701,7 +701,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                         omap2_mcspi_set_enable(spi, 0);
                                 }
 
-                                *rx++ = __raw_readl(rx_reg);
+                                *rx++ = readl_relaxed(rx_reg);
                                 dev_vdbg(&spi->dev, "read-%d %02x\n",
                                                 word_len, *(rx - 1));
                         }
@@ -722,7 +722,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 }
                                 dev_vdbg(&spi->dev, "write-%d %04x\n",
                                                 word_len, *tx);
-                                __raw_writel(*tx++, tx_reg);
+                                writel_relaxed(*tx++, tx_reg);
                         }
                         if (rx != NULL) {
                                 if (mcspi_wait_for_reg_bit(chstat_reg,
@@ -734,7 +734,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 if (c == 2 && tx == NULL &&
                                     (l & OMAP2_MCSPI_CHCONF_TURBO)) {
                                         omap2_mcspi_set_enable(spi, 0);
-                                        *rx++ = __raw_readl(rx_reg);
+                                        *rx++ = readl_relaxed(rx_reg);
                                         dev_vdbg(&spi->dev, "read-%d %04x\n",
                                                     word_len, *(rx - 1));
                                         if (mcspi_wait_for_reg_bit(chstat_reg,
@@ -748,7 +748,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                         omap2_mcspi_set_enable(spi, 0);
                                 }
 
-                                *rx++ = __raw_readl(rx_reg);
+                                *rx++ = readl_relaxed(rx_reg);
                                 dev_vdbg(&spi->dev, "read-%d %04x\n",
                                                 word_len, *(rx - 1));
                         }
@@ -769,7 +769,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 }
                                 dev_vdbg(&spi->dev, "write-%d %08x\n",
                                                 word_len, *tx);
-                                __raw_writel(*tx++, tx_reg);
+                                writel_relaxed(*tx++, tx_reg);
                         }
                         if (rx != NULL) {
                                 if (mcspi_wait_for_reg_bit(chstat_reg,
@@ -781,7 +781,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                 if (c == 4 && tx == NULL &&
                                     (l & OMAP2_MCSPI_CHCONF_TURBO)) {
                                         omap2_mcspi_set_enable(spi, 0);
-                                        *rx++ = __raw_readl(rx_reg);
+                                        *rx++ = readl_relaxed(rx_reg);
                                         dev_vdbg(&spi->dev, "read-%d %08x\n",
                                                     word_len, *(rx - 1));
                                         if (mcspi_wait_for_reg_bit(chstat_reg,
@@ -795,7 +795,7 @@ omap2_mcspi_txrx_pio(struct spi_device *spi, struct spi_transfer *xfer)
                                         omap2_mcspi_set_enable(spi, 0);
                                 }
 
-                                *rx++ = __raw_readl(rx_reg);
+                                *rx++ = readl_relaxed(rx_reg);
                                 dev_vdbg(&spi->dev, "read-%d %08x\n",
                                                 word_len, *(rx - 1));
                         }
@@ -1107,7 +1107,7 @@ static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m)
 
                         /* RX_ONLY mode needs dummy data in TX reg */
                         if (t->tx_buf == NULL)
-                                __raw_writel(0, cs->base
+                                writel_relaxed(0, cs->base
                                                 + OMAP2_MCSPI_TX0);
 
                         if ((mcspi_dma->dma_rx && mcspi_dma->dma_tx) &&
@@ -1470,9 +1470,9 @@ static int omap2_mcspi_resume(struct device *dev)
                          * change in account.
                          */
                         cs->chconf0 |= OMAP2_MCSPI_CHCONF_FORCE;
-                        __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
+                        writel_relaxed(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
                         cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;
-                        __raw_writel(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
+                        writel_relaxed(cs->chconf0, cs->base + OMAP2_MCSPI_CHCONF0);
                 }
         }
         pm_runtime_mark_last_busy(mcspi->dev);
diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index 744841e095e4..7f2121fe2622 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -434,7 +434,7 @@ static int orion_spi_probe(struct platform_device *pdev)
         spi = spi_master_get_devdata(master);
         spi->master = master;
 
-        spi->clk = clk_get(&pdev->dev, NULL);
+        spi->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(spi->clk)) {
                 status = PTR_ERR(spi->clk);
                 goto out;
@@ -465,7 +465,6 @@ static int orion_spi_probe(struct platform_device *pdev)
 
 out_rel_clk:
         clk_disable_unprepare(spi->clk);
-        clk_put(spi->clk);
 out:
         spi_master_put(master);
         return status;
@@ -481,7 +480,6 @@ static int orion_spi_remove(struct platform_device *pdev)
         spi = spi_master_get_devdata(master);
 
         clk_disable_unprepare(spi->clk);
-        clk_put(spi->clk);
 
         return 0;
 }
diff --git a/drivers/spi/spi-pxa2xx-pci.c b/drivers/spi/spi-pxa2xx-pci.c
index 74bc18775658..3f006d3ed2a8 100644
--- a/drivers/spi/spi-pxa2xx-pci.c
+++ b/drivers/spi/spi-pxa2xx-pci.c
@@ -62,7 +62,7 @@ static void ce4100_spi_remove(struct pci_dev *dev)
         platform_device_unregister(pdev);
 }
 
-static DEFINE_PCI_DEVICE_TABLE(ce4100_spi_devices) = {
+static const struct pci_device_id ce4100_spi_devices[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2e6a) },
         { },
 };
diff --git a/drivers/spi/spi-sh-hspi.c b/drivers/spi/spi-sh-hspi.c
index 40179d201966..82d2f922ffa0 100644
--- a/drivers/spi/spi-sh-hspi.c
+++ b/drivers/spi/spi-sh-hspi.c
@@ -197,7 +197,7 @@ static int hspi_transfer_one_message(struct spi_master *master,
 
                         hspi_write(hspi, SPTBR, tx);
 
-                        /* wait recive */
+                        /* wait receive */
                         ret = hspi_status_check_timeout(hspi, 0x4, 0x4);
                         if (ret < 0)
                                 break;
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index ac8795f2e700..81cc02f5f9b0 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -169,7 +169,7 @@ static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p,
 
 static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
                                       u32 cpol, u32 cpha,
-                                      u32 tx_hi_z, u32 lsb_first)
+                                      u32 tx_hi_z, u32 lsb_first, u32 cs_high)
 {
         u32 tmp;
         int edge;
@@ -182,8 +182,12 @@ static void sh_msiof_spi_set_pin_regs(struct sh_msiof_spi_priv *p,
          *    1    1         11     11    1    1
          */
         sh_msiof_write(p, FCTR, 0);
-        sh_msiof_write(p, TMDR1, 0xe2000005 | (lsb_first << 24));
-        sh_msiof_write(p, RMDR1, 0x22000005 | (lsb_first << 24));
+
+        tmp = 0;
+        tmp |= !cs_high << 25;
+        tmp |= lsb_first << 24;
+        sh_msiof_write(p, TMDR1, 0xe0000005 | tmp);
+        sh_msiof_write(p, RMDR1, 0x20000005 | tmp);
 
         tmp = 0xa0000000;
         tmp |= cpol << 30; /* TSCKIZ */
@@ -417,11 +421,12 @@ static void sh_msiof_spi_chipselect(struct spi_device *spi, int is_on)
                 sh_msiof_spi_set_pin_regs(p, !!(spi->mode & SPI_CPOL),
                                           !!(spi->mode & SPI_CPHA),
                                           !!(spi->mode & SPI_3WIRE),
-                                          !!(spi->mode & SPI_LSB_FIRST));
+                                          !!(spi->mode & SPI_LSB_FIRST),
+                                          !!(spi->mode & SPI_CS_HIGH));
         }
 
         /* use spi->controller data for CS (same strategy as spi_gpio) */
-        gpio_set_value((unsigned)spi->controller_data, value);
+        gpio_set_value((uintptr_t)spi->controller_data, value);
 
         if (is_on == BITBANG_CS_INACTIVE) {
                 if (test_and_clear_bit(0, &p->flags)) {
@@ -635,8 +640,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
         master = spi_alloc_master(&pdev->dev, sizeof(struct sh_msiof_spi_priv));
         if (master == NULL) {
                 dev_err(&pdev->dev, "failed to allocate spi master\n");
-                ret = -ENOMEM;
-                goto err0;
+                return -ENOMEM;
         }
 
         p = spi_master_get_devdata(master);
@@ -655,32 +659,38 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
 
         init_completion(&p->done);
 
-        p->clk = clk_get(&pdev->dev, NULL);
+        p->clk = devm_clk_get(&pdev->dev, NULL);
         if (IS_ERR(p->clk)) {
                 dev_err(&pdev->dev, "cannot get clock\n");
                 ret = PTR_ERR(p->clk);
                 goto err1;
         }
 
-        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         i = platform_get_irq(pdev, 0);
-        if (!r || i < 0) {
-                dev_err(&pdev->dev, "cannot get platform resources\n");
+        if (i < 0) {
+                dev_err(&pdev->dev, "cannot get platform IRQ\n");
                 ret = -ENOENT;
-                goto err2;
+                goto err1;
         }
-        p->mapbase = ioremap_nocache(r->start, resource_size(r));
-        if (!p->mapbase) {
-                dev_err(&pdev->dev, "unable to ioremap\n");
-                ret = -ENXIO;
-                goto err2;
+
+        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        p->mapbase = devm_ioremap_resource(&pdev->dev, r);
+        if (IS_ERR(p->mapbase)) {
+                ret = PTR_ERR(p->mapbase);
+                goto err1;
         }
 
-        ret = request_irq(i, sh_msiof_spi_irq, 0,
-                          dev_name(&pdev->dev), p);
+        ret = devm_request_irq(&pdev->dev, i, sh_msiof_spi_irq, 0,
+                               dev_name(&pdev->dev), p);
         if (ret) {
                 dev_err(&pdev->dev, "unable to request irq\n");
-                goto err3;
+                goto err1;
+        }
+
+        ret = clk_prepare(p->clk);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "unable to prepare clock\n");
+                goto err1;
         }
 
         p->pdev = pdev;
@@ -719,13 +729,9 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
                 return 0;
 
         pm_runtime_disable(&pdev->dev);
- err3:
-        iounmap(p->mapbase);
- err2:
-        clk_put(p->clk);
+        clk_unprepare(p->clk);
  err1:
         spi_master_put(master);
- err0:
         return ret;
 }
 
@@ -737,9 +743,7 @@ static int sh_msiof_spi_remove(struct platform_device *pdev)
         ret = spi_bitbang_stop(&p->bitbang);
         if (!ret) {
                 pm_runtime_disable(&pdev->dev);
-                free_irq(platform_get_irq(pdev, 0), p);
-                iounmap(p->mapbase);
-                clk_put(p->clk);
+                clk_unprepare(p->clk);
                 spi_master_put(p->bitbang.master);
         }
         return ret;
diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index 9322de9e13fb..2e7f38c7a961 100644
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -217,7 +217,7 @@ struct pch_pd_dev_save {
         struct pch_spi_board_data *board_dat;
 };
 
-static DEFINE_PCI_DEVICE_TABLE(pch_spi_pcidev_id) = {
+static const struct pci_device_id pch_spi_pcidev_id[] = {
         { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_GE_SPI),    1, },
         { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7213_SPI), 2, },
         { PCI_VDEVICE(ROHM, PCI_DEVICE_ID_ML7223_SPI), 1, },
diff --git a/include/linux/platform_data/spi-nuc900.h b/include/linux/platform_data/spi-nuc900.h
index 2c4e0c128501..4b3f46832e19 100644
--- a/include/linux/platform_data/spi-nuc900.h
+++ b/include/linux/platform_data/spi-nuc900.h
@@ -1,6 +1,4 @@
 /*
- * arch/arm/mach-w90x900/include/mach/nuc900_spi.h
- *
  * Copyright (c) 2009 Nuvoton technology corporation.
  *
  * Wan ZongShun <mcuos.com@gmail.com>
@@ -11,8 +9,8 @@
  *
  */
 
-#ifndef __ASM_ARCH_SPI_H
-#define __ASM_ARCH_SPI_H
+#ifndef __SPI_NUC900_H
+#define __SPI_NUC900_H
 
 extern void mfp_set_groupg(struct device *dev, const char *subname);
 
@@ -32,4 +30,4 @@ struct nuc900_spi_chip {
         unsigned char bits_per_word;
 };
 
-#endif /* __ASM_ARCH_SPI_H */
+#endif /* __SPI_NUC900_H */