Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6

* 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
  spi/omap: Fix DMA API usage in OMAP MCSPI driver
  spi/imx: correct the test on platform_get_irq() return value
  spi/topcliff: Typo fix threhold to threshold
  spi/dw_spi Typo change diable to disable.
  spi/fsl_espi: change the read behaviour of the SPIRF
  spi/mpc52xx-psc-spi: move probe/remove to proper sections
  spi/dw_spi: add DMA support
  spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
  spi/dw_spi: Fix too short timeout in spi polling loop
  spi/pl022: convert running variable
  spi/pl022: convert busy flag to a bool
  spi/pl022: pass the returned sglen to the DMA engine
  spi/pl022: map the buffers on the DMA engine
  spi/topcliff_pch: Fix data transfer issue
  spi/imx: remove autodetection
  spi/pxa2xx: pass of_node to spi device and set a parent device
  spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
  spi/pxa2xx: Add chipselect support for Sodaville
  spi/pxa2xx: Consider CE4100's FIFO depth
  spi/pxa2xx: Add CE4100 support
  ...

1 files changed, 3 insertions, 29 deletions

diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c
index 55a38e2c6c13..9469564e6888 100644
--- a/drivers/spi/spi_imx.c
+++ b/drivers/spi/spi_imx.c
@@ -66,7 +66,6 @@ enum spi_imx_devtype {
         SPI_IMX_VER_0_5,
         SPI_IMX_VER_0_7,
         SPI_IMX_VER_2_3,
-        SPI_IMX_VER_AUTODETECT,
 };
 
 struct spi_imx_data;
@@ -720,9 +719,6 @@ static void spi_imx_cleanup(struct spi_device *spi)
 
 static struct platform_device_id spi_imx_devtype[] = {
         {
-                .name = DRIVER_NAME,
-                .driver_data = SPI_IMX_VER_AUTODETECT,
-        }, {
                 .name = "imx1-cspi",
                 .driver_data = SPI_IMX_VER_IMX1,
         }, {
@@ -802,30 +798,8 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
 
         init_completion(&spi_imx->xfer_done);
 
-        if (pdev->id_entry->driver_data == SPI_IMX_VER_AUTODETECT) {
-                if (cpu_is_mx25() || cpu_is_mx35())
-                        spi_imx->devtype_data =
-                                spi_imx_devtype_data[SPI_IMX_VER_0_7];
-                else if (cpu_is_mx25() || cpu_is_mx31() || cpu_is_mx35())
-                        spi_imx->devtype_data =
-                                spi_imx_devtype_data[SPI_IMX_VER_0_4];
-                else if (cpu_is_mx27() || cpu_is_mx21())
-                        spi_imx->devtype_data =
-                                spi_imx_devtype_data[SPI_IMX_VER_0_0];
-                else if (cpu_is_mx1())
-                        spi_imx->devtype_data =
-                                spi_imx_devtype_data[SPI_IMX_VER_IMX1];
-                else
-                        BUG();
-        } else
-                spi_imx->devtype_data =
-                        spi_imx_devtype_data[pdev->id_entry->driver_data];
-
-        if (!spi_imx->devtype_data.intctrl) {
-                dev_err(&pdev->dev, "no support for this device compiled in\n");
-                ret = -ENODEV;
-                goto out_gpio_free;
-        }
+        spi_imx->devtype_data =
+                spi_imx_devtype_data[pdev->id_entry->driver_data];
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res) {
@@ -847,7 +821,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev)
         }
 
         spi_imx->irq = platform_get_irq(pdev, 0);
-        if (spi_imx->irq <= 0) {
+        if (spi_imx->irq < 0) {
                 ret = -EINVAL;
                 goto out_iounmap;
         }