Move cfi flash drivers to drivers/nor as suggested by Nishanth Menon

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

8 files changed, 81 insertions, 81 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 21a37d1cf5..1e9dae366b 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -3,82 +3,7 @@ menu "Drivers                       "
 source "drivers/serial/Kconfig"
 source "drivers/net/Kconfig"
 source "drivers/spi/Kconfig"
-
-menu "flash drivers                 "
-
-config HAS_CFI
-	bool
-
-config DRIVER_CFI
-	bool "cfi flash driver"
-	help
-	  If you have NOR Flash devices connected to your system and wish
-	  to use them say yes here.
-
-config DRIVER_CFI_NEW
-	depends on DRIVER_CFI
-	default y
-	bool "new cfi flash driver"
-	help
-	  The old cfi flash driver is mainly an adopted version from U-Boot v1
-	  whereas the new driver contains some more experimental features such
-	  as selecting the supported chiptypes and bus widths making the driver
-	  smaller.
-	  Normally you should stick with the new driver, but if you experience
-	  troubles you could try the old driver. Please report if the new driver
-	  breaks something.
-
-config DRIVER_CFI_OLD
-	bool "old cfi flash driver"
-	default y
-	depends on !DRIVER_CFI_NEW
-
-config DRIVER_CFI_INTEL
-	depends on DRIVER_CFI_NEW
-	bool "Support Intel flash chips"
-
-config DRIVER_CFI_AMD
-	depends on DRIVER_CFI_NEW
-	bool "support AMD flash chips"
-
-config DRIVER_CFI_BANK_WIDTH_1
-	bool "Support  8-bit buswidth"
-	depends on DRIVER_CFI_NEW
-	default y
-	help
-	  If you wish to support CFI devices on a physical bus which is
-	  8 bits wide, say 'Y'.
-
-config DRIVER_CFI_BANK_WIDTH_2
-	bool "Support 16-bit buswidth"
-	depends on DRIVER_CFI_NEW
-	default y
-	help
-	  If you wish to support CFI devices on a physical bus which is
-	  16 bits wide, say 'Y'.
-
-config DRIVER_CFI_BANK_WIDTH_4
-	bool "Support 32-bit buswidth"
-	depends on DRIVER_CFI_NEW
-	default y
-	help
-	  If you wish to support CFI devices on a physical bus which is
-	  32 bits wide, say 'Y'.
-
-config DRIVER_CFI_BANK_WIDTH_8
-	bool "Support 64-bit buswidth"
-	depends on DRIVER_CFI_NEW
-	default n
-	help
-	  If you wish to support CFI devices on a physical bus which is
-	  64 bits wide, say 'Y'.
-
-config CFI_BUFFER_WRITE
-	bool "use cfi driver with buffer write"
-	depends on DRIVER_CFI || DRIVER_CFI_NEW
-
+source "drivers/nor/Kconfig"
 source "drivers/nand/Kconfig"
 
 endmenu
-
-endmenu
diff --git a/drivers/Makefile b/drivers/Makefile
index 586e637607..686998c814 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -1,9 +1,5 @@
 obj-y	+= net/
 obj-y	+= serial/
 obj-y	+= nand/
+obj-y	+= nor/
 obj-$(CONFIG_SPI) += spi/
-obj-$(CONFIG_DRIVER_CFI_OLD) += cfi_flash.o
-obj-$(CONFIG_DRIVER_CFI_NEW) += cfi_flash_new.o
-obj-$(CONFIG_DRIVER_CFI_INTEL) += cfi_flash_intel.o
-obj-$(CONFIG_DRIVER_CFI_AMD) += cfi_flash_amd.o
-
diff --git a/drivers/nor/Kconfig b/drivers/nor/Kconfig
new file mode 100644
index 0000000000..7d9497e3be
--- /dev/null
+++ b/drivers/nor/Kconfig
@@ -0,0 +1,74 @@
+menu "flash drivers                 "
+
+config HAS_CFI
+	bool
+
+config DRIVER_CFI
+	bool "cfi flash driver"
+	help
+	  If you have NOR Flash devices connected to your system and wish
+	  to use them say yes here.
+
+config DRIVER_CFI_NEW
+	depends on DRIVER_CFI
+	default y
+	bool "new cfi flash driver"
+	help
+	  The old cfi flash driver is mainly an adopted version from U-Boot v1
+	  whereas the new driver contains some more experimental features such
+	  as selecting the supported chiptypes and bus widths making the driver
+	  smaller.
+	  Normally you should stick with the new driver, but if you experience
+	  troubles you could try the old driver. Please report if the new driver
+	  breaks something.
+
+config DRIVER_CFI_OLD
+	bool "old cfi flash driver"
+	default y
+	depends on !DRIVER_CFI_NEW
+
+config DRIVER_CFI_INTEL
+	depends on DRIVER_CFI_NEW
+	bool "Support Intel flash chips"
+
+config DRIVER_CFI_AMD
+	depends on DRIVER_CFI_NEW
+	bool "support AMD flash chips"
+
+config DRIVER_CFI_BANK_WIDTH_1
+	bool "Support  8-bit buswidth"
+	depends on DRIVER_CFI_NEW
+	default y
+	help
+	  If you wish to support CFI devices on a physical bus which is
+	  8 bits wide, say 'Y'.
+
+config DRIVER_CFI_BANK_WIDTH_2
+	bool "Support 16-bit buswidth"
+	depends on DRIVER_CFI_NEW
+	default y
+	help
+	  If you wish to support CFI devices on a physical bus which is
+	  16 bits wide, say 'Y'.
+
+config DRIVER_CFI_BANK_WIDTH_4
+	bool "Support 32-bit buswidth"
+	depends on DRIVER_CFI_NEW
+	default y
+	help
+	  If you wish to support CFI devices on a physical bus which is
+	  32 bits wide, say 'Y'.
+
+config DRIVER_CFI_BANK_WIDTH_8
+	bool "Support 64-bit buswidth"
+	depends on DRIVER_CFI_NEW
+	default n
+	help
+	  If you wish to support CFI devices on a physical bus which is
+	  64 bits wide, say 'Y'.
+
+config CFI_BUFFER_WRITE
+	bool "use cfi driver with buffer write"
+	depends on DRIVER_CFI || DRIVER_CFI_NEW
+
+endmenu
diff --git a/drivers/nor/Makefile b/drivers/nor/Makefile
new file mode 100644
index 0000000000..d5b570999a
--- /dev/null
+++ b/drivers/nor/Makefile
@@ -0,0 +1,5 @@
+obj-$(CONFIG_DRIVER_CFI_OLD) += cfi_flash.o
+obj-$(CONFIG_DRIVER_CFI_NEW) += cfi_flash_new.o
+obj-$(CONFIG_DRIVER_CFI_INTEL) += cfi_flash_intel.o
+obj-$(CONFIG_DRIVER_CFI_AMD) += cfi_flash_amd.o
+
diff --git a/drivers/cfi_flash.c b/drivers/nor/cfi_flash.c
index 4bdd2f656f..4bdd2f656f 100644
--- a/drivers/cfi_flash.c
+++ b/drivers/nor/cfi_flash.c
diff --git a/drivers/cfi_flash_amd.c b/drivers/nor/cfi_flash_amd.c
index 05274c3b8a..05274c3b8a 100644
--- a/drivers/cfi_flash_amd.c
+++ b/drivers/nor/cfi_flash_amd.c
diff --git a/drivers/cfi_flash_intel.c b/drivers/nor/cfi_flash_intel.c
index a0a88851b7..a0a88851b7 100644
--- a/drivers/cfi_flash_intel.c
+++ b/drivers/nor/cfi_flash_intel.c
diff --git a/drivers/cfi_flash_new.c b/drivers/nor/cfi_flash_new.c
index 693edaedbd..693edaedbd 100644
--- a/drivers/cfi_flash_new.c
+++ b/drivers/nor/cfi_flash_new.c