Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / spi / xilinx_spi.c

diff --git a/drivers/spi/xilinx_spi.c b/drivers/spi/xilinx_spi.c
index 80f2db5bcfd6e669bdd136c25f2d04ebb51d4595..7adaef62a99122a0e7e7427207f2e47132d33469 100644 (file)
--- a/drivers/spi/xilinx_spi.c
+++ b/drivers/spi/xilinx_spi.c
@@ -1,26 +1,27 @@
 /*
- * xilinx_spi.c
- *
  * Xilinx SPI controller driver (master mode only)
  *
  * Author: MontaVista Software, Inc.
  *     source@mvista.com
  *
- * 2002-2007 (c) MontaVista Software, Inc.  This file is licensed under the
- * terms of the GNU General Public License version 2.  This program is licensed
- * "as is" without any warranty of any kind, whether express or implied.
+ * Copyright (c) 2010 Secret Lab Technologies, Ltd.
+ * Copyright (c) 2009 Intel Corporation
+ * 2002-2007 (c) MontaVista Software, Inc.
+
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  */
 
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-
+#include <linux/of.h>
+#include <linux/platform_device.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
-#include <linux/io.h>
-
-#include "xilinx_spi.h"
 #include <linux/spi/xilinx_spi.h>
+#include <linux/io.h>
 
 #define XILINX_SPI_NAME "xilinx_spi"
 
@@ -350,19 +351,22 @@ static irqreturn_t xilinx_spi_irq(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id xilinx_spi_of_match[] = {
+       { .compatible = "xlnx,xps-spi-2.00.a", },
+       { .compatible = "xlnx,xps-spi-2.00.b", },
+       {}
+};
+MODULE_DEVICE_TABLE(of, xilinx_spi_of_match);
+#endif
+
 struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem,
-       u32 irq, s16 bus_num)
+       u32 irq, s16 bus_num, int num_cs, int little_endian, int bits_per_word)
 {
        struct spi_master *master;
        struct xilinx_spi *xspi;
-       struct xspi_platform_data *pdata = dev->platform_data;
        int ret;
 
-       if (!pdata) {
-               dev_err(dev, "No platform data attached\n");
-               return NULL;
-       }
-
        master = spi_alloc_master(dev, sizeof(struct xilinx_spi));
        if (!master)
                return NULL;
@@ -389,21 +393,21 @@ struct spi_master *xilinx_spi_init(struct device *dev, struct resource *mem,
        }
 
        master->bus_num = bus_num;
-       master->num_chipselect = pdata->num_chipselect;
+       master->num_chipselect = num_cs;
 #ifdef CONFIG_OF
        master->dev.of_node = dev->of_node;
 #endif
 
        xspi->mem = *mem;
        xspi->irq = irq;
-       if (pdata->little_endian) {
+       if (little_endian) {
                xspi->read_fn = xspi_read32;
                xspi->write_fn = xspi_write32;
        } else {
                xspi->read_fn = xspi_read32_be;
                xspi->write_fn = xspi_write32_be;
        }
-       xspi->bits_per_word = pdata->bits_per_word;
+       xspi->bits_per_word = bits_per_word;
        if (xspi->bits_per_word == 8) {
                xspi->tx_fn = xspi_tx8;
                xspi->rx_fn = xspi_rx8;
@@ -462,6 +466,97 @@ void xilinx_spi_deinit(struct spi_master *master)
 }
 EXPORT_SYMBOL(xilinx_spi_deinit);
 
+static int __devinit xilinx_spi_probe(struct platform_device *dev)
+{
+       struct xspi_platform_data *pdata;
+       struct resource *r;
+       int irq, num_cs = 0, little_endian = 0, bits_per_word = 8;
+       struct spi_master *master;
+       u8 i;
+
+       pdata = dev->dev.platform_data;
+       if (pdata) {
+               num_cs = pdata->num_chipselect;
+               little_endian = pdata->little_endian;
+               bits_per_word = pdata->bits_per_word;
+       }
+
+#ifdef CONFIG_OF
+       if (dev->dev.of_node) {
+               const __be32 *prop;
+               int len;
+
+               /* number of slave select bits is required */
+               prop = of_get_property(dev->dev.of_node, "xlnx,num-ss-bits",
+                                      &len);
+               if (prop && len >= sizeof(*prop))
+                       num_cs = __be32_to_cpup(prop);
+       }
+#endif
+
+       if (!num_cs) {
+               dev_err(&dev->dev, "Missing slave select configuration data\n");
+               return -EINVAL;
+       }
+
+
+       r = platform_get_resource(dev, IORESOURCE_MEM, 0);
+       if (!r)
+               return -ENODEV;
+
+       irq = platform_get_irq(dev, 0);
+       if (irq < 0)
+               return -ENXIO;
+
+       master = xilinx_spi_init(&dev->dev, r, irq, dev->id, num_cs,
+                                little_endian, bits_per_word);
+       if (!master)
+               return -ENODEV;
+
+       if (pdata) {
+               for (i = 0; i < pdata->num_devices; i++)
+                       spi_new_device(master, pdata->devices + i);
+       }
+
+       platform_set_drvdata(dev, master);
+       return 0;
+}
+
+static int __devexit xilinx_spi_remove(struct platform_device *dev)
+{
+       xilinx_spi_deinit(platform_get_drvdata(dev));
+       platform_set_drvdata(dev, 0);
+
+       return 0;
+}
+
+/* work with hotplug and coldplug */
+MODULE_ALIAS("platform:" XILINX_SPI_NAME);
+
+static struct platform_driver xilinx_spi_driver = {
+       .probe = xilinx_spi_probe,
+       .remove = __devexit_p(xilinx_spi_remove),
+       .driver = {
+               .name = XILINX_SPI_NAME,
+               .owner = THIS_MODULE,
+#ifdef CONFIG_OF
+               .of_match_table = xilinx_spi_of_match,
+#endif
+       },
+};
+
+static int __init xilinx_spi_pltfm_init(void)
+{
+       return platform_driver_register(&xilinx_spi_driver);
+}
+module_init(xilinx_spi_pltfm_init);
+
+static void __exit xilinx_spi_pltfm_exit(void)
+{
+       platform_driver_unregister(&xilinx_spi_driver);
+}
+module_exit(xilinx_spi_pltfm_exit);
+
 MODULE_AUTHOR("MontaVista Software, Inc. <source@mvista.com>");
 MODULE_DESCRIPTION("Xilinx SPI driver");
 MODULE_LICENSE("GPL");