5 files changed, 314 insertions, 7 deletions

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 78f9fd02c1b..537759011d1 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -267,12 +267,15 @@ config SPI_PPC4xx
 
 config SPI_PXA2XX
         tristate "PXA2xx SSP SPI master"
-        depends on ARCH_PXA && EXPERIMENTAL
-        select PXA_SSP
+        depends on (ARCH_PXA || (X86_32 && PCI)) && EXPERIMENTAL
+        select PXA_SSP if ARCH_PXA
         help
-          This enables using a PXA2xx SSP port as a SPI master controller.
-          The driver can be configured to use any SSP port and additional
-          documentation can be found a Documentation/spi/pxa2xx.
+          This enables using a PXA2xx or Sodaville SSP port as a SPI master
+          controller. The driver can be configured to use any SSP port and
+          additional documentation can be found a Documentation/spi/pxa2xx.
+
+config SPI_PXA2XX_PCI
+        def_bool SPI_PXA2XX && X86_32 && PCI
 
 config SPI_S3C24XX
         tristate "Samsung S3C24XX series SPI"
diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index 8bc1a5abac1..bdc4c400fd7 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -24,6 +24,7 @@ obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
 obj-$(CONFIG_SPI_IMX)                   += spi_imx.o
 obj-$(CONFIG_SPI_LM70_LLP)              += spi_lm70llp.o
 obj-$(CONFIG_SPI_PXA2XX)                += pxa2xx_spi.o
+obj-$(CONFIG_SPI_PXA2XX_PCI)            += pxa2xx_spi_pci.o
 obj-$(CONFIG_SPI_OMAP_UWIRE)            += omap_uwire.o
 obj-$(CONFIG_SPI_OMAP24XX)              += omap2_mcspi.o
 obj-$(CONFIG_SPI_OMAP_100K)             += omap_spi_100k.o
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c
index 98d9c8b0918..ed212c2583a 100644
--- a/drivers/spi/pxa2xx_spi.c
+++ b/drivers/spi/pxa2xx_spi.c
@@ -28,7 +28,6 @@
 #include <linux/spi/spi.h>
 #include <linux/workqueue.h>
 #include <linux/delay.h>
-#include <linux/clk.h>
 #include <linux/gpio.h>
 #include <linux/slab.h>
 
diff --git a/drivers/spi/pxa2xx_spi_pci.c b/drivers/spi/pxa2xx_spi_pci.c
new file mode 100644
index 00000000000..351d8a375b5
--- /dev/null
+++ b/drivers/spi/pxa2xx_spi_pci.c
@@ -0,0 +1,201 @@
+/*
+ * CE4100's SPI device is more or less the same one as found on PXA
+ *
+ */
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/of_device.h>
+#include <linux/spi/pxa2xx_spi.h>
+
+struct awesome_struct {
+        struct ssp_device ssp;
+        struct platform_device spi_pdev;
+        struct pxa2xx_spi_master spi_pdata;
+};
+
+static DEFINE_MUTEX(ssp_lock);
+static LIST_HEAD(ssp_list);
+
+struct ssp_device *pxa_ssp_request(int port, const char *label)
+{
+        struct ssp_device *ssp = NULL;
+
+        mutex_lock(&ssp_lock);
+
+        list_for_each_entry(ssp, &ssp_list, node) {
+                if (ssp->port_id == port && ssp->use_count == 0) {
+                        ssp->use_count++;
+                        ssp->label = label;
+                        break;
+                }
+        }
+
+        mutex_unlock(&ssp_lock);
+
+        if (&ssp->node == &ssp_list)
+                return NULL;
+
+        return ssp;
+}
+EXPORT_SYMBOL_GPL(pxa_ssp_request);
+
+void pxa_ssp_free(struct ssp_device *ssp)
+{
+        mutex_lock(&ssp_lock);
+        if (ssp->use_count) {
+                ssp->use_count--;
+                ssp->label = NULL;
+        } else
+                dev_err(&ssp->pdev->dev, "device already free\n");
+        mutex_unlock(&ssp_lock);
+}
+EXPORT_SYMBOL_GPL(pxa_ssp_free);
+
+static void plat_dev_release(struct device *dev)
+{
+        struct awesome_struct *as = container_of(dev,
+                        struct awesome_struct, spi_pdev.dev);
+
+        of_device_node_put(&as->spi_pdev.dev);
+}
+
+static int __devinit ce4100_spi_probe(struct pci_dev *dev,
+                const struct pci_device_id *ent)
+{
+        int ret;
+        resource_size_t phys_beg;
+        resource_size_t phys_len;
+        struct awesome_struct *spi_info;
+        struct platform_device *pdev;
+        struct pxa2xx_spi_master *spi_pdata;
+        struct ssp_device *ssp;
+
+        ret = pci_enable_device(dev);
+        if (ret)
+                return ret;
+
+        phys_beg = pci_resource_start(dev, 0);
+        phys_len = pci_resource_len(dev, 0);
+
+        if (!request_mem_region(phys_beg, phys_len,
+                                "CE4100 SPI")) {
+                dev_err(&dev->dev, "Can't request register space.\n");
+                ret = -EBUSY;
+                return ret;
+        }
+
+        spi_info = kzalloc(sizeof(*spi_info), GFP_KERNEL);
+        if (!spi_info) {
+                ret = -ENOMEM;
+                goto err_kz;
+        }
+        ssp = &spi_info->ssp;
+        pdev = &spi_info->spi_pdev;
+        spi_pdata =  &spi_info->spi_pdata;
+
+        pdev->name = "pxa2xx-spi";
+        pdev->id = dev->devfn;
+        pdev->dev.parent = &dev->dev;
+        pdev->dev.platform_data = &spi_info->spi_pdata;
+
+#ifdef CONFIG_OF
+        pdev->dev.of_node = dev->dev.of_node;
+#endif
+        pdev->dev.release = plat_dev_release;
+
+        spi_pdata->num_chipselect = dev->devfn;
+
+        ssp->phys_base = pci_resource_start(dev, 0);
+        ssp->mmio_base = ioremap(phys_beg, phys_len);
+        if (!ssp->mmio_base) {
+                dev_err(&pdev->dev, "failed to ioremap() registers\n");
+                ret = -EIO;
+                goto err_remap;
+        }
+        ssp->irq = dev->irq;
+        ssp->port_id = pdev->id;
+        ssp->type = PXA25x_SSP;
+
+        mutex_lock(&ssp_lock);
+        list_add(&ssp->node, &ssp_list);
+        mutex_unlock(&ssp_lock);
+
+        pci_set_drvdata(dev, spi_info);
+
+        ret = platform_device_register(pdev);
+        if (ret)
+                goto err_dev_add;
+
+        return ret;
+
+err_dev_add:
+        pci_set_drvdata(dev, NULL);
+        mutex_lock(&ssp_lock);
+        list_del(&ssp->node);
+        mutex_unlock(&ssp_lock);
+        iounmap(ssp->mmio_base);
+
+err_remap:
+        kfree(spi_info);
+
+err_kz:
+        release_mem_region(phys_beg, phys_len);
+
+        return ret;
+}
+
+static void __devexit ce4100_spi_remove(struct pci_dev *dev)
+{
+        struct awesome_struct *spi_info;
+        struct platform_device *pdev;
+        struct ssp_device *ssp;
+
+        spi_info = pci_get_drvdata(dev);
+
+        ssp = &spi_info->ssp;
+        pdev = &spi_info->spi_pdev;
+
+        platform_device_unregister(pdev);
+
+        iounmap(ssp->mmio_base);
+        release_mem_region(pci_resource_start(dev, 0),