Merge branch 'master'

[linux-2.6] / arch / arm / mach-sa1100 / jornada720.c

diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index eee3cbc5ec4f4d3a7bd9e0fcde4fc74e746c0454..2f671cc3cb99f793a1a186ccae7eeffebd699883 100644 (file)
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -6,8 +6,10 @@
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/delay.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/ioport.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
 
 #include <asm/hardware.h>
 #include <asm/hardware/sa1111.h>
@@ -16,6 +18,7 @@
 #include <asm/setup.h>
 
 #include <asm/mach/arch.h>
+#include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
 
@@ -81,10 +84,22 @@ static int __init jornada720_init(void)
 arch_initcall(jornada720_init);
 
 static struct map_desc jornada720_io_desc[] __initdata = {
- /* virtual     physical    length      type */
-  { 0xf0000000, 0x48000000, 0x00100000, MT_DEVICE }, /* Epson registers */
-  { 0xf1000000, 0x48200000, 0x00100000, MT_DEVICE }, /* Epson frame buffer */
-  { 0xf4000000, 0x40000000, 0x00100000, MT_DEVICE }  /* SA-1111 */
+       {       /* Epson registers */
+               .virtual        =  0xf0000000,
+               .pfn            = __phys_to_pfn(0x48000000),
+               .length         = 0x00100000,
+               .type           = MT_DEVICE
+       }, {    /* Epson frame buffer */
+               .virtual        =  0xf1000000,
+               .pfn            = __phys_to_pfn(0x48200000),
+               .length         = 0x00100000,
+               .type           = MT_DEVICE
+       }, {    /* SA-1111 */
+               .virtual        =  0xf4000000,
+               .pfn            = __phys_to_pfn(0x40000000),
+               .length         = 0x00100000,
+               .type           = MT_DEVICE
+       }
 };
 
 static void __init jornada720_map_io(void)
@@ -96,7 +111,68 @@ static void __init jornada720_map_io(void)
        sa1100_register_uart(1, 1);
 }
 
+static struct mtd_partition jornada720_partitions[] = {
+       {
+               .name           = "JORNADA720 boot firmware",
+               .size           = 0x00040000,
+               .offset         = 0,
+               .mask_flags     = MTD_WRITEABLE,  /* force read-only */
+       }, {
+               .name           = "JORNADA720 kernel",
+               .size           = 0x000c0000,
+               .offset         = 0x00040000,
+       }, {
+               .name           = "JORNADA720 params",
+               .size           = 0x00040000,
+               .offset         = 0x00100000,
+       }, {
+               .name           = "JORNADA720 initrd",
+               .size           = 0x00100000,
+               .offset         = 0x00140000,
+       }, {
+               .name           = "JORNADA720 root cramfs",
+               .size           = 0x00300000,
+               .offset         = 0x00240000,
+       }, {
+               .name           = "JORNADA720 usr cramfs",
+               .size           = 0x00800000,
+               .offset         = 0x00540000,
+       }, {
+               .name           = "JORNADA720 usr local",
+               .size           = 0,  /* will expand to the end of the flash */
+               .offset         = 0x00d00000,
+       }
+};
+
+static void jornada720_set_vpp(int vpp)
+{
+       if (vpp)
+               PPSR |= 0x80;
+       else
+               PPSR &= ~0x80;
+       PPDR |= 0x80;
+}
+
+static struct flash_platform_data jornada720_flash_data = {
+       .map_name       = "cfi_probe",
+       .set_vpp        = jornada720_set_vpp,
+       .parts          = jornada720_partitions,
+       .nr_parts       = ARRAY_SIZE(jornada720_partitions),
+};
+
+static struct resource jornada720_flash_resource = {
+       .start          = SA1100_CS0_PHYS,
+       .end            = SA1100_CS0_PHYS + SZ_32M - 1,
+       .flags          = IORESOURCE_MEM,
+};
+
+static void __init jornada720_mach_init(void)
+{
+       sa11x0_set_flash_data(&jornada720_flash_data, &jornada720_flash_resource, 1);
+}
+
 MACHINE_START(JORNADA720, "HP Jornada 720")
+       /* Maintainer: Michael Gernoth <michael@gernoth.net> */
        .phys_ram       = 0xc0000000,
        .phys_io        = 0x80000000,
        .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
@@ -104,4 +180,5 @@ MACHINE_START(JORNADA720, "HP Jornada 720")
        .map_io         = jornada720_map_io,
        .init_irq       = sa1100_init_irq,
        .timer          = &sa1100_timer,
+       .init_machine   = jornada720_mach_init,
 MACHINE_END