[ARM] 3087/1: PXA2xx flash platform device conversion

Patch from Todd Poynor

Add platform devices for flash to Lubbock and Mainstone board files.
Once in place, the two existing mtd map drivers for the boards will be
converted to use a single pxa2xx map driver in the linux-mtd tree.
Take 4: flash_platform_data .map_name vs. .name cleaned up, resync with
merged irda patch context.

Signed-off-by: Todd Poynor <tpoynor@mvista.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

2 files changed, 168 insertions, 2 deletions

diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index 9c6e77faec5..b464bc88ff9 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -19,16 +19,20 @@
 #include <linux/major.h>
 #include <linux/fb.h>
 #include <linux/interrupt.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
+#include <asm/sizes.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
 
 #include <asm/hardware/sa1111.h>
 
@@ -199,10 +203,75 @@ static struct platform_device smc91x_device = {
         .resource       = smc91x_resources,
 };
 
+static struct resource flash_resources[] = {
+        [0] = {
+                .start  = 0x00000000,
+                .end    = SZ_64M - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 0x04000000,
+                .end    = 0x04000000 + SZ_64M - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct mtd_partition lubbock_partitions[] = {
+        {
+                .name =         "Bootloader",
+                .size =         0x00040000,
+                .offset =       0,
+                .mask_flags =   MTD_WRITEABLE  /* force read-only */
+        },{
+                .name =         "Kernel",
+                .size =         0x00100000,
+                .offset =       0x00040000,
+        },{
+                .name =         "Filesystem",
+                .size =         MTDPART_SIZ_FULL,
+                .offset =       0x00140000
+        }
+};
+
+static struct flash_platform_data lubbock_flash_data[2] = {
+        {
+                .map_name       = "cfi_probe",
+                .parts          = lubbock_partitions,
+                .nr_parts       = ARRAY_SIZE(lubbock_partitions),
+        }, {
+                .map_name       = "cfi_probe",
+                .parts          = NULL,
+                .nr_parts       = 0,
+        }
+};
+
+static struct platform_device lubbock_flash_device[2] = {
+        {
+                .name           = "pxa2xx-flash",
+                .id             = 0,
+                .dev = {
+                        .platform_data = &lubbock_flash_data[0],
+                },
+                .resource = &flash_resources[0],
+                .num_resources = 1,
+        },
+        {
+                .name           = "pxa2xx-flash",
+                .id             = 1,
+                .dev = {
+                        .platform_data = &lubbock_flash_data[1],
+                },
+                .resource = &flash_resources[1],
+                .num_resources = 1,
+        },
+};
+
 static struct platform_device *devices[] __initdata = {
         &sa1111_device,
         &lub_audio_device,
         &smc91x_device,
+        &lubbock_flash_device[0],
+        &lubbock_flash_device[1],
 };
 
 static struct pxafb_mach_info sharp_lm8v31 __initdata = {
@@ -315,10 +384,21 @@ static struct pxaficp_platform_data lubbock_ficp_platform_data = {
 
 static void __init lubbock_init(void)
 {
+        int flashboot = (LUB_CONF_SWITCHES & 1);
+
         pxa_set_udc_info(&udc_info);
         set_pxa_fb_info(&sharp_lm8v31);
         pxa_set_mci_info(&lubbock_mci_platform_data);
         pxa_set_ficp_info(&lubbock_ficp_platform_data);
+
+        lubbock_flash_data[0].width = lubbock_flash_data[1].width =
+                (BOOT_DEF & 1) ? 2 : 4;
+        /* Compensate for the nROMBT switch which swaps the flash banks */
+        printk(KERN_NOTICE "Lubbock configured to boot from %s (bank %d)\n",
+               flashboot?"Flash":"ROM", flashboot);
+
+        lubbock_flash_data[flashboot^1].name = "application-flash";
+        lubbock_flash_data[flashboot].name = "boot-rom";
         (void) platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index 887a8cb7b72..07892f4012d 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -20,6 +20,9 @@
 #include <linux/sched.h>
 #include <linux/bitops.h>
 #include <linux/fb.h>
+#include <linux/ioport.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
 
 #include <asm/types.h>
 #include <asm/setup.h>
@@ -27,10 +30,12 @@
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
+#include <asm/sizes.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
 
 #include <asm/arch/pxa-regs.h>
 #include <asm/arch/mainstone.h>
@@ -190,6 +195,69 @@ static struct platform_device mst_audio_device = {
         .dev            = { .platform_data = &mst_audio_ops },
 };
 
+static struct resource flash_resources[] = {
+        [0] = {
+                .start  = PXA_CS0_PHYS,
+                .end    = PXA_CS0_PHYS + SZ_64M - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = PXA_CS1_PHYS,
+                .end    = PXA_CS1_PHYS + SZ_64M - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct mtd_partition mainstoneflash0_partitions[] = {
+        {
+                .name =         "Bootloader",
+                .size =         0x00040000,
+                .offset =       0,
+                .mask_flags =   MTD_WRITEABLE  /* force read-only */
+        },{
+                .name =         "Kernel",
+                .size =         0x00400000,
+                .offset =       0x00040000,
+        },{
+                .name =         "Filesystem",
+                .size =         MTDPART_SIZ_FULL,
+                .offset =       0x00440000
+        }
+};
+
+static struct flash_platform_data mst_flash_data[2] = {
+        {
+                .map_name       = "cfi_probe",
+                .parts          = mainstoneflash0_partitions,
+                .nr_parts       = ARRAY_SIZE(mainstoneflash0_partitions),
+        }, {
+                .map_name       = "cfi_probe",
+                .parts          = NULL,
+                .nr_parts       = 0,
+        }
+};
+
+static struct platform_device mst_flash_device[2] = {
+        {
+                .name           = "pxa2xx-flash",
+                .id             = 0,
+                .dev = {
+                        .platform_data = &mst_flash_data[0],
+                },
+                .resource = &flash_resources[0],
+                .num_resources = 1,
+        },
+        {
+                .name           = "pxa2xx-flash",
+                .id             = 1,
+                .dev = {
+                        .platform_data = &mst_flash_data[1],
+                },
+                .resource = &flash_resources[1],
+                .num_resources = 1,
+        },
+};
+
 static void mainstone_backlight_power(int on)
 {
         if (on) {
@@ -318,16 +386,34 @@ static struct pxaficp_platform_data mainstone_ficp_platform_data = {
         .transceiver_mode = mainstone_irda_transceiver_mode,
 };
 
+static struct platform_device *platform_devices[] __initdata = {
+        &smc91x_device,
+        &mst_audio_device,
+        &mst_flash_device[0],
+        &mst_flash_device[1],
+};
+
 static void __init mainstone_init(void)
 {
+        int SW7 = 0;  /* FIXME: get from SCR (Mst doc section 3.2.1.1) */
+
+        mst_flash_data[0].width = (BOOT_DEF & 1) ? 2 : 4;
+        mst_flash_data[1].width = 4;
+
+        /* Compensate for SW7 which swaps the flash banks */
+        mst_flash_data[SW7].name = "processor-flash";
+        mst_flash_data[SW7 ^ 1].name = "mainboard-flash";
+
+        printk(KERN_NOTICE "Mainstone configured to boot from %s\n",
+               mst_flash_data[0].name);
+
         /*
          * On Mainstone, we route AC97_SYSCLK via GPIO45 to
          * the audio daughter card
          */
         pxa_gpio_mode(GPIO45_SYSCLK_AC97_MD);
 
-        platform_device_register(&smc91x_device);
-        platform_device_register(&mst_audio_device);
+        platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
 
         /* reading Mainstone's "Virtual Configuration Register"
            might be handy to select LCD type here */