plat-orion: make orion_nand available for all Orion families

Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Reviewed-by: Tzachi Perelstein <tzachi@marvell.com>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Nicolas Pitre <nico@marvell.com>

diff --git a/arch/arm/mach-orion/common.c b/arch/arm/mach-orion/common.c
index 1e124b7b0bde199af5363894373a9c99c0bc7e09..1b5ed72899e580cf1ca1b1266b17a5d4e46d60c8 100644 (file)
--- a/arch/arm/mach-orion/common.c
+++ b/arch/arm/mach-orion/common.c
@@ -26,8 +26,8 @@
 #include <asm/mach/time.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
 #include <asm/plat-orion/ehci-orion.h>
+#include <asm/plat-orion/orion_nand.h>
 #include <asm/plat-orion/time.h>
 #include "common.h"
 

diff --git a/arch/arm/mach-orion/db88f5281-setup.c b/arch/arm/mach-orion/db88f5281-setup.c
index 5ef44e1a2d36cb1882b84c32def55b6f05deb940..5cf65fedfae2b9d884425707ca4451b10b7ecb01 100644 (file)
--- a/arch/arm/mach-orion/db88f5281-setup.c
+++ b/arch/arm/mach-orion/db88f5281-setup.c
@@ -25,7 +25,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
+#include <asm/plat-orion/orion_nand.h>
 #include "common.h"
 
 /*****************************************************************************

diff --git a/arch/arm/mach-orion/dns323-setup.c b/arch/arm/mach-orion/dns323-setup.c
index 076e155ad5106106980f6ea05ef93762d986a4c7..38593784d76f1a78bc5c967f6c3b47eff32b885a 100644 (file)
--- a/arch/arm/mach-orion/dns323-setup.c
+++ b/arch/arm/mach-orion/dns323-setup.c
@@ -26,7 +26,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
 #include "common.h"
 
 #define DNS323_GPIO_LED_RIGHT_AMBER    1

diff --git a/arch/arm/mach-orion/kurobox_pro-setup.c b/arch/arm/mach-orion/kurobox_pro-setup.c
index 785a07bdf1e24681f63b28a0a603f43a2c89e00e..feae4839830b456ede4ea9437176c90d8f2e9a32 100644 (file)
--- a/arch/arm/mach-orion/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion/kurobox_pro-setup.c
@@ -23,7 +23,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
+#include <asm/plat-orion/orion_nand.h>
 #include "common.h"
 
 /*****************************************************************************

diff --git a/arch/arm/mach-orion/rd88f5182-setup.c b/arch/arm/mach-orion/rd88f5182-setup.c
index e851b8ca5ac6fb48921d6237477274dde5c0bb49..e3cc757a4ca1c41a929bbbb8293bf12c03feee6b 100644 (file)
--- a/arch/arm/mach-orion/rd88f5182-setup.c
+++ b/arch/arm/mach-orion/rd88f5182-setup.c
@@ -25,7 +25,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
 #include "common.h"
 
 /*****************************************************************************

diff --git a/arch/arm/mach-orion/ts209-setup.c b/arch/arm/mach-orion/ts209-setup.c
index 45764dad16d0fb3bb121b5e5911761ae36051162..86583e4856a184ac003e5da08733da75b9f44b46 100644 (file)
--- a/arch/arm/mach-orion/ts209-setup.c
+++ b/arch/arm/mach-orion/ts209-setup.c
@@ -27,7 +27,6 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <asm/arch/orion.h>
-#include <asm/arch/platform.h>
 #include "common.h"
 
 #define QNAP_TS209_NOR_BOOT_BASE 0xf4000000

diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
index 4a3c6759492b95b4a18150c0f63003f9e2ee211c..959fb86cda01e113aca653ef91c646b26f954aa3 100644 (file)
--- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig
@@ -314,7 +314,7 @@ config MTD_ALAUDA
 
 config MTD_NAND_ORION
        tristate "NAND Flash support for Marvell Orion SoC"
-       depends on ARCH_ORION && MTD_NAND
+       depends on PLAT_ORION && MTD_NAND
        help
          This enables the NAND flash controller on Orion machines.
 

diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index 9162cca0182b55e7e10be13483512d33a948dda6..ec5ad28b237ef338859b072157b7a24f00b32507 100644 (file)
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -18,8 +18,8 @@
 #include <linux/mtd/partitions.h>
 #include <asm/io.h>
 #include <asm/sizes.h>
-#include <asm/arch/platform.h>
 #include <asm/arch/hardware.h>
+#include <asm/plat-orion/orion_nand.h>
 
 #ifdef CONFIG_MTD_CMDLINE_PARTS
 static const char *part_probes[] = { "cmdlinepart", NULL };

diff --git a/include/asm-arm/arch-orion/platform.h b/include/asm-arm/arch-orion/platform.h
deleted file mode 100644 (file)
index 4e09c6c..0000000
--- a/include/asm-arm/arch-orion/platform.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * asm-arm/arch-orion/platform.h
- *
- * Tzachi Perelstein <tzachi@marvell.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __ASM_ARCH_PLATFORM_H__
-#define __ASM_ARCH_PLATFORM_H__
-
-/*
- * Device bus NAND private data
- */
-struct orion_nand_data {
-       struct mtd_partition *parts;
-       u32 nr_parts;
-       u8 ale;         /* address line number connected to ALE */
-       u8 cle;         /* address line number connected to CLE */
-       u8 width;       /* buswidth */
-};
-
-
-#endif

diff --git a/include/asm-arm/plat-orion/orion_nand.h b/include/asm-arm/plat-orion/orion_nand.h
new file mode 100644 (file)
index 0000000..ffd3852
--- /dev/null
+++ b/include/asm-arm/plat-orion/orion_nand.h
@@ -0,0 +1,24 @@
+/*
+ * include/asm-arm/plat-orion/orion_nand.h
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#ifndef __ASM_PLAT_ORION_ORION_NAND_H
+#define __ASM_PLAT_ORION_ORION_NAND_H
+
+/*
+ * Device bus NAND private data
+ */
+struct orion_nand_data {
+       struct mtd_partition *parts;
+       u32 nr_parts;
+       u8 ale;         /* address line number connected to ALE */
+       u8 cle;         /* address line number connected to CLE */
+       u8 width;       /* buswidth */
+};
+
+
+#endif