Skip to content

Commit

Permalink
spi: spi-pxa2xx: remove legacy PXA DMA bits
Browse files Browse the repository at this point in the history
Generic DMA support was already implemented by commit cd7bed0
("spi/pxa2xx: break out the private DMA API usage into a separate file")
which moved all the legacy PXA DMA implementation code into its own
file.

With generic DMA available for PXA, we can now just trash this file.

Signed-off-by: Daniel Mack <zonque@gmail.com>
Acked-by: Mark Brown <broonie@linaro.org>
[respin after pxa dmaengine support upstream]
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Daniel Mack authored and Mark Brown committed Jun 9, 2015
1 parent 82ba2c2 commit 6356437
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 501 deletions.
9 changes: 1 addition & 8 deletions drivers/spi/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -393,16 +393,9 @@ config SPI_PPC4xx
help
This selects a driver for the PPC4xx SPI Controller.

config SPI_PXA2XX_PXADMA
bool "PXA2xx SSP legacy PXA DMA API support"
depends on SPI_PXA2XX && ARCH_PXA
help
Enable PXA private legacy DMA API support. Note that this is
deprecated in favor of generic DMA engine API.

config SPI_PXA2XX_DMA
def_bool y
depends on SPI_PXA2XX && !SPI_PXA2XX_PXADMA
depends on SPI_PXA2XX

config SPI_PXA2XX
tristate "PXA2xx SSP SPI master"
Expand Down
1 change: 0 additions & 1 deletion drivers/spi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ obj-$(CONFIG_SPI_ORION) += spi-orion.o
obj-$(CONFIG_SPI_PL022) += spi-pl022.o
obj-$(CONFIG_SPI_PPC4xx) += spi-ppc4xx.o
spi-pxa2xx-platform-objs := spi-pxa2xx.o
spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_PXADMA) += spi-pxa2xx-pxadma.o
spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA) += spi-pxa2xx-dma.o
obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-platform.o
obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o
Expand Down
Loading

0 comments on commit 6356437

Please sign in to comment.