diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-10-14 11:32:53 -0400 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-11-09 23:41:28 -0500 |
commit | eae6cb31d890e2860f9ce1b8ba73c27b6005af68 (patch) | |
tree | c0e7984b6f3a872be3a0deeb088fb402e1e06cd8 /drivers/spi/Kconfig | |
parent | 8fd8821b62397f8ddb7bfb23c3246a22770ab2ee (diff) |
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/Kconfig | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 58ad21c700d3..665d03d4e022 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
@@ -353,7 +353,6 @@ config SPI_XILINX | |||
353 | tristate "Xilinx SPI controller common module" | 353 | tristate "Xilinx SPI controller common module" |
354 | depends on HAS_IOMEM && EXPERIMENTAL | 354 | depends on HAS_IOMEM && EXPERIMENTAL |
355 | select SPI_BITBANG | 355 | select SPI_BITBANG |
356 | select SPI_XILINX_OF if (XILINX_VIRTEX || MICROBLAZE) | ||
357 | help | 356 | help |
358 | This exposes the SPI controller IP from the Xilinx EDK. | 357 | This exposes the SPI controller IP from the Xilinx EDK. |
359 | 358 | ||
@@ -362,12 +361,6 @@ config SPI_XILINX | |||
362 | 361 | ||
363 | Or for the DS570, see "XPS Serial Peripheral Interface (SPI) (v2.00b)" | 362 | Or for the DS570, see "XPS Serial Peripheral Interface (SPI) (v2.00b)" |
364 | 363 | ||
365 | config SPI_XILINX_OF | ||
366 | tristate "Xilinx SPI controller OF device" | ||
367 | depends on SPI_XILINX && (XILINX_VIRTEX || MICROBLAZE) | ||
368 | help | ||
369 | This is the OF driver for the SPI controller IP from the Xilinx EDK. | ||
370 | |||
371 | config SPI_NUC900 | 364 | config SPI_NUC900 |
372 | tristate "Nuvoton NUC900 series SPI" | 365 | tristate "Nuvoton NUC900 series SPI" |
373 | depends on ARCH_W90X900 && EXPERIMENTAL | 366 | depends on ARCH_W90X900 && EXPERIMENTAL |