summaryrefslogtreecommitdiffstats
path: root/drivers/spi/Kconfig
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-10-14 09:32:53 -0600
committerGrant Likely <grant.likely@secretlab.ca>2010-11-09 21:41:28 -0700
commiteae6cb31d890e2860f9ce1b8ba73c27b6005af68 (patch)
treec0e7984b6f3a872be3a0deeb088fb402e1e06cd8 /drivers/spi/Kconfig
parent8fd8821b62397f8ddb7bfb23c3246a22770ab2ee (diff)
downloadop-kernel-dev-eae6cb31d890e2860f9ce1b8ba73c27b6005af68.zip
op-kernel-dev-eae6cb31d890e2860f9ce1b8ba73c27b6005af68.tar.gz
spi/xilinx: merge OF support code into main driver
Now that the of_platform_bus_type has been merged with the platform bus type, a single platform driver can handle both OF and non-OF use cases. This patch merges the OF support into the platform driver. Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'drivers/spi/Kconfig')
-rw-r--r--drivers/spi/Kconfig7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 58ad21c..665d03d 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -353,7 +353,6 @@ config SPI_XILINX
tristate "Xilinx SPI controller common module"
depends on HAS_IOMEM && EXPERIMENTAL
select SPI_BITBANG
- select SPI_XILINX_OF if (XILINX_VIRTEX || MICROBLAZE)
help
This exposes the SPI controller IP from the Xilinx EDK.
@@ -362,12 +361,6 @@ config SPI_XILINX
Or for the DS570, see "XPS Serial Peripheral Interface (SPI) (v2.00b)"
-config SPI_XILINX_OF
- tristate "Xilinx SPI controller OF device"
- depends on SPI_XILINX && (XILINX_VIRTEX || MICROBLAZE)
- help
- This is the OF driver for the SPI controller IP from the Xilinx EDK.
-
config SPI_NUC900
tristate "Nuvoton NUC900 series SPI"
depends on ARCH_W90X900 && EXPERIMENTAL
OpenPOWER on IntegriCloud