15 files changed, 166 insertions, 44 deletions

diff --git a/drivers/spi/spi-altera.c b/drivers/spi/spi-altera.c
index 5e7314ac51e9..a537f8dffc09 100644
--- a/drivers/spi/spi-altera.c
+++ b/drivers/spi/spi-altera.c
@@ -134,7 +134,7 @@ static int altera_spi_txrx(struct spi_device *spi, struct spi_transfer *t)
         hw->tx = t->tx_buf;
         hw->rx = t->rx_buf;
         hw->count = 0;
-        hw->bytes_per_word = (t->bits_per_word ? : spi->bits_per_word) / 8;
+        hw->bytes_per_word = t->bits_per_word / 8;
         hw->len = t->len / hw->bytes_per_word;
 
         if (hw->irq >= 0) {
diff --git a/drivers/spi/spi-bfin-sport.c b/drivers/spi/spi-bfin-sport.c
index ac7ffca7ba47..39b0d1711b4e 100644
--- a/drivers/spi/spi-bfin-sport.c
+++ b/drivers/spi/spi-bfin-sport.c
@@ -416,8 +416,7 @@ bfin_sport_spi_pump_transfers(unsigned long data)
         drv_data->cs_change = transfer->cs_change;
 
         /* Bits per word setup */
-        bits_per_word = transfer->bits_per_word ? :
-                message->spi->bits_per_word ? : 8;
+        bits_per_word = transfer->bits_per_word;
         if (bits_per_word % 16 == 0)
                 drv_data->ops = &bfin_sport_transfer_ops_u16;
         else
diff --git a/drivers/spi/spi-bfin5xx.c b/drivers/spi/spi-bfin5xx.c
index 0429d833f75b..7d7c9918fffe 100644
--- a/drivers/spi/spi-bfin5xx.c
+++ b/drivers/spi/spi-bfin5xx.c
@@ -642,8 +642,7 @@ static void bfin_spi_pump_transfers(unsigned long data)
         drv_data->cs_change = transfer->cs_change;
 
         /* Bits per word setup */
-        bits_per_word = transfer->bits_per_word ? :
-                message->spi->bits_per_word ? : 8;
+        bits_per_word = transfer->bits_per_word;
         if (bits_per_word % 16 == 0) {
                 drv_data->n_bytes = bits_per_word/8;
                 drv_data->len = (transfer->len) >> 1;
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index 328c4dcd3d52..a63d7da3bfe2 100644
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -69,7 +69,7 @@ static unsigned bitbang_txrx_8(
         unsigned                ns,
         struct spi_transfer     *t
 ) {
-        unsigned                bits = t->bits_per_word ? : spi->bits_per_word;
+        unsigned                bits = t->bits_per_word;
         unsigned                count = t->len;
         const u8                *tx = t->tx_buf;
         u8                      *rx = t->rx_buf;
@@ -95,7 +95,7 @@ static unsigned bitbang_txrx_16(
         unsigned                ns,
         struct spi_transfer     *t
 ) {
-        unsigned                bits = t->bits_per_word ? : spi->bits_per_word;
+        unsigned                bits = t->bits_per_word;
         unsigned                count = t->len;
         const u16               *tx = t->tx_buf;
         u16                     *rx = t->rx_buf;
@@ -121,7 +121,7 @@ static unsigned bitbang_txrx_32(
         unsigned                ns,
         struct spi_transfer     *t
 ) {
-        unsigned                bits = t->bits_per_word ? : spi->bits_per_word;
+        unsigned                bits = t->bits_per_word;
         unsigned                count = t->len;
         const u32               *tx = t->tx_buf;
         u32                     *rx = t->rx_buf;
diff --git a/drivers/spi/spi-clps711x.c b/drivers/spi/spi-clps711x.c
index 1366c4620d5d..a11cbf02691a 100644
--- a/drivers/spi/spi-clps711x.c
+++ b/drivers/spi/spi-clps711x.c
@@ -68,7 +68,7 @@ static int spi_clps711x_setup_xfer(struct spi_device *spi,
                                    struct spi_transfer *xfer)
 {
         u32 speed = xfer->speed_hz ? : spi->max_speed_hz;
-        u8 bpw = xfer->bits_per_word ? : spi->bits_per_word;
+        u8 bpw = xfer->bits_per_word;
         struct spi_clps711x_data *hw = spi_master_get_devdata(spi->master);
 
         if (bpw != 8) {
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c
index 58466b810da4..7b5cc9e4e94d 100644
--- a/drivers/spi/spi-coldfire-qspi.c
+++ b/drivers/spi/spi-coldfire-qspi.c
@@ -329,8 +329,7 @@ static int mcfqspi_transfer_one_message(struct spi_master *master,
                 mcfqspi_cs_select(mcfqspi, spi->chip_select, cs_high);
 
                 mcfqspi_wr_qir(mcfqspi, MCFQSPI_QIR_SPIFE);
-                if ((t->bits_per_word ? t->bits_per_word :
-                                        spi->bits_per_word) == 8)
+                if (t->bits_per_word == 8)
                         mcfqspi_transfer_msg8(mcfqspi, t->len, t->tx_buf,
                                         t->rx_buf);
                 else
diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 13661e129d96..50bd2cdc52de 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -28,6 +28,8 @@
 #include <linux/dmaengine.h>
 #include <linux/dma-mapping.h>
 #include <linux/edma.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
 #include <linux/slab.h>
@@ -135,7 +137,7 @@ struct davinci_spi {
         int                     dma_rx_chnum;
         int                     dma_tx_chnum;
 
-        struct davinci_spi_platform_data *pdata;
+        struct davinci_spi_platform_data pdata;
 
         void                    (*get_rx)(u32 rx_data, struct davinci_spi *);
         u32                     (*get_tx)(struct davinci_spi *);
@@ -213,7 +215,7 @@ static void davinci_spi_chipselect(struct spi_device *spi, int value)
         bool gpio_chipsel = false;
 
         dspi = spi_master_get_devdata(spi->master);
-        pdata = dspi->pdata;
+        pdata = &dspi->pdata;
 
         if (pdata->chip_sel && chip_sel < pdata->num_chipselect &&
                                 pdata->chip_sel[chip_sel] != SPI_INTERN_CS)
@@ -392,7 +394,7 @@ static int davinci_spi_setup(struct spi_device *spi)
         struct davinci_spi_platform_data *pdata;
 
         dspi = spi_master_get_devdata(spi->master);
-        pdata = dspi->pdata;
+        pdata = &dspi->pdata;
 
         /* if bits per word length is zero then set it default 8 */
         if (!spi->bits_per_word)
@@ -534,7 +536,7 @@ static int davinci_spi_bufs(struct spi_device *spi, struct spi_transfer *t)
         struct scatterlist sg_rx, sg_tx;
 
         dspi = spi_master_get_devdata(spi->master);
-        pdata = dspi->pdata;
+        pdata = &dspi->pdata;
         spicfg = (struct davinci_spi_config *)spi->controller_data;
         if (!spicfg)
                 spicfg = &davinci_spi_default_cfg;
@@ -758,6 +760,70 @@ rx_dma_failed:
         return r;
 }
 
+#if defined(CONFIG_OF)
+static const struct of_device_id davinci_spi_of_match[] = {
+        {
+                .compatible = "ti,dm644x-spi",
+        },
+        {
+                .compatible = "ti,da8xx-spi",
+                .data = (void *)SPI_VERSION_2,
+        },
+        { },
+};
+MODULE_DEVICE_TABLE(of, davini_spi_of_match);
+
+/**
+ * spi_davinci_get_pdata - Get platform data from DTS binding
+ * @pdev: ptr to platform data
+ * @dspi: ptr to driver data
+ *
+ * Parses and populates pdata in dspi from device tree bindings.
+ *
+ * NOTE: Not all platform data params are supported currently.
+ */
+static int spi_davinci_get_pdata(struct platform_device *pdev,
+                        struct davinci_spi *dspi)
+{
+        struct device_node *node = pdev->dev.of_node;
+        struct davinci_spi_platform_data *pdata;
+        unsigned int num_cs, intr_line = 0;
+        const struct of_device_id *match;
+
+        pdata = &dspi->pdata;
+
+        pdata->version = SPI_VERSION_1;
+        match = of_match_device(of_match_ptr(davinci_spi_of_match),
+                                &pdev->dev);
+        if (!match)
+                return -ENODEV;
+
+        /* match data has the SPI version number for SPI_VERSION_2 */
+        if (match->data == (void *)SPI_VERSION_2)
+                pdata->version = SPI_VERSION_2;
+
+        /*
+         * default num_cs is 1 and all chipsel are internal to the chip
+         * indicated by chip_sel being NULL. GPIO based CS is not
+         * supported yet in DT bindings.
+         */
+        num_cs = 1;
+        of_property_read_u32(node, "num-cs", &num_cs);
+        pdata->num_chipselect = num_cs;
+        of_property_read_u32(node, "ti,davinci-spi-intr-line", &intr_line);
+        pdata->intr_line = intr_line;
+        return 0;
+}
+#else
+#define davinci_spi_of_match NULL
+static struct davinci_spi_platform_data
+        *spi_davinci_get_pdata(struct platform_device *pdev,
+                struct davinci_spi *dspi)
+{
+        return -ENODEV;
+}
+#endif
+
 /**
  * davinci_spi_probe - probe function for SPI Master Controller
  * @pdev: platform_device structure which contains plateform specific data
@@ -780,12 +846,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
         int i = 0, ret = 0;
         u32 spipc0;
 
-        pdata = pdev->dev.platform_data;
-        if (pdata == NULL) {
-                ret = -ENODEV;
-                goto err;
-        }
-
         master = spi_alloc_master(&pdev->dev, sizeof(struct davinci_spi));
         if (master == NULL) {
                 ret = -ENOMEM;
@@ -800,6 +860,19 @@ static int davinci_spi_probe(struct platform_device *pdev)
                 goto free_master;
         }
 
+        if (pdev->dev.platform_data) {
+                pdata = pdev->dev.platform_data;
+                dspi->pdata = *pdata;
+        } else {
+                /* update dspi pdata with that from the DT */
+                ret = spi_davinci_get_pdata(pdev, dspi);
+                if (ret < 0)
+                        goto free_master;
+        }
+
+        /* pdata in dspi is now updated and point pdata to that */
+        pdata = &dspi->pdata;
+
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (r == NULL) {
                 ret = -ENOENT;
@@ -807,7 +880,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
         }
 
         dspi->pbase = r->start;
-        dspi->pdata = pdata;
 
         mem = request_mem_region(r->start, resource_size(r), pdev->name);
         if (mem == NULL) {
@@ -843,8 +915,9 @@ static int davinci_spi_probe(struct platform_device *pdev)
                 ret = -ENODEV;
                 goto put_master;
         }
-        clk_enable(dspi->clk);
+        clk_prepare_enable(dspi->clk);
 
+        master->dev.of_node = pdev->dev.of_node;
         master->bus_num = pdev->id;
         master->num_chipselect = pdata->num_chipselect;
         master->setup = davinci_spi_setup;
@@ -927,7 +1000,7 @@ free_dma:
         dma_release_channel(dspi->dma_rx);
         dma_release_channel(dspi->dma_tx);
 free_clk:
-        clk_disable(dspi->clk);
+        clk_disable_unprepare(dspi->clk);
         clk_put(dspi->clk);
 put_master:
         spi_master_put(master);
@@ -963,7 +1036,7 @@ static int davinci_spi_remove(struct platform_device *pdev)
 
         spi_bitbang_stop(&dspi->bitbang);
 
-        clk_disable(dspi->clk);
+        clk_disable_unprepare(dspi->clk);
         clk_put(dspi->clk);
         spi_master_put(master);
         free_irq(dspi->irq, dspi);
@@ -978,6 +1051,7 @@ static struct platform_driver davinci_spi_driver = {
         .driver = {
                 .name = "spi_davinci",
                 .owner = THIS_MODULE,
+                .of_match_table = davinci_spi_of_match,
         },
         .probe = davinci_spi_probe,
         .remove = davinci_spi_remove,
diff --git a/drivers/spi/spi-ep93xx.c b/drivers/spi/spi-ep93xx.c
index acb1e1935c5a..aecbff16ad60 100644
--- a/drivers/spi/spi-ep93xx.c
+++ b/drivers/spi/spi-ep93xx.c
@@ -446,7 +446,7 @@ static inline int bits_per_word(const struct ep93xx_spi *espi)
         struct spi_message *msg = espi->current_msg;
         struct spi_transfer *t = msg->state;
 
-        return t->bits_per_word ? t->bits_per_word : msg->spi->bits_per_word;
+        return t->bits_per_word;
 }
 
 static void ep93xx_do_write(struct ep93xx_spi *espi, struct spi_transfer *t)
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c
index 12789fcfa980..69945b014c96 100644
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@ -298,10 +298,10 @@ static void omap2_mcspi_rx_callback(void *data)
         struct omap2_mcspi *mcspi = spi_master_get_devdata(spi->master);
         struct omap2_mcspi_dma *mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
-        complete(&mcspi_dma->dma_rx_completion);
-
         /* We must disable the DMA RX request */
         omap2_mcspi_set_dma_req(spi, 1, 0);
+
+        complete(&mcspi_dma->dma_rx_completion);
 }
 
 static void omap2_mcspi_tx_callback(void *data)
@@ -310,10 +310,10 @@ static void omap2_mcspi_tx_callback(void *data)
         struct omap2_mcspi *mcspi = spi_master_get_devdata(spi->master);
         struct omap2_mcspi_dma *mcspi_dma = &mcspi->dma_channels[spi->chip_select];
 
-        complete(&mcspi_dma->dma_tx_completion);
-
         /* We must disable the DMA TX request */
         omap2_mcspi_set_dma_req(spi, 0, 0);
+
+        complete(&mcspi_dma->dma_tx_completion);
 }
 
 static void omap2_mcspi_tx_dma(struct spi_device *spi,
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 6495352bcc19..a82bfa4af601 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -697,7 +697,7 @@ static int s3c64xx_spi_transfer_one_message(struct spi_master *master,
                 INIT_COMPLETION(sdd->xfer_completion);
 
                 /* Only BPW and Speed may change across transfers */
-                bpw = xfer->bits_per_word ? : spi->bits_per_word;
+                bpw = xfer->bits_per_word;
                 speed = xfer->speed_hz ? : spi->max_speed_hz;
 
                 if (xfer->len % (bpw / 8)) {
diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index 96358d0eabb7..8b40d0884f8b 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -20,6 +20,7 @@
 #include <linux/io.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
 
@@ -592,6 +593,37 @@ static u32 sh_msiof_spi_txrx_word(struct spi_device *spi, unsigned nsecs,
         return 0;
 }
 
+#ifdef CONFIG_OF
+static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev)
+{
+        struct sh_msiof_spi_info *info;
+        struct device_node *np = dev->of_node;
+        u32 num_cs = 0;
+
+        info = devm_kzalloc(dev, sizeof(struct sh_msiof_spi_info), GFP_KERNEL);
+        if (!info) {
+                dev_err(dev, "failed to allocate setup data\n");
+                return NULL;
+        }
+
+        /* Parse the MSIOF properties */
+        of_property_read_u32(np, "num-cs", &num_cs);
+        of_property_read_u32(np, "renesas,tx-fifo-size",
+                                        &info->tx_fifo_override);
+        of_property_read_u32(np, "renesas,rx-fifo-size",
+                                        &info->rx_fifo_override);
+
+        info->num_chipselect = num_cs;
+
+        return info;
+}
+#else
+static struct sh_msiof_spi_info *sh_msiof_spi_parse_dt(struct device *dev)
+{
+        return NULL;
+}
+#endif
+
 static int sh_msiof_spi_probe(struct platform_device *pdev)
 {
         struct resource *r;
@@ -610,7 +642,17 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
         p = spi_master_get_devdata(master);
 
         platform_set_drvdata(pdev, p);
-        p->info = pdev->dev.platform_data;
+        if (pdev->dev.of_node)
+                p->info = sh_msiof_spi_parse_dt(&pdev->dev);
+        else
+                p->info = pdev->dev.platform_data;
+
+        if (!p->info) {
+                dev_err(&pdev->dev, "failed to obtain device info\n");
+                ret = -ENXIO;
+                goto err1;
+        }
+
         init_completion(&p->done);
 
         p->clk = clk_get(&pdev->dev, NULL);
@@ -715,6 +757,17 @@ static int sh_msiof_spi_runtime_nop(struct device *dev)
         return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id sh_msiof_match[] = {
+        { .compatible = "renesas,sh-msiof", },
+        { .compatible = "renesas,sh-mobile-msiof", },
+        {},
+};
+MODULE_DEVICE_TABLE(of, sh_msiof_match);
+#else
+#define sh_msiof_match NULL
+#endif
+
 static struct dev_pm_ops sh_msiof_spi_dev_pm_ops = {
         .runtime_suspend = sh_msiof_spi_runtime_nop,
         .runtime_resume = sh_msiof_spi_runtime_nop,
@@ -727,6 +780,7 @@ static struct platform_driver sh_msiof_spi_drv = {
                 .name           = "spi_sh_msiof",
                 .owner          = THIS_MODULE,
                 .pm             = &sh_msiof_spi_dev_pm_ops,
+                .of_match_table = sh_msiof_match,
         },
 };
 module_platform_driver(sh_msiof_spi_drv);
diff --git a/drivers/spi/spi-sirf.c b/drivers/spi/spi-sirf.c
index e0f43a512e84..750666751efd 100644
--- a/drivers/spi/spi-sirf.c
+++ b/drivers/spi/spi-sirf.c
@@ -382,8 +382,7 @@ spi_sirfsoc_setup_transfer(struct spi_device *spi, struct spi_transfer *t)
 
         sspi = spi_master_get_devdata(spi->master);
 
-        bits_per_word = t && t->bits_per_word ? t->bits_per_word :
-                spi->bits_per_word;
+        bits_per_word = (t) ? t->bits_per_word : spi->bits_per_word;
         hz = t && t->speed_hz ? t->speed_hz : spi->max_speed_hz;
 
         /* Enable IO mode for RX, TX */
diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index 651167f2e0af..7a95bddfb604 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -284,8 +284,7 @@ static unsigned tegra_slink_calculate_curr_xfer_param(
         unsigned max_len;
         unsigned total_fifo_words;
 
-        bits_per_word = t->bits_per_word ? t->bits_per_word :
-                                                spi->bits_per_word;
+        bits_per_word = t->bits_per_word;
         tspi->bytes_per_word = (bits_per_word - 1) / 8 + 1;
 
         if (bits_per_word == 8 || bits_per_word == 16) {
@@ -378,8 +377,7 @@ static unsigned int tegra_slink_read_rx_fifo_to_client_rxbuf(
         } else {
                 unsigned int bits_per_word;
 
-                bits_per_word = t->bits_per_word ? t->bits_per_word :
-                                                tspi->cur_spi->bits_per_word;
+                bits_per_word = t->bits_per_word;
                 for (count = 0; count < rx_full_count; count++) {
                         x = tegra_slink_readl(tspi, SLINK_RX_FIFO);
                         for (i = 0; (i < tspi->bytes_per_word); i++)
@@ -444,8 +442,7 @@ static void tegra_slink_copy_spi_rxbuf_to_client_rxbuf(
                 unsigned int x;
                 unsigned int rx_mask, bits_per_word;
 
-                bits_per_word = t->bits_per_word ? t->bits_per_word :
-                                                tspi->cur_spi->bits_per_word;
+                bits_per_word = t->bits_per_word;
                 rx_mask = (1 << bits_per_word) - 1;
                 for (count = 0; count < tspi->curr_dma_words; count++) {
                         x = tspi->rx_dma_buf[count];
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c
index d5a3cbb646cb..550b5f48fd8f 100644
--- a/drivers/spi/spi-txx9.c
+++ b/drivers/spi/spi-txx9.c
@@ -189,9 +189,8 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m)
                 unsigned int len = t->len;
                 unsigned int wsize;
                 u32 speed_hz = t->speed_hz ? : spi->max_speed_hz;
-                u8 bits_per_word = t->bits_per_word ? : spi->bits_per_word;
+                u8 bits_per_word = t->bits_per_word;
 
-                bits_per_word = bits_per_word ? : 8;
                 wsize = bits_per_word >> 3; /* in bytes */
 
                 if (prev_speed_hz != speed_hz
@@ -316,9 +315,8 @@ static int txx9spi_transfer(struct spi_device *spi, struct spi_message *m)
         /* check each transfer's parameters */
         list_for_each_entry (t, &m->transfers, transfer_list) {
                 u32 speed_hz = t->speed_hz ? : spi->max_speed_hz;
-                u8 bits_per_word = t->bits_per_word ? : spi->bits_per_word;
+                u8 bits_per_word = t->bits_per_word;
 
-                bits_per_word = bits_per_word ? : 8;
                 if (!t->tx_buf && !t->rx_buf && t->len)
                         return -EINVAL;
                 if (bits_per_word != 8 && bits_per_word != 16)
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 19ee901577da..08ff4acd5225 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1135,6 +1135,9 @@ int spi_register_master(struct spi_master *master)
         if (master->num_chipselect == 0)
                 return -EINVAL;
 
+        if ((master->bus_num < 0) && master->dev.of_node)
+                master->bus_num = of_alias_get_id(master->dev.of_node, "spi");
+
         /* convention:  dynamically assigned bus IDs count down from the max */
         if (master->bus_num < 0) {
                 /* FIXME switch to an IDR based scheme, something like