Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

Pull SPI changes from Grant Likely:
 "Bug fixes and new features for SPI device drivers.  Also move device
  tree support code out of drivers/of and into drivers/spi/spi.c where
  it makes more sense."

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6:
  spi: By default setup spi_masters with 1 chipselect and dynamics bus number
  SPI: PRIMA2: use the newest APIs of PINCTRL to fix compiling errors
  spi/spi-fsl-spi: reference correct pdata in fsl_spi_cs_control
  spi: refactor spi-coldfire-qspi to use SPI queue framework.
  spi/omap2-mcspi: convert to the pump message infrastructure
  spi/rspi: add dmaengine support
  spi/topcliff: use correct __devexit_p annotation
  spi: Dont call prepare/unprepare transfer if not populated
  spi/ep93xx: clean probe/remove routines
  spi/devicetree: Move devicetree support code into spi directory
  spi: use module_pci_driver
  spi/omap2-mcspi: Trivial optimisation
  spi: omap2-mcspi: add support for pm_runtime autosuspend
  spi/omap: Remove bus_num usage for instance index
  OMAP : SPI : use devm_* functions
  spi: omap2-mcspi: convert to module_platform_driver
  spi: omap2-mcspi: make it behave as a module

3 files changed, 0 insertions, 106 deletions

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 8e84ce9765a9..f623f17a0b9f 100644
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -67,12 +67,6 @@ config OF_NET
         depends on NETDEVICES
         def_bool y
 
-config OF_SPI
-        def_tristate SPI
-        depends on SPI && !SPARC
-        help
-          OpenFirmware SPI accessors
-
 config OF_MDIO
         def_tristate PHYLIB
         depends on PHYLIB
diff --git a/drivers/of/Makefile b/drivers/of/Makefile
index aa90e602c8a7..0040d1858665 100644
--- a/drivers/of/Makefile
+++ b/drivers/of/Makefile
@@ -7,7 +7,6 @@ obj-$(CONFIG_OF_DEVICE) += device.o platform.o
 obj-$(CONFIG_OF_GPIO)   += gpio.o
 obj-$(CONFIG_OF_I2C)    += of_i2c.o
 obj-$(CONFIG_OF_NET)    += of_net.o
-obj-$(CONFIG_OF_SPI)    += of_spi.o
 obj-$(CONFIG_OF_SELFTEST) += selftest.o
 obj-$(CONFIG_OF_MDIO)   += of_mdio.o
 obj-$(CONFIG_OF_PCI)    += of_pci.o
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c
deleted file mode 100644
index 6dbc074e4876..000000000000
--- a/drivers/of/of_spi.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * SPI OF support routines
- * Copyright (C) 2008 Secret Lab Technologies Ltd.
- *
- * Support routines for deriving SPI device attachments from the device
- * tree.
- */
-
-#include <linux/module.h>
-#include <linux/of.h>
-#include <linux/device.h>
-#include <linux/spi/spi.h>
-#include <linux/of_irq.h>
-#include <linux/of_spi.h>
-
-/**
- * of_register_spi_devices - Register child devices onto the SPI bus
- * @master:     Pointer to spi_master device
- *
- * Registers an spi_device for each child node of master node which has a 'reg'
- * property.
- */
-void of_register_spi_devices(struct spi_master *master)
-{
-        struct spi_device *spi;
-        struct device_node *nc;
-        const __be32 *prop;
-        int rc;
-        int len;
-
-        if (!master->dev.of_node)
-                return;
-
-        for_each_child_of_node(master->dev.of_node, nc) {
-                /* Alloc an spi_device */
-                spi = spi_alloc_device(master);
-                if (!spi) {
-                        dev_err(&master->dev, "spi_device alloc error for %s\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                        continue;
-                }
-
-                /* Select device driver */
-                if (of_modalias_node(nc, spi->modalias,
-                                     sizeof(spi->modalias)) < 0) {
-                        dev_err(&master->dev, "cannot find modalias for %s\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                        continue;
-                }
-
-                /* Device address */
-                prop = of_get_property(nc, "reg", &len);
-                if (!prop || len < sizeof(*prop)) {
-                        dev_err(&master->dev, "%s has no 'reg' property\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                        continue;
-                }
-                spi->chip_select = be32_to_cpup(prop);
-
-                /* Mode (clock phase/polarity/etc.) */
-                if (of_find_property(nc, "spi-cpha", NULL))
-                        spi->mode |= SPI_CPHA;
-                if (of_find_property(nc, "spi-cpol", NULL))
-                        spi->mode |= SPI_CPOL;
-                if (of_find_property(nc, "spi-cs-high", NULL))
-                        spi->mode |= SPI_CS_HIGH;
-
-                /* Device speed */
-                prop = of_get_property(nc, "spi-max-frequency", &len);
-                if (!prop || len < sizeof(*prop)) {
-                        dev_err(&master->dev, "%s has no 'spi-max-frequency' property\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                        continue;
-                }
-                spi->max_speed_hz = be32_to_cpup(prop);
-
-                /* IRQ */
-                spi->irq = irq_of_parse_and_map(nc, 0);
-
-                /* Store a pointer to the node in the device structure */
-                of_node_get(nc);
-                spi->dev.of_node = nc;
-
-                /* Register the new device */
-                request_module(spi->modalias);
-                rc = spi_add_device(spi);
-                if (rc) {
-                        dev_err(&master->dev, "spi_device register error %s\n",
-                                nc->full_name);
-                        spi_dev_put(spi);
-                }
-
-        }
-}
-EXPORT_SYMBOL(of_register_spi_devices);