3 files changed, 48 insertions, 4 deletions

diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index dcd417625389..bf6bd71bdd08 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -103,7 +103,8 @@ static int ep93xx_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
         write_seqlock(&xtime_lock);
 
         __raw_writel(1, EP93XX_TIMER1_CLEAR);
-        while (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time
+        while ((signed long)
+                (__raw_readl(EP93XX_TIMER4_VALUE_LOW) - last_jiffy_time)
                                                 >= TIMER4_TICKS_PER_JIFFY) {
                 last_jiffy_time += TIMER4_TICKS_PER_JIFFY;
                 timer_tick(regs);
@@ -124,7 +125,7 @@ static void __init ep93xx_timer_init(void)
 {
         /* Enable periodic HZ timer.  */
         __raw_writel(0x48, EP93XX_TIMER1_CONTROL);
-        __raw_writel((508000 / HZ) - 1, EP93XX_TIMER1_LOAD);
+        __raw_writel((508469 / HZ) - 1, EP93XX_TIMER1_LOAD);
         __raw_writel(0xc8, EP93XX_TIMER1_CONTROL);
 
         /* Enable lost jiffy timer.  */
diff --git a/arch/arm/mach-ep93xx/gesbc9312.c b/arch/arm/mach-ep93xx/gesbc9312.c
index d18fcb1a2f1b..47cc6c8b7c79 100644
--- a/arch/arm/mach-ep93xx/gesbc9312.c
+++ b/arch/arm/mach-ep93xx/gesbc9312.c
@@ -16,16 +16,38 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
+#include <linux/ioport.h>
 #include <linux/mtd/physmap.h>
+#include <linux/platform_device.h>
 #include <asm/io.h>
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+static struct physmap_flash_data gesbc9312_flash_data = {
+        .width          = 4,
+};
+
+static struct resource gesbc9312_flash_resource = {
+        .start          = 0x60000000,
+        .end            = 0x60800000,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device gesbc9312_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &gesbc9312_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &gesbc9312_flash_resource,
+};
+
 static void __init gesbc9312_init_machine(void)
 {
         ep93xx_init_devices();
-        physmap_configure(0x60000000, 0x00800000, 4, NULL);
+        platform_device_register(&gesbc9312_flash);
 }
 
 MACHINE_START(GESBC9312, "Glomation GESBC-9312-sx")
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c
index e24566b88a78..6e5a56cd5ae8 100644
--- a/arch/arm/mach-ep93xx/ts72xx.c
+++ b/arch/arm/mach-ep93xx/ts72xx.c
@@ -16,6 +16,7 @@
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/interrupt.h>
+#include <linux/ioport.h>
 #include <linux/mtd/physmap.h>
 #include <linux/platform_device.h>
 #include <linux/m48t86.h>
@@ -111,6 +112,26 @@ static void __init ts72xx_map_io(void)
         }
 }
 
+static struct physmap_flash_data ts72xx_flash_data = {
+        .width          = 1,
+};
+
+static struct resource ts72xx_flash_resource = {
+        .start          = TS72XX_NOR_PHYS_BASE,
+        .end            = TS72XX_NOR_PHYS_BASE + 0x01000000,
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device ts72xx_flash = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &ts72xx_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &ts72xx_flash_resource,
+};
+
 static unsigned char ts72xx_rtc_readbyte(unsigned long addr)
 {
         __raw_writeb(addr, TS72XX_RTC_INDEX_VIRT_BASE);
@@ -141,7 +162,7 @@ static void __init ts72xx_init_machine(void)
 {
         ep93xx_init_devices();
         if (board_is_ts7200())
-                physmap_configure(TS72XX_NOR_PHYS_BASE, 0x01000000, 1, NULL);
+                platform_device_register(&ts72xx_flash);
         platform_device_register(&ts72xx_rtc_device);
 }