Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...

1 files changed, 48 insertions, 8 deletions

diff --git a/arch/arm/mach-w90x900/mach-w90p910evb.c b/arch/arm/mach-w90x900/mach-w90p910evb.c
index 9ebc93f48530..726ff6798a56 100644
--- a/arch/arm/mach-w90x900/mach-w90p910evb.c
+++ b/arch/arm/mach-w90x900/mach-w90p910evb.c
@@ -22,6 +22,7 @@
 #include <linux/timer.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -32,28 +33,67 @@
 #include <mach/map.h>
 
 #include "cpu.h"
+/*w90p910 evb norflash driver data */
 
-static struct map_desc w90p910_iodesc[] __initdata = {
+#define W90P910_FLASH_BASE      0xA0000000
+#define W90P910_FLASH_SIZE      0x400000
+
+static struct mtd_partition w90p910_flash_partitions[] = {
+        {
+                .name   =       "NOR Partition 1 for kernel (960K)",
+                .size   =       0xF0000,
+                .offset =       0x10000,
+        },
+        {
+                .name   =       "NOR Partition 2 for image (1M)",
+                .size   =       0x100000,
+                .offset =       0x100000,
+        },
+        {
+                .name   =       "NOR Partition 3 for user (2M)",
+                .size   =       0x200000,
+                .offset =       0x00200000,
+        }
 };
 
-static struct w90x900_uartcfg w90p910_uartcfgs[] = {
-        W90X900_UARTCFG(0, 0, 0, 0, 0),
-        W90X900_UARTCFG(1, 0, 0, 0, 0),
-        W90X900_UARTCFG(2, 0, 0, 0, 0),
-        W90X900_UARTCFG(3, 0, 0, 0, 0),
-        W90X900_UARTCFG(4, 0, 0, 0, 0),
+static struct physmap_flash_data w90p910_flash_data = {
+        .width          =       2,
+        .parts          =       w90p910_flash_partitions,
+        .nr_parts       =       ARRAY_SIZE(w90p910_flash_partitions),
+};
+
+static struct resource w90p910_flash_resources[] = {
+        {
+                .start  =       W90P910_FLASH_BASE,
+                .end    =       W90P910_FLASH_BASE + W90P910_FLASH_SIZE - 1,
+                .flags  =       IORESOURCE_MEM,
+        }
+};
+
+static struct platform_device w90p910_flash_device = {
+        .name           =       "physmap-flash",
+        .id             =       0,
+        .dev            = {
+                                .platform_data = &w90p910_flash_data,
+                        },
+        .resource       =       w90p910_flash_resources,
+        .num_resources  =       ARRAY_SIZE(w90p910_flash_resources),
+};
+
+static struct map_desc w90p910_iodesc[] __initdata = {
 };
 
 /*Here should be your evb resourse,such as LCD*/
 
 static struct platform_device *w90p910evb_dev[] __initdata = {
+        &w90p910_serial_device,
+        &w90p910_flash_device,
 };
 
 static void __init w90p910evb_map_io(void)
 {
         w90p910_map_io(w90p910_iodesc, ARRAY_SIZE(w90p910_iodesc));
         w90p910_init_clocks(0);
-        w90p910_init_uarts(w90p910_uartcfgs, ARRAY_SIZE(w90p910_uartcfgs));
 }
 
 static void __init w90p910evb_init(void)