spi/pxa2xx: embed the ssp_device to platform data

The spi-pxa2xx-pci glue driver had to implement pxa_ssp_request()/free() in
order to support the spi-pxa2xx platform driver. Since the ACPI enabled
platforms can use the same platform driver we would need to implement
pxa_ssp_request()/free() in some central place that can be shared by the
ACPI and PCI glue code.

Instead of doing that we can make pxa_ssp_request()/free() to be available
only when CONFIG_ARCH_PXA is set. On other arches these are being stubbed
out in preference to passing the ssp_device from the platform data
directly.

We also change the SPI bus number to be taken from ssp->port_id instead of
platform device id. This way the supporting code that passes the ssp can
decide the number (or it can set it to the same as pdev->id).

Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 5c8c4f5883c4..54097ad76356 100644
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1535,11 +1535,18 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
         struct ssp_device *ssp;
         int status;
 
-        platform_info = dev->platform_data;
+        platform_info = dev_get_platdata(dev);
+        if (!platform_info) {
+                dev_err(&pdev->dev, "missing platform data\n");
+                return -ENODEV;
+        }
 
         ssp = pxa_ssp_request(pdev->id, pdev->name);
-        if (ssp == NULL) {
-                dev_err(&pdev->dev, "failed to request SSP%d\n", pdev->id);
+        if (!ssp)
+                ssp = &platform_info->ssp;
+
+        if (!ssp->mmio_base) {
+                dev_err(&pdev->dev, "failed to get ssp\n");
                 return -ENODEV;
         }
 
@@ -1561,7 +1568,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
         /* the spi->mode bits understood by this driver: */
         master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;
 
-        master->bus_num = pdev->id;
+        master->bus_num = ssp->port_id;
         master->num_chipselect = platform_info->num_chipselect;
         master->dma_alignment = DMA_ALIGNMENT;
         master->cleanup = cleanup;