Merge remote-tracking branches 'spi/topic/davinci', 'spi/topic/doc', 'spi/topic/dw...

[pandora-kernel.git] / drivers / spi / spi-dw-pci.c

diff --git a/drivers/spi/spi-dw-pci.c b/drivers/spi/spi-dw-pci.c
index 3f3dc12..ba68da1 100644 (file)
--- a/drivers/spi/spi-dw-pci.c
+++ b/drivers/spi/spi-dw-pci.c
@@ -1,7 +1,7 @@
 /*
  * PCI interface driver for DW SPI Core
  *
- * Copyright (c) 2009, Intel Corporation.
+ * Copyright (c) 2009, 2014 Intel Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -11,10 +11,6 @@
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <linux/interrupt.h>
@@ -32,17 +28,22 @@ struct dw_spi_pci {
        struct dw_spi   dws;
 };
 
-static int spi_pci_probe(struct pci_dev *pdev,
-       const struct pci_device_id *ent)
+struct spi_pci_desc {
+       int     (*setup)(struct dw_spi *);
+};
+
+static struct spi_pci_desc spi_pci_mid_desc = {
+       .setup = dw_spi_mid_init,
+};
+
+static int spi_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
        struct dw_spi_pci *dwpci;
        struct dw_spi *dws;
+       struct spi_pci_desc *desc = (struct spi_pci_desc *)ent->driver_data;
        int pci_bar = 0;
        int ret;
 
-       dev_info(&pdev->dev, "found PCI SPI controller(ID: %04x:%04x)\n",
-               pdev->vendor, pdev->device);
-
        ret = pcim_enable_device(pdev);
        if (ret)
                return ret;
@@ -58,20 +59,22 @@ static int spi_pci_probe(struct pci_dev *pdev,
        /* Get basic io resource and map it */
        dws->paddr = pci_resource_start(pdev, pci_bar);
 
-       ret = pcim_iomap_regions(pdev, 1, dev_name(&pdev->dev));
+       ret = pcim_iomap_regions(pdev, 1 << pci_bar, pci_name(pdev));
        if (ret)
                return ret;
 
+       dws->regs = pcim_iomap_table(pdev)[pci_bar];
+
        dws->bus_num = 0;
        dws->num_cs = 4;
        dws->irq = pdev->irq;
 
        /*
-        * Specific handling for Intel MID paltforms, like dma setup,
+        * Specific handling for paltforms, like dma setup,
         * clock rate, FIFO depth.
         */
-       if (pdev->device == 0x0800) {
-               ret = dw_spi_mid_init(dws);
+       if (desc && desc->setup) {
+               ret = desc->setup(dws);
                if (ret)
                        return ret;
        }
@@ -83,6 +86,9 @@ static int spi_pci_probe(struct pci_dev *pdev,
        /* PCI hook and SPI hook use the same drv data */
        pci_set_drvdata(pdev, dwpci);
 
+       dev_info(&pdev->dev, "found PCI SPI controller(ID: %04x:%04x)\n",
+               pdev->vendor, pdev->device);
+
        return 0;
 }
 
@@ -93,41 +99,29 @@ static void spi_pci_remove(struct pci_dev *pdev)
        dw_spi_remove_host(&dwpci->dws);
 }
 
-#ifdef CONFIG_PM
-static int spi_suspend(struct pci_dev *pdev, pm_message_t state)
+#ifdef CONFIG_PM_SLEEP
+static int spi_suspend(struct device *dev)
 {
+       struct pci_dev *pdev = to_pci_dev(dev);
        struct dw_spi_pci *dwpci = pci_get_drvdata(pdev);
-       int ret;
 
-       ret = dw_spi_suspend_host(&dwpci->dws);
-       if (ret)
-               return ret;
-       pci_save_state(pdev);
-       pci_disable_device(pdev);
-       pci_set_power_state(pdev, pci_choose_state(pdev, state));
-       return ret;
+       return dw_spi_suspend_host(&dwpci->dws);
 }
 
-static int spi_resume(struct pci_dev *pdev)
+static int spi_resume(struct device *dev)
 {
+       struct pci_dev *pdev = to_pci_dev(dev);
        struct dw_spi_pci *dwpci = pci_get_drvdata(pdev);
-       int ret;
 
-       pci_set_power_state(pdev, PCI_D0);
-       pci_restore_state(pdev);
-       ret = pci_enable_device(pdev);
-       if (ret)
-               return ret;
        return dw_spi_resume_host(&dwpci->dws);
 }
-#else
-#define spi_suspend    NULL
-#define spi_resume     NULL
 #endif
 
+static SIMPLE_DEV_PM_OPS(dw_spi_pm_ops, spi_suspend, spi_resume);
+
 static const struct pci_device_id pci_ids[] = {
        /* Intel MID platform SPI controller 0 */
-       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x0800) },
+       { PCI_VDEVICE(INTEL, 0x0800), (kernel_ulong_t)&spi_pci_mid_desc},
        {},
 };
 
@@ -136,8 +130,9 @@ static struct pci_driver dw_spi_driver = {
        .id_table =     pci_ids,
        .probe =        spi_pci_probe,
        .remove =       spi_pci_remove,
-       .suspend =      spi_suspend,
-       .resume =       spi_resume,
+       .driver         = {
+               .pm     = &dw_spi_pm_ops,
+       },
 };
 
 module_pci_driver(dw_spi_driver);