[PATCH] mtd: Tighten some driver dependencies

[Tom Rini]

The ALTERA_QSPI driver conflicts with the regular FLASH_CFI_DRIVER as
both implement the same high level functionality and so use the same
global namespace. In a similar fashion, all NAND drivers are mutually
exclusive due to namespace collisions. For the remaining drivers which
did not already have some architecture specific dependency, add them.

Signed-off-by: Tom Rini <trini at konsulko.com>
---
Cc: Dario Binacchi <dario.binacchi at amarulasolutions.com>
Cc: Michael Trimarchi <michael at amarulasolutions.com>
---
 drivers/mtd/Kconfig          | 2 +-
 drivers/mtd/nand/raw/Kconfig | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 86752b5926de..21b8b21f6b22 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -186,7 +186,7 @@ config FLASH_VERIFY
 
 config ALTERA_QSPI
 	bool "Altera Generic Quad SPI Controller"
-	depends on DM_MTD
+	depends on DM_MTD && !FLASH_CFI_DRIVER
 	select USE_SYS_MAX_FLASH_BANKS
 	help
 	  This enables access to Altera EPCQ/EPCS flash chips using the
diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
index f083113486ed..58ffa826d71b 100644
--- a/drivers/mtd/nand/raw/Kconfig
+++ b/drivers/mtd/nand/raw/Kconfig
@@ -218,7 +218,7 @@ config NAND_DENALI_DT
 	bool "Support Denali NAND controller as a DT device"
 	select NAND_DENALI
 	select SPL_SYS_NAND_SELF_INIT
-	depends on OF_CONTROL && DM_MTD
+	depends on OF_CONTROL && DM_MTD && (ARCH_SOCFPGA || ARCH_UNIPHIER)
 	help
 	  Enable the driver for NAND flash on platforms using a Denali NAND
 	  controller as a DT device.
@@ -400,6 +400,7 @@ endif
 
 config NAND_VF610_NFC
 	bool "Support for Freescale NFC for VF610"
+	depends on ARCH_VF610
 	select SYS_NAND_SELF_INIT
 	select SYS_NAND_DRIVER_ECC_LAYOUT
 	imply CMD_NAND
-- 
2.43.0