[ARM] S3C24XX: Add physmap device for all Simtec NOR equiped boards.

Move to using the physmap platform device code to attached NOR
flash on Simtec boards so that the old bast-flash driver can be
safely removed.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>

1 files changed, 4 insertions, 18 deletions

diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index 093be00c8eb5..2a512e863141 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -57,7 +57,9 @@
 #include <asm/plat-s3c24xx/clock.h>
 #include <asm/plat-s3c24xx/devs.h>
 #include <asm/plat-s3c24xx/cpu.h>
+
 #include "usb-simtec.h"
+#include "nor-simtec.h"
 
 #define COPYRIGHT ", (c) 2004-2005 Simtec Electronics"
 
@@ -203,23 +205,6 @@ static struct s3c2410_uartcfg bast_uartcfgs[] __initdata = {
         }
 };
 
-/* NOR Flash on BAST board */
-
-static struct resource bast_nor_resource[] = {
-        [0] = {
-                .start = S3C2410_CS1 + 0x4000000,
-                .end   = S3C2410_CS1 + 0x4000000 + (32*1024*1024) - 1,
-                .flags = IORESOURCE_MEM,
-        }
-};
-
-static struct platform_device bast_device_nor = {
-        .name           = "bast-nor",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(bast_nor_resource),
-        .resource       = bast_nor_resource,
-};
-
 /* NAND Flash on BAST board */
 
 #ifdef CONFIG_PM
@@ -559,7 +544,6 @@ static struct platform_device *bast_devices[] __initdata = {
         &s3c_device_i2c,
         &s3c_device_rtc,
         &s3c_device_nand,
-        &bast_device_nor,
         &bast_device_dm9k,
         &bast_device_asix,
         &bast_device_axpp,
@@ -608,6 +592,8 @@ static void __init bast_init(void)
 
         s3c24xx_fb_set_platdata(&bast_fb_info);
         platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices));
+
+        nor_simtec_init();
 }
 
 MACHINE_START(BAST, "Simtec-BAST")