Merge tag 'driver-core-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / spi / Kconfig

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 3105ea2edecc6719627ae15e9a4579eb5ed477b4..f80eee74a3116c5a8935378d908fce904e3351f6 100644 (file)
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -297,9 +297,20 @@ 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
+
 config SPI_PXA2XX
        tristate "PXA2xx SSP SPI master"
-       depends on (ARCH_PXA || (X86_32 && PCI))
+       depends on ARCH_PXA || PCI || ACPI
        select PXA_SSP if ARCH_PXA
        help
          This enables using a PXA2xx or Sodaville SSP port as a SPI master
@@ -307,7 +318,7 @@ config SPI_PXA2XX
          additional documentation can be found a Documentation/spi/pxa2xx.
 
 config SPI_PXA2XX_PCI
-       def_bool SPI_PXA2XX && X86_32 && PCI
+       def_tristate SPI_PXA2XX && PCI
 
 config SPI_RSPI
        tristate "Renesas RSPI controller"