[MTD] [NAND] drivers/mtd/nand/nandsim.c: fix printk warnings

[pandora-kernel.git] / arch / sh / boards / se / 7343 / setup.c

diff --git a/arch/sh/boards/se/7343/setup.c b/arch/sh/boards/se/7343/setup.c
index c9431b3..8ae718d 100644 (file)
--- a/arch/sh/boards/se/7343/setup.c
+++ b/arch/sh/boards/se/7343/setup.c
@@ -1,10 +1,11 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
 #include <asm/machvec.h>
 #include <asm/mach/se7343.h>
+#include <asm/heartbeat.h>
 #include <asm/irq.h>
-
-void init_7343se_IRQ(void);
+#include <asm/io.h>
 
 static struct resource smc91x_resources[] = {
        [0] = {
@@ -17,8 +18,8 @@ static struct resource smc91x_resources[] = {
                 * shared with other devices via externel
                 * interrupt controller in FPGA...
                 */
-               .start  = EXT_IRQ2,
-               .end    = EXT_IRQ2,
+               .start  = SMC_IRQ,
+               .end    = SMC_IRQ,
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -38,16 +39,65 @@ static struct resource heartbeat_resources[] = {
        },
 };
 
+static struct heartbeat_data heartbeat_data = {
+       .regsize = 16,
+};
+
 static struct platform_device heartbeat_device = {
        .name           = "heartbeat",
        .id             = -1,
+       .dev = {
+               .platform_data = &heartbeat_data,
+       },
        .num_resources  = ARRAY_SIZE(heartbeat_resources),
        .resource       = heartbeat_resources,
 };
 
+static struct mtd_partition nor_flash_partitions[] = {
+       {
+               .name           = "loader",
+               .offset         = 0x00000000,
+               .size           = 128 * 1024,
+       },
+       {
+               .name           = "rootfs",
+               .offset         = MTDPART_OFS_APPEND,
+               .size           = 31 * 1024 * 1024,
+       },
+       {
+               .name           = "data",
+               .offset         = MTDPART_OFS_APPEND,
+               .size           = MTDPART_SIZ_FULL,
+       },
+};
+
+static struct physmap_flash_data nor_flash_data = {
+       .width          = 2,
+       .parts          = nor_flash_partitions,
+       .nr_parts       = ARRAY_SIZE(nor_flash_partitions),
+};
+
+static struct resource nor_flash_resources[] = {
+       [0]     = {
+               .start  = 0x00000000,
+               .end    = 0x01ffffff,
+               .flags  = IORESOURCE_MEM,
+       }
+};
+
+static struct platform_device nor_flash_device = {
+       .name           = "physmap-flash",
+       .dev            = {
+               .platform_data  = &nor_flash_data,
+       },
+       .num_resources  = ARRAY_SIZE(nor_flash_resources),
+       .resource       = nor_flash_resources,
+};
+
 static struct platform_device *sh7343se_platform_devices[] __initdata = {
        &smc91x_device,
        &heartbeat_device,
+       &nor_flash_device,
 };
 
 static int __init sh7343se_devices_setup(void)
@@ -55,10 +105,19 @@ static int __init sh7343se_devices_setup(void)
        return platform_add_devices(sh7343se_platform_devices,
                                    ARRAY_SIZE(sh7343se_platform_devices));
 }
+device_initcall(sh7343se_devices_setup);
 
+/*
+ * Initialize the board
+ */
 static void __init sh7343se_setup(char **cmdline_p)
 {
-       device_initcall(sh7343se_devices_setup);
+       ctrl_outw(0xf900, FPGA_OUT);    /* FPGA */
+
+       ctrl_outw(0x0002, PORT_PECR);   /* PORT E 1 = IRQ5 */
+       ctrl_outw(0x0020, PORT_PSELD);
+
+       printk(KERN_INFO "MS7343CP01 Setup...done\n");
 }
 
 /*
@@ -90,5 +149,4 @@ static struct sh_machine_vector mv_7343se __initmv = {
        .mv_outsl = sh7343se_outsl,
 
        .mv_init_irq = init_7343se_IRQ,
-       .mv_irq_demux = shmse_irq_demux,
 };