diff options
| author |   Mika Westerberg <mika.westerberg@linux.intel.com> | 2014-08-19 20:29:19 +0300 |
|---|---|---|
| committer |   Vinod Koul <vinod.koul@intel.com> | 2014-09-18 11:54:07 +0530 |
| commit | b729bf34535ed413667b397a2f59cfa81266facf (patch) | |
| tree | 9e8020289c02e2894afabb6ef57fabaf20d77d56 /drivers/spi/spi-pxa2xx.c | |
| parent | Merge commit 'tags/spi-pxa2xx-clk' into for-linus (diff) | |
| download | linux-dev-b729bf34535ed413667b397a2f59cfa81266facf.tar.xz linux-dev-b729bf34535ed413667b397a2f59cfa81266facf.zip | |
spi/pxa2xx: Don't use slave_id of dma_slave_config
That field has been deprecated in favour of getting the necessary
information from ACPI/DT.
However, we still need to deal systems that are PCI only (no ACPI to back
up). In order to support such systems, we allow the DMA filter function and
its corresponding parameter via pxa2xx_spi_master platform data. Then when
the pxa2xx_spi_dma_setup() doesn't find the channel via ACPI, it falls back
to use the given filter function.
Suggested-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/spi/spi-pxa2xx.c')
| -rw-r--r-- | drivers/spi/spi-pxa2xx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c index fe792106bdc5..256c0abbddd2 100644 --- a/drivers/spi/spi-pxa2xx.c +++ b/drivers/spi/spi-pxa2xx.c @@ -1062,8 +1062,6 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) pdata->num_chipselect = 1; pdata->enable_dma = true; - pdata->tx_chan_id = -1; - pdata->rx_chan_id = -1; return pdata; } |