]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
sh: Move out individual boards without mach groups.
authorPaul Mundt <lethal@linux-sh.org>
Tue, 29 Jul 2008 15:13:39 +0000 (00:13 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 29 Jul 2008 15:13:39 +0000 (00:13 +0900)
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
23 files changed:
arch/sh/Makefile
arch/sh/boards/Kconfig
arch/sh/boards/Makefile [new file with mode: 0644]
arch/sh/boards/board-ap325rxa.c [new file with mode: 0644]
arch/sh/boards/board-magicpanelr2.c [new file with mode: 0644]
arch/sh/boards/board-rsk7203.c [new file with mode: 0644]
arch/sh/boards/board-sh7785lcr.c [new file with mode: 0644]
arch/sh/boards/board-shmin.c [new file with mode: 0644]
arch/sh/boards/mach-ap325rxa/Makefile [deleted file]
arch/sh/boards/mach-ap325rxa/setup.c [deleted file]
arch/sh/boards/mach-magicpanelr2/Kconfig [deleted file]
arch/sh/boards/mach-magicpanelr2/Makefile [deleted file]
arch/sh/boards/mach-magicpanelr2/setup.c [deleted file]
arch/sh/boards/mach-rsk7203/Makefile [deleted file]
arch/sh/boards/mach-rsk7203/setup.c [deleted file]
arch/sh/boards/mach-se/7619/Makefile [deleted file]
arch/sh/boards/mach-se/7619/setup.c [deleted file]
arch/sh/boards/mach-se/Makefile
arch/sh/boards/mach-se/board-se7619.c [new file with mode: 0644]
arch/sh/boards/mach-sh7785lcr/Makefile [deleted file]
arch/sh/boards/mach-sh7785lcr/setup.c [deleted file]
arch/sh/boards/mach-shmin/Makefile [deleted file]
arch/sh/boards/mach-shmin/setup.c [deleted file]

index fafc01236f6a7cb0f47f1c56d5a599374ad9af5e..6c93b948713352622abedb1d1fd714d467b2ac7d 100644 (file)
@@ -97,10 +97,10 @@ head-$(CONFIG_SUPERH64)     += arch/sh/kernel/head_64.o
 
 LIBGCC := $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
 
-core-y                         += arch/sh/kernel/ arch/sh/mm/
+core-y                         += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/
 core-$(CONFIG_SH_FPU_EMU)      += arch/sh/math-emu/
 
-# Boards and Mach groups
+# Mach groups
 machdir-$(CONFIG_SOLUTION_ENGINE)              += mach-se
 machdir-$(CONFIG_SH_HP6XX)                     += mach-hp6xx
 machdir-$(CONFIG_SH_DREAMCAST)                 += mach-dreamcast
@@ -114,15 +114,11 @@ machdir-$(CONFIG_SH_MIGOR)                        += mach-migor
 machdir-$(CONFIG_SH_SDK7780)                   += mach-sdk7780
 machdir-$(CONFIG_SH_X3PROTO)                   += mach-x3proto
 machdir-$(CONFIG_SH_RSK7203)                   += mach-rsk7203
-machdir-$(CONFIG_SH_AP325RXA)                  += mach-ap325rxa
 machdir-$(CONFIG_SH_SH7763RDP)                 += mach-sh7763rdp
-machdir-$(CONFIG_SH_SH7785LCR)                 += mach-sh7785lcr
 machdir-$(CONFIG_SH_SH4202_MICRODEV)           += mach-microdev
 machdir-$(CONFIG_SH_LANDISK)                   += mach-landisk
 machdir-$(CONFIG_SH_TITAN)                     += mach-titan
-machdir-$(CONFIG_SH_SHMIN)                     += mach-shmin
 machdir-$(CONFIG_SH_LBOX_RE2)                  += mach-lboxre2
-machdir-$(CONFIG_SH_MAGIC_PANEL_R2)            += mach-magicpanelr2
 machdir-$(CONFIG_SH_CAYMAN)                    += mach-cayman
 
 ifneq ($(machdir-y),)
index 324c25ac95ce430e512fdaf1617a6fa2a04ea3b2..ae194869fd60af8b465fe4b0a087eee872b65278 100644 (file)
@@ -242,4 +242,17 @@ source "arch/sh/boards/mach-r2d/Kconfig"
 source "arch/sh/boards/mach-highlander/Kconfig"
 source "arch/sh/boards/mach-sdk7780/Kconfig"
 source "arch/sh/boards/mach-migor/Kconfig"
-source "arch/sh/boards/mach-magicpanelr2/Kconfig"
+
+if SH_MAGIC_PANEL_R2
+
+menu "Magic Panel R2 options"
+
+config SH_MAGIC_PANEL_R2_VERSION
+       int SH_MAGIC_PANEL_R2_VERSION
+       default "3"
+       help
+         Set the version of the Magic Panel R2
+
+endmenu
+
+endif
diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile
new file mode 100644 (file)
index 0000000..ff9b93c
--- /dev/null
@@ -0,0 +1,8 @@
+#
+# Specific board support, not covered by a mach group.
+#
+obj-$(CONFIG_SH_AP325RXA)      += board-ap325rxa.o
+obj-$(CONFIG_SH_MAGIC_PANEL_R2)        += board-magicpanelr2.o
+obj-$(CONFIG_SH_RSK7203)       += board-rsk7203.o
+obj-$(CONFIG_SH_SH7785LCR)     += board-sh7785lcr.o
+obj-$(CONFIG_SH_SHMIN)         += board-shmin..o
diff --git a/arch/sh/boards/board-ap325rxa.c b/arch/sh/boards/board-ap325rxa.c
new file mode 100644 (file)
index 0000000..9c71603
--- /dev/null
@@ -0,0 +1,317 @@
+/*
+ * Renesas - AP-325RXA
+ * (Compatible with Algo System ., LTD. - AP-320A)
+ *
+ * Copyright (C) 2008 Renesas Solutions Corp.
+ * Author : Yusuke Goda <goda.yuske@renesas.com>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include <linux/smc911x.h>
+#include <media/soc_camera_platform.h>
+#include <media/sh_mobile_ceu.h>
+#include <asm/sh_mobile_lcdc.h>
+#include <asm/io.h>
+#include <asm/clock.h>
+
+static struct smc911x_platdata smc911x_info = {
+       .flags = SMC911X_USE_32BIT,
+       .irq_flags = IRQF_TRIGGER_LOW,
+};
+
+static struct resource smc9118_resources[] = {
+       [0] = {
+               .start  = 0xb6080000,
+               .end    = 0xb60fffff,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = 35,
+               .end    = 35,
+               .flags  = IORESOURCE_IRQ,
+       }
+};
+
+static struct platform_device smc9118_device = {
+       .name           = "smc911x",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(smc9118_resources),
+       .resource       = smc9118_resources,
+       .dev            = {
+               .platform_data = &smc911x_info,
+       },
+};
+
+static struct mtd_partition ap325rxa_nor_flash_partitions[] = {
+       {
+                .name = "uboot",
+                .offset = 0,
+                .size = (1 * 1024 * 1024),
+                .mask_flags = MTD_WRITEABLE,   /* Read-only */
+       }, {
+                .name = "kernel",
+                .offset = MTDPART_OFS_APPEND,
+                .size = (2 * 1024 * 1024),
+       }, {
+                .name = "other",
+                .offset = MTDPART_OFS_APPEND,
+                .size = MTDPART_SIZ_FULL,
+       },
+};
+
+static struct physmap_flash_data ap325rxa_nor_flash_data = {
+       .width          = 2,
+       .parts          = ap325rxa_nor_flash_partitions,
+       .nr_parts       = ARRAY_SIZE(ap325rxa_nor_flash_partitions),
+};
+
+static struct resource ap325rxa_nor_flash_resources[] = {
+       [0] = {
+               .name   = "NOR Flash",
+               .start  = 0x00000000,
+               .end    = 0x00ffffff,
+               .flags  = IORESOURCE_MEM,
+       }
+};
+
+static struct platform_device ap325rxa_nor_flash_device = {
+       .name           = "physmap-flash",
+       .resource       = ap325rxa_nor_flash_resources,
+       .num_resources  = ARRAY_SIZE(ap325rxa_nor_flash_resources),
+       .dev            = {
+               .platform_data = &ap325rxa_nor_flash_data,
+       },
+};
+
+#define FPGA_LCDREG    0xB4100180
+#define FPGA_BKLREG    0xB4100212
+#define FPGA_LCDREG_VAL        0x0018
+#define PORT_PHCR      0xA405010E
+#define PORT_PLCR      0xA4050114
+#define PORT_PMCR      0xA4050116
+#define PORT_PRCR      0xA405011C
+#define PORT_PSCR      0xA405011E
+#define PORT_PZCR      0xA405014C
+#define PORT_HIZCRA    0xA4050158
+#define PORT_MSELCRB   0xA4050182
+#define PORT_PSDR      0xA405013E
+#define PORT_PZDR      0xA405016C
+#define PORT_PSELD     0xA4050154
+
+static void ap320_wvga_power_on(void *board_data)
+{
+       msleep(100);
+
+       /* ASD AP-320/325 LCD ON */
+       ctrl_outw(FPGA_LCDREG_VAL, FPGA_LCDREG);
+
+       /* backlight */
+       ctrl_outw((ctrl_inw(PORT_PSCR) & ~0x00C0) | 0x40, PORT_PSCR);
+       ctrl_outb(ctrl_inb(PORT_PSDR) & ~0x08, PORT_PSDR);
+       ctrl_outw(0x100, FPGA_BKLREG);
+}
+
+static struct sh_mobile_lcdc_info lcdc_info = {
+       .clock_source = LCDC_CLK_EXTERNAL,
+       .ch[0] = {
+               .chan = LCDC_CHAN_MAINLCD,
+               .bpp = 16,
+               .interface_type = RGB18,
+               .clock_divider = 1,
+               .lcd_cfg = {
+                       .name = "LB070WV1",
+                       .xres = 800,
+                       .yres = 480,
+                       .left_margin = 40,
+                       .right_margin = 160,
+                       .hsync_len = 8,
+                       .upper_margin = 63,
+                       .lower_margin = 80,
+                       .vsync_len = 1,
+                       .sync = 0, /* hsync and vsync are active low */
+               },
+               .board_cfg = {
+                       .display_on = ap320_wvga_power_on,
+               },
+       }
+};
+
+static struct resource lcdc_resources[] = {
+       [0] = {
+               .name   = "LCDC",
+               .start  = 0xfe940000, /* P4-only space */
+               .end    = 0xfe941fff,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static struct platform_device lcdc_device = {
+       .name           = "sh_mobile_lcdc_fb",
+       .num_resources  = ARRAY_SIZE(lcdc_resources),
+       .resource       = lcdc_resources,
+       .dev            = {
+               .platform_data  = &lcdc_info,
+       },
+};
+
+#ifdef CONFIG_I2C
+static unsigned char camera_ncm03j_magic[] =
+{
+       0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
+       0x1D, 0x00, 0x1E, 0x8A, 0x21, 0x00, 0x33, 0x36,
+       0x36, 0x60, 0x37, 0x08, 0x3B, 0x31, 0x44, 0x0F,
+       0x46, 0xF0, 0x4B, 0x28, 0x4C, 0x21, 0x4D, 0x55,
+       0x4E, 0x1B, 0x4F, 0xC7, 0x50, 0xFC, 0x51, 0x12,
+       0x58, 0x02, 0x66, 0xC0, 0x67, 0x46, 0x6B, 0xA0,
+       0x6C, 0x34, 0x7E, 0x25, 0x7F, 0x25, 0x8D, 0x0F,
+       0x92, 0x40, 0x93, 0x04, 0x94, 0x26, 0x95, 0x0A,
+       0x99, 0x03, 0x9A, 0xF0, 0x9B, 0x14, 0x9D, 0x7A,
+       0xC5, 0x02, 0xD6, 0x07, 0x59, 0x00, 0x5A, 0x1A,
+       0x5B, 0x2A, 0x5C, 0x37, 0x5D, 0x42, 0x5E, 0x56,
+       0xC8, 0x00, 0xC9, 0x1A, 0xCA, 0x2A, 0xCB, 0x37,
+       0xCC, 0x42, 0xCD, 0x56, 0xCE, 0x00, 0xCF, 0x1A,
+       0xD0, 0x2A, 0xD1, 0x37, 0xD2, 0x42, 0xD3, 0x56,
+       0x5F, 0x68, 0x60, 0x87, 0x61, 0xA3, 0x62, 0xBC,
+       0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F,
+};
+
+static int camera_set_capture(struct soc_camera_platform_info *info,
+                             int enable)
+{
+       struct i2c_adapter *a = i2c_get_adapter(0);
+       struct i2c_msg msg;
+       int ret = 0;
+       int i;
+
+       if (!enable)
+               return 0; /* no disable for now */
+
+       for (i = 0; i < ARRAY_SIZE(camera_ncm03j_magic); i += 2) {
+               u_int8_t buf[8];
+
+               msg.addr = 0x6e;
+               msg.buf = buf;
+               msg.len = 2;
+               msg.flags = 0;
+
+               buf[0] = camera_ncm03j_magic[i];
+               buf[1] = camera_ncm03j_magic[i + 1];
+
+               ret = (ret < 0) ? ret : i2c_transfer(a, &msg, 1);
+       }
+
+       return ret;
+}
+
+static struct soc_camera_platform_info camera_info = {
+       .iface = 0,
+       .format_name = "UYVY",
+       .format_depth = 16,
+       .format = {
+               .pixelformat = V4L2_PIX_FMT_UYVY,
+               .colorspace = V4L2_COLORSPACE_SMPTE170M,
+               .width = 640,
+               .height = 480,
+       },
+       .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
+       SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
+       .set_capture = camera_set_capture,
+};
+
+static struct platform_device camera_device = {
+       .name           = "soc_camera_platform",
+       .dev            = {
+               .platform_data  = &camera_info,
+       },
+};
+#endif /* CONFIG_I2C */
+
+static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
+       .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
+       SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
+};
+
+static struct resource ceu_resources[] = {
+       [0] = {
+               .name   = "CEU",
+               .start  = 0xfe910000,
+               .end    = 0xfe91009f,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = 52,
+               .flags  = IORESOURCE_IRQ,
+       },
+       [2] = {
+               /* place holder for contiguous memory */
+       },
+};
+
+static struct platform_device ceu_device = {
+       .name           = "sh_mobile_ceu",
+       .num_resources  = ARRAY_SIZE(ceu_resources),
+       .resource       = ceu_resources,
+       .dev            = {
+               .platform_data  = &sh_mobile_ceu_info,
+       },
+};
+
+static struct platform_device *ap325rxa_devices[] __initdata = {
+       &smc9118_device,
+       &ap325rxa_nor_flash_device,
+       &lcdc_device,
+       &ceu_device,
+#ifdef CONFIG_I2C
+       &camera_device,
+#endif
+};
+
+static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
+};
+
+static int __init ap325rxa_devices_setup(void)
+{
+       clk_always_enable("mstp200"); /* LCDC */
+       clk_always_enable("mstp203"); /* CEU */
+
+       platform_resource_setup_memory(&ceu_device, "ceu", 4 << 20);
+
+       i2c_register_board_info(0, ap325rxa_i2c_devices,
+                               ARRAY_SIZE(ap325rxa_i2c_devices));
+       return platform_add_devices(ap325rxa_devices,
+                               ARRAY_SIZE(ap325rxa_devices));
+}
+device_initcall(ap325rxa_devices_setup);
+
+static void __init ap325rxa_setup(char **cmdline_p)
+{
+       /* LCDC configuration */
+       ctrl_outw(ctrl_inw(PORT_PHCR) & ~0xffff, PORT_PHCR);
+       ctrl_outw(ctrl_inw(PORT_PLCR) & ~0xffff, PORT_PLCR);
+       ctrl_outw(ctrl_inw(PORT_PMCR) & ~0xffff, PORT_PMCR);
+       ctrl_outw(ctrl_inw(PORT_PRCR) & ~0x03ff, PORT_PRCR);
+       ctrl_outw(ctrl_inw(PORT_HIZCRA) & ~0x01C0, PORT_HIZCRA);
+
+       /* CEU */
+       ctrl_outw(ctrl_inw(PORT_MSELCRB) & ~0x0001, PORT_MSELCRB);
+       ctrl_outw(ctrl_inw(PORT_PSELD) & ~0x0003, PORT_PSELD);
+       ctrl_outw((ctrl_inw(PORT_PZCR) & ~0xff00) | 0x5500, PORT_PZCR);
+       ctrl_outb((ctrl_inb(PORT_PZDR) & ~0xf0) | 0x20, PORT_PZDR);
+}
+
+static struct sh_machine_vector mv_ap325rxa __initmv = {
+       .mv_name = "AP-325RXA",
+       .mv_setup = ap325rxa_setup,
+};
diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c
new file mode 100644 (file)
index 0000000..f3b8b07
--- /dev/null
@@ -0,0 +1,394 @@
+/*
+ * linux/arch/sh/boards/magicpanel/setup.c
+ *
+ *  Copyright (C) 2007  Markus Brunner, Mark Jonas
+ *
+ *  Magic Panel Release 2 board setup
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/mtd/map.h>
+#include <asm/magicpanelr2.h>
+#include <asm/heartbeat.h>
+
+#define LAN9115_READY  (ctrl_inl(0xA8000084UL) & 0x00000001UL)
+
+/* Prefer cmdline over RedBoot */
+static const char *probes[] = { "cmdlinepart", "RedBoot", NULL };
+
+/* Wait until reset finished. Timeout is 100ms. */
+static int __init ethernet_reset_finished(void)
+{
+       int i;
+
+       if (LAN9115_READY)
+               return 1;
+
+       for (i = 0; i < 10; ++i) {
+               mdelay(10);
+               if (LAN9115_READY)
+                       return 1;
+       }
+
+       return 0;
+}
+
+static void __init reset_ethernet(void)
+{
+       /* PMDR: LAN_RESET=on */
+       CLRBITS_OUTB(0x10, PORT_PMDR);
+
+       udelay(200);
+
+       /* PMDR: LAN_RESET=off */
+       SETBITS_OUTB(0x10, PORT_PMDR);
+}
+
+static void __init setup_chip_select(void)
+{
+       /* CS2: LAN (0x08000000 - 0x0bffffff) */
+       /* no idle cycles, normal space, 8 bit data bus */
+       ctrl_outl(0x36db0400, CS2BCR);
+       /* (SW:1.5 WR:3 HW:1.5), ext. wait */
+       ctrl_outl(0x000003c0, CS2WCR);
+
+       /* CS4: CAN1 (0xb0000000 - 0xb3ffffff) */
+       /* no idle cycles, normal space, 8 bit data bus */
+       ctrl_outl(0x00000200, CS4BCR);
+       /* (SW:1.5 WR:3 HW:1.5), ext. wait */
+       ctrl_outl(0x00100981, CS4WCR);
+
+       /* CS5a: CAN2 (0xb4000000 - 0xb5ffffff) */
+       /* no idle cycles, normal space, 8 bit data bus */
+       ctrl_outl(0x00000200, CS5ABCR);
+       /* (SW:1.5 WR:3 HW:1.5), ext. wait */
+       ctrl_outl(0x00100981, CS5AWCR);
+
+       /* CS5b: CAN3 (0xb6000000 - 0xb7ffffff) */
+       /* no idle cycles, normal space, 8 bit data bus */
+       ctrl_outl(0x00000200, CS5BBCR);
+       /* (SW:1.5 WR:3 HW:1.5), ext. wait */
+       ctrl_outl(0x00100981, CS5BWCR);
+
+       /* CS6a: Rotary (0xb8000000 - 0xb9ffffff) */
+       /* no idle cycles, normal space, 8 bit data bus */
+       ctrl_outl(0x00000200, CS6ABCR);
+       /* (SW:1.5 WR:3 HW:1.5), no ext. wait */
+       ctrl_outl(0x001009C1, CS6AWCR);
+}
+
+static void __init setup_port_multiplexing(void)
+{
+       /* A7 GPO(LED8);     A6 GPO(LED7);     A5 GPO(LED6);      A4 GPO(LED5);
+        * A3 GPO(LED4);     A2 GPO(LED3);     A1 GPO(LED2);      A0 GPO(LED1);
+        */
+       ctrl_outw(0x5555, PORT_PACR);   /* 01 01 01 01 01 01 01 01 */
+
+       /* B7 GPO(RST4);   B6 GPO(RST3);  B5 GPO(RST2);    B4 GPO(RST1);
+        * B3 GPO(PB3);    B2 GPO(PB2);   B1 GPO(PB1);     B0 GPO(PB0);
+        */
+       ctrl_outw(0x5555, PORT_PBCR);   /* 01 01 01 01 01 01 01 01 */
+
+       /* C7 GPO(PC7);   C6 GPO(PC6);    C5 GPO(PC5);     C4 GPO(PC4);
+        * C3 LCD_DATA3;  C2 LCD_DATA2;   C1 LCD_DATA1;    C0 LCD_DATA0;
+        */
+       ctrl_outw(0x5500, PORT_PCCR);   /* 01 01 01 01 00 00 00 00 */
+
+       /* D7 GPO(PD7); D6 GPO(PD6);    D5 GPO(PD5);       D4 GPO(PD4);
+        * D3 GPO(PD3); D2 GPO(PD2);    D1 GPO(PD1);       D0 GPO(PD0);
+        */
+       ctrl_outw(0x5555, PORT_PDCR);   /* 01 01 01 01 01 01 01 01 */
+
+       /* E7 (x);        E6 GPI(nu);    E5 GPI(nu);      E4 LCD_M_DISP;
+        * E3 LCD_CL1;    E2 LCD_CL2;    E1 LCD_DON;      E0 LCD_FLM;
+        */
+       ctrl_outw(0x3C00, PORT_PECR);   /* 00 11 11 00 00 00 00 00 */
+
+       /* F7 (x);           F6 DA1(VLCD);     F5 DA0(nc);        F4 AN3;
+        * F3 AN2(MID_AD);   F2 AN1(EARTH_AD); F1 AN0(TEMP);      F0 GPI+(nc);
+        */
+       ctrl_outw(0x0002, PORT_PFCR);   /* 00 00 00 00 00 00 00 10 */
+
+       /* G7 (x);        G6 IRQ5(TOUCH_BUSY); G5 IRQ4(TOUCH_IRQ); G4 GPI(KEY2);
+        * G3 GPI(KEY1);  G2 GPO(LED11);        G1 GPO(LED10);     G0 GPO(LED9);
+        */
+       ctrl_outw(0x03D5, PORT_PGCR);   /* 00 00 00 11 11 01 01 01 */
+
+       /* H7 (x);            H6 /RAS(BRAS);      H5 /CAS(BCAS); H4 CKE(BCKE);
+        * H3 GPO(EARTH_OFF); H2 GPO(EARTH_TEST); H1 USB2_PWR;   H0 USB1_PWR;
+        */
+       ctrl_outw(0x0050, PORT_PHCR);   /* 00 00 00 00 01 01 00 00 */
+
+       /* J7 (x);        J6 AUDCK;        J5 ASEBRKAK;     J4 AUDATA3;
+        * J3 AUDATA2;    J2 AUDATA1;      J1 AUDATA0;      J0 AUDSYNC;
+        */
+       ctrl_outw(0x0000, PORT_PJCR);   /* 00 00 00 00 00 00 00 00 */
+
+       /* K7 (x);          K6 (x);          K5 (x);       K4 (x);
+        * K3 PINT7(/PWR2); K2 PINT6(/PWR1); K1 PINT5(nu); K0 PINT4(FLASH_READY)
+        */
+       ctrl_outw(0x00FF, PORT_PKCR);   /* 00 00 00 00 11 11 11 11 */
+
+       /* L7 TRST;        L6 TMS;           L5 TDO;              L4 TDI;
+        * L3 TCK;         L2 (x);           L1 (x);              L0 (x);
+        */
+       ctrl_outw(0x0000, PORT_PLCR);   /* 00 00 00 00 00 00 00 00 */
+
+       /* M7 GPO(CURRENT_SINK);    M6 GPO(PWR_SWITCH);     M5 GPO(LAN_SPEED);
+        * M4 GPO(LAN_RESET);       M3 GPO(BUZZER);         M2 GPO(LCD_BL);
+        * M1 CS5B(CAN3_CS);        M0 GPI+(nc);
+        */
+       ctrl_outw(0x5552, PORT_PMCR);      /* 01 01 01 01 01 01 00 10 */
+
+       /* CURRENT_SINK=off,    PWR_SWITCH=off, LAN_SPEED=100MBit,
+        * LAN_RESET=off,       BUZZER=off,     LCD_BL=off
+        */
+#if CONFIG_SH_MAGIC_PANEL_R2_VERSION == 2
+       ctrl_outb(0x30, PORT_PMDR);
+#elif CONFIG_SH_MAGIC_PANEL_R2_VERSION == 3
+       ctrl_outb(0xF0, PORT_PMDR);
+#else
+#error Unknown revision of PLATFORM_MP_R2
+#endif
+
+       /* P7 (x);             P6 (x);            P5 (x);
+        * P4 GPO(nu);         P3 IRQ3(LAN_IRQ);  P2 IRQ2(CAN3_IRQ);
+        * P1 IRQ1(CAN2_IRQ);  P0 IRQ0(CAN1_IRQ)
+        */
+       ctrl_outw(0x0100, PORT_PPCR);   /* 00 00 00 01 00 00 00 00 */
+       ctrl_outb(0x10, PORT_PPDR);
+
+       /* R7 A25;           R6 A24;         R5 A23;              R4 A22;
+        * R3 A21;           R2 A20;         R1 A19;              R0 A0;
+        */
+       ctrl_outw(0x0000, PORT_PRCR);   /* 00 00 00 00 00 00 00 00 */
+
+       /* S7 (x);              S6 (x);        S5 (x);       S4 GPO(EEPROM_CS2);
+        * S3 GPO(EEPROM_CS1);  S2 SIOF0_TXD;  S1 SIOF0_RXD; S0 SIOF0_SCK;
+        */
+       ctrl_outw(0x0140, PORT_PSCR);   /* 00 00 00 01 01 00 00 00 */
+
+       /* T7 (x);         T6 (x);        T5 (x);         T4 COM1_CTS;
+        * T3 COM1_RTS;    T2 COM1_TXD;   T1 COM1_RXD;    T0 GPO(WDOG)
+        */
+       ctrl_outw(0x0001, PORT_PTCR);   /* 00 00 00 00 00 00 00 01 */
+
+       /* U7 (x);           U6 (x);       U5 (x);        U4 GPI+(/AC_FAULT);
+        * U3 GPO(TOUCH_CS); U2 TOUCH_TXD; U1 TOUCH_RXD;  U0 TOUCH_SCK;
+        */
+       ctrl_outw(0x0240, PORT_PUCR);   /* 00 00 00 10 01 00 00 00 */
+
+       /* V7 (x);        V6 (x);       V5 (x);           V4 GPO(MID2);
+        * V3 GPO(MID1);  V2 CARD_TxD;  V1 CARD_RxD;      V0 GPI+(/BAT_FAULT);
+        */
+       ctrl_outw(0x0142, PORT_PVCR);   /* 00 00 00 01 01 00 00 10 */
+}
+
+static void __init mpr2_setup(char **cmdline_p)
+{
+       __set_io_port_base(0xa0000000);
+
+       /* set Pin Select Register A:
+        * /PCC_CD1, /PCC_CD2,  PCC_BVD1, PCC_BVD2,
+        * /IOIS16,  IRQ4,      IRQ5,     USB1d_SUSPEND
+        */
+       ctrl_outw(0xAABC, PORT_PSELA);
+       /* set Pin Select Register B:
+        * /SCIF0_RTS, /SCIF0_CTS, LCD_VCPWC,
+        * LCD_VEPWC,  IIC_SDA,    IIC_SCL, Reserved
+        */
+       ctrl_outw(0x3C00, PORT_PSELB);
+       /* set Pin Select Register C:
+        * SIOF1_SCK, SIOF1_RxD, SCIF1_RxD, SCIF1_TxD, Reserved
+        */
+       ctrl_outw(0x0000, PORT_PSELC);
+       /* set Pin Select Register D: Reserved, SIOF1_TxD, Reserved, SIOF1_MCLK,
+        * Reserved, SIOF1_SYNC, Reserved, SCIF1_SCK, Reserved
+        */
+       ctrl_outw(0x0000, PORT_PSELD);
+       /* set USB TxRx Control: Reserved, DRV, Reserved, USB_TRANS, USB_SEL */
+       ctrl_outw(0x0101, PORT_UTRCTL);
+       /* set USB Clock Control: USSCS, USSTB, Reserved (HighByte always A5) */
+       ctrl_outw(0xA5C0, PORT_UCLKCR_W);
+
+       setup_chip_select();
+
+       setup_port_multiplexing();
+
+       reset_ethernet();
+
+       printk(KERN_INFO "Magic Panel Release 2 A.%i\n",
+                               CONFIG_SH_MAGIC_PANEL_R2_VERSION);
+
+       if (ethernet_reset_finished() == 0)
+               printk(KERN_WARNING "Ethernet not ready\n");
+}
+
+static struct resource smc911x_resources[] = {
+       [0] = {
+               .start          = 0xa8000000,
+               .end            = 0xabffffff,
+               .flags          = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start          = 35,
+               .end            = 35,
+               .flags          = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device smc911x_device = {
+       .name           = "smc911x",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(smc911x_resources),
+       .resource       = smc911x_resources,
+};
+
+static struct resource heartbeat_resources[] = {
+       [0] = {
+               .start  = PA_LED,
+               .end    = PA_LED,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static struct heartbeat_data heartbeat_data = {
+       .flags          = HEARTBEAT_INVERTED,
+};
+
+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 *parsed_partitions;
+
+static struct mtd_partition mpr2_partitions[] = {
+       /* Reserved for bootloader, read-only */
+       {
+               .name = "Bootloader",
+               .offset = 0x00000000UL,
+               .size = MPR2_MTD_BOOTLOADER_SIZE,
+               .mask_flags = MTD_WRITEABLE,
+       },
+       /* Reserved for kernel image */
+       {
+               .name = "Kernel",
+               .offset = MTDPART_OFS_NXTBLK,
+               .size = MPR2_MTD_KERNEL_SIZE,
+       },
+       /* Rest is used for Flash FS */
+       {
+               .name = "Flash_FS",
+               .offset = MTDPART_OFS_NXTBLK,
+               .size = MTDPART_SIZ_FULL,
+       }
+};
+
+static struct physmap_flash_data flash_data = {
+       .width          = 2,
+};
+
+static struct resource flash_resource = {
+       .start          = 0x00000000,
+       .end            = 0x2000000UL,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device flash_device = {
+       .name           = "physmap-flash",
+       .id             = -1,
+       .resource       = &flash_resource,
+       .num_resources  = 1,
+       .dev            = {
+               .platform_data = &flash_data,
+       },
+};
+
+static struct mtd_info *flash_mtd;
+
+static struct map_info mpr2_flash_map = {
+       .name = "Magic Panel R2 Flash",
+       .size = 0x2000000UL,
+       .bankwidth = 2,
+};
+
+static void __init set_mtd_partitions(void)
+{
+       int nr_parts = 0;
+
+       simple_map_init(&mpr2_flash_map);
+       flash_mtd = do_map_probe("cfi_probe", &mpr2_flash_map);
+       nr_parts = parse_mtd_partitions(flash_mtd, probes,
+                                       &parsed_partitions, 0);
+       /* If there is no partition table, used the hard coded table */
+       if (nr_parts <= 0) {
+               flash_data.parts = mpr2_partitions;
+               flash_data.nr_parts = ARRAY_SIZE(mpr2_partitions);
+       } else {
+               flash_data.nr_parts = nr_parts;
+               flash_data.parts = parsed_partitions;
+       }
+}
+
+/*
+ * Add all resources to the platform_device
+ */
+
+static struct platform_device *mpr2_devices[] __initdata = {
+       &heartbeat_device,
+       &smc911x_device,
+       &flash_device,
+};
+
+
+static int __init mpr2_devices_setup(void)
+{
+       set_mtd_partitions();
+       return platform_add_devices(mpr2_devices, ARRAY_SIZE(mpr2_devices));
+}
+device_initcall(mpr2_devices_setup);
+
+/*
+ * Initialize IRQ setting
+ */
+static void __init init_mpr2_IRQ(void)
+{
+       plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-5 */
+
+       set_irq_type(32, IRQ_TYPE_LEVEL_LOW);    /* IRQ0 CAN1 */
+       set_irq_type(33, IRQ_TYPE_LEVEL_LOW);    /* IRQ1 CAN2 */
+       set_irq_type(34, IRQ_TYPE_LEVEL_LOW);    /* IRQ2 CAN3 */
+       set_irq_type(35, IRQ_TYPE_LEVEL_LOW);    /* IRQ3 SMSC9115 */
+       set_irq_type(36, IRQ_TYPE_EDGE_RISING);  /* IRQ4 touchscreen */
+       set_irq_type(37, IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */
+
+       intc_set_priority(32, 13);              /* IRQ0 CAN1 */
+       intc_set_priority(33, 13);              /* IRQ0 CAN2 */
+       intc_set_priority(34, 13);              /* IRQ0 CAN3 */
+       intc_set_priority(35, 6);               /* IRQ3 SMSC9115 */
+}
+
+/*
+ * The Machine Vector
+ */
+
+static struct sh_machine_vector mv_mpr2 __initmv = {
+       .mv_name                = "mpr2",
+       .mv_setup               = mpr2_setup,
+       .mv_init_irq            = init_mpr2_IRQ,
+};
diff --git a/arch/sh/boards/board-rsk7203.c b/arch/sh/boards/board-rsk7203.c
new file mode 100644 (file)
index 0000000..ffbedc5
--- /dev/null
@@ -0,0 +1,136 @@
+/*
+ * Renesas Technology Europe RSK+ 7203 Support.
+ *
+ * Copyright (C) 2008 Paul Mundt
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+#include <linux/init.h>
+#include <linux/types.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/physmap.h>
+#include <linux/mtd/map.h>
+#include <linux/smc911x.h>
+#include <asm/machvec.h>
+#include <asm/io.h>
+
+static struct smc911x_platdata smc911x_info = {
+       .flags          = SMC911X_USE_16BIT,
+       .irq_flags      = IRQF_TRIGGER_LOW,
+};
+
+static struct resource smc911x_resources[] = {
+       [0] = {
+               .start          = 0x24000000,
+               .end            = 0x24000000 + 0x100,
+               .flags          = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start          = 64,
+               .end            = 64,
+               .flags          = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device smc911x_device = {
+       .name           = "smc911x",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(smc911x_resources),
+       .resource       = smc911x_resources,
+       .dev            = {
+               .platform_data = &smc911x_info,
+       },
+};
+
+static const char *probes[] = { "cmdlinepart", NULL };
+
+static struct mtd_partition *parsed_partitions;
+
+static struct mtd_partition rsk7203_partitions[] = {
+       {
+               .name           = "Bootloader",
+               .offset         = 0x00000000,
+               .size           = 0x00040000,
+               .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "Kernel",
+               .offset         = MTDPART_OFS_NXTBLK,
+               .size           = 0x001c0000,
+       }, {
+               .name           = "Flash_FS",
+               .offset         = MTDPART_OFS_NXTBLK,
+               .size           = MTDPART_SIZ_FULL,
+       }
+};
+
+static struct physmap_flash_data flash_data = {
+       .width          = 2,
+};
+
+static struct resource flash_resource = {
+       .start          = 0x20000000,
+       .end            = 0x20400000,
+       .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device flash_device = {
+       .name           = "physmap-flash",
+       .id             = -1,
+       .resource       = &flash_resource,
+       .num_resources  = 1,
+       .dev            = {
+               .platform_data = &flash_data,
+       },
+};
+
+static struct mtd_info *flash_mtd;
+
+static struct map_info rsk7203_flash_map = {
+       .name           = "RSK+ Flash",
+       .size           = 0x400000,
+       .bankwidth      = 2,
+};
+
+static void __init set_mtd_partitions(void)
+{
+       int nr_parts = 0;
+
+       simple_map_init(&rsk7203_flash_map);
+       flash_mtd = do_map_probe("cfi_probe", &rsk7203_flash_map);
+       nr_parts = parse_mtd_partitions(flash_mtd, probes,
+                                       &parsed_partitions, 0);
+       /* If there is no partition table, used the hard coded table */
+       if (nr_parts <= 0) {
+               flash_data.parts = rsk7203_partitions;
+               flash_data.nr_parts = ARRAY_SIZE(rsk7203_partitions);
+       } else {
+               flash_data.nr_parts = nr_parts;
+               flash_data.parts = parsed_partitions;
+       }
+}
+
+
+static struct platform_device *rsk7203_devices[] __initdata = {
+       &smc911x_device,
+       &flash_device,
+};
+
+static int __init rsk7203_devices_setup(void)
+{
+       set_mtd_partitions();
+       return platform_add_devices(rsk7203_devices,
+                                   ARRAY_SIZE(rsk7203_devices));
+}
+device_initcall(rsk7203_devices_setup);
+
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_rsk7203 __initmv = {
+       .mv_name        = "RSK+7203",
+};
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
new file mode 100644 (file)
index 0000000..b95d674
--- /dev/null
@@ -0,0 +1,302 @@
+/*
+ * Renesas Technology Corp. R0P7785LC0011RL Support.
+ *
+ * Copyright (C) 2008  Yoshihiro Shimoda
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/sm501.h>
+#include <linux/sm501-regs.h>
+#include <linux/fb.h>
+#include <linux/mtd/physmap.h>
+#include <linux/delay.h>
+#include <linux/i2c.h>
+#include <linux/i2c-pca-platform.h>
+#include <linux/i2c-algo-pca.h>
+#include <asm/heartbeat.h>
+#include <asm/sh7785lcr.h>
+
+/*
+ * NOTE: This board has 2 physical memory maps.
+ *      Please look at include/asm-sh/sh7785lcr.h or hardware manual.
+ */
+static struct resource heartbeat_resources[] = {
+       [0] = {
+               .start  = PLD_LEDCR,
+               .end    = PLD_LEDCR,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static struct heartbeat_data heartbeat_data = {
+       .regsize = 8,
+};
+
+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           = 512 * 1024,
+       },
+       {
+               .name           = "bootenv",
+               .offset         = MTDPART_OFS_APPEND,
+               .size           = 512 * 1024,
+       },
+       {
+               .name           = "kernel",
+               .offset         = MTDPART_OFS_APPEND,
+               .size           = 4 * 1024 * 1024,
+       },
+       {
+               .name           = "data",
+               .offset         = MTDPART_OFS_APPEND,
+               .size           = MTDPART_SIZ_FULL,
+       },
+};
+
+static struct physmap_flash_data nor_flash_data = {
+       .width          = 4,
+       .parts          = nor_flash_partitions,
+       .nr_parts       = ARRAY_SIZE(nor_flash_partitions),
+};
+
+static struct resource nor_flash_resources[] = {
+       [0]     = {
+               .start  = NOR_FLASH_ADDR,
+               .end    = NOR_FLASH_ADDR + NOR_FLASH_SIZE - 1,
+               .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 resource r8a66597_usb_host_resources[] = {
+       [0] = {
+               .name   = "r8a66597_hcd",
+               .start  = R8A66597_ADDR,
+               .end    = R8A66597_ADDR + R8A66597_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .name   = "r8a66597_hcd",
+               .start  = 2,
+               .end    = 2,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device r8a66597_usb_host_device = {
+       .name           = "r8a66597_hcd",
+       .id             = -1,
+       .dev = {
+               .dma_mask               = NULL,
+               .coherent_dma_mask      = 0xffffffff,
+       },
+       .num_resources  = ARRAY_SIZE(r8a66597_usb_host_resources),
+       .resource       = r8a66597_usb_host_resources,
+};
+
+static struct resource sm501_resources[] = {
+       [0]     = {
+               .start  = SM107_MEM_ADDR,
+               .end    = SM107_MEM_ADDR + SM107_MEM_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1]     = {
+               .start  = SM107_REG_ADDR,
+               .end    = SM107_REG_ADDR + SM107_REG_SIZE - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [2]     = {
+               .start  = 10,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct fb_videomode sm501_default_mode_crt = {
+       .pixclock       = 35714,        /* 28MHz */
+       .xres           = 640,
+       .yres           = 480,
+       .left_margin    = 105,
+       .right_margin   = 16,
+       .upper_margin   = 33,
+       .lower_margin   = 10,
+       .hsync_len      = 39,
+       .vsync_len      = 2,
+       .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct fb_videomode sm501_default_mode_pnl = {
+       .pixclock       = 40000,        /* 25MHz */
+       .xres           = 640,
+       .yres           = 480,
+       .left_margin    = 2,
+       .right_margin   = 16,
+       .upper_margin   = 33,
+       .lower_margin   = 10,
+       .hsync_len      = 39,
+       .vsync_len      = 2,
+       .sync           = 0,
+};
+
+static struct sm501_platdata_fbsub sm501_pdata_fbsub_pnl = {
+       .def_bpp        = 16,
+       .def_mode       = &sm501_default_mode_pnl,
+       .flags          = SM501FB_FLAG_USE_INIT_MODE |
+                         SM501FB_FLAG_USE_HWCURSOR |
+                         SM501FB_FLAG_USE_HWACCEL |
+                         SM501FB_FLAG_DISABLE_AT_EXIT |
+                         SM501FB_FLAG_PANEL_NO_VBIASEN,
+};
+
+static struct sm501_platdata_fbsub sm501_pdata_fbsub_crt = {
+       .def_bpp        = 16,
+       .def_mode       = &sm501_default_mode_crt,
+       .flags          = SM501FB_FLAG_USE_INIT_MODE |
+                         SM501FB_FLAG_USE_HWCURSOR |
+                         SM501FB_FLAG_USE_HWACCEL |
+                         SM501FB_FLAG_DISABLE_AT_EXIT,
+};
+
+static struct sm501_platdata_fb sm501_fb_pdata = {
+       .fb_route       = SM501_FB_OWN,
+       .fb_crt         = &sm501_pdata_fbsub_crt,
+       .fb_pnl         = &sm501_pdata_fbsub_pnl,
+};
+
+static struct sm501_initdata sm501_initdata = {
+       .gpio_high      = {
+               .set    = 0x00001fe0,
+               .mask   = 0x0,
+       },
+       .devices        = 0,
+       .mclk           = 84 * 1000000,
+       .m1xclk         = 112 * 1000000,
+};
+
+static struct sm501_platdata sm501_platform_data = {
+       .init           = &sm501_initdata,
+       .fb             = &sm501_fb_pdata,
+};
+
+static struct platform_device sm501_device = {
+       .name           = "sm501",
+       .id             = -1,
+       .dev            = {
+               .platform_data  = &sm501_platform_data,
+       },
+       .num_resources  = ARRAY_SIZE(sm501_resources),
+       .resource       = sm501_resources,
+};
+
+static struct resource i2c_resources[] = {
+       [0] = {
+               .start  = PCA9564_ADDR,
+               .end    = PCA9564_ADDR + PCA9564_SIZE - 1,
+               .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
+       },
+       [1] = {
+               .start  = 12,
+               .end    = 12,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct i2c_pca9564_pf_platform_data i2c_platform_data = {
+       .gpio                   = 0,
+       .i2c_clock_speed        = I2C_PCA_CON_330kHz,
+       .timeout                = 100,
+};
+
+static struct platform_device i2c_device = {
+       .name           = "i2c-pca-platform",
+       .id             = -1,
+       .dev            = {
+               .platform_data  = &i2c_platform_data,
+       },
+       .num_resources  = ARRAY_SIZE(i2c_resources),
+       .resource       = i2c_resources,
+};
+
+static struct platform_device *sh7785lcr_devices[] __initdata = {
+       &heartbeat_device,
+       &nor_flash_device,
+       &r8a66597_usb_host_device,
+       &sm501_device,
+       &i2c_device,
+};
+
+static struct i2c_board_info __initdata sh7785lcr_i2c_devices[] = {
+       {
+               I2C_BOARD_INFO("r2025sd", 0x32),
+       },
+};
+
+static int __init sh7785lcr_devices_setup(void)
+{
+       i2c_register_board_info(0, sh7785lcr_i2c_devices,
+                               ARRAY_SIZE(sh7785lcr_i2c_devices));
+
+       return platform_add_devices(sh7785lcr_devices,
+                                   ARRAY_SIZE(sh7785lcr_devices));
+}
+__initcall(sh7785lcr_devices_setup);
+
+/* Initialize IRQ setting */
+void __init init_sh7785lcr_IRQ(void)
+{
+       plat_irq_setup_pins(IRQ_MODE_IRQ7654);
+       plat_irq_setup_pins(IRQ_MODE_IRQ3210);
+}
+
+static void sh7785lcr_power_off(void)
+{
+       ctrl_outb(0x01, P2SEGADDR(PLD_POFCR));
+}
+
+/* Initialize the board */
+static void __init sh7785lcr_setup(char **cmdline_p)
+{
+       void __iomem *sm501_reg;
+
+       printk(KERN_INFO "Renesas Technology Corp. R0P7785LC0011RL support.\n");
+
+       pm_power_off = sh7785lcr_power_off;
+
+       /* sm501 DRAM configuration */
+       sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL;
+       writel(0x000307c2, sm501_reg);
+}
+
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_sh7785lcr __initmv = {
+       .mv_name                = "SH7785LCR",
+       .mv_setup               = sh7785lcr_setup,
+       .mv_init_irq            = init_sh7785lcr_IRQ,
+};
+
diff --git a/arch/sh/boards/board-shmin.c b/arch/sh/boards/board-shmin.c
new file mode 100644 (file)
index 0000000..16e5dae
--- /dev/null
@@ -0,0 +1,42 @@
+/*
+ * arch/sh/boards/shmin/setup.c
+ *
+ * Copyright (C) 2006 Takashi YOSHII
+ *
+ * SHMIN Support.
+ */
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <asm/machvec.h>
+#include <asm/shmin.h>
+#include <asm/clock.h>
+#include <asm/io.h>
+
+#define PFC_PHCR       0xa400010eUL
+#define INTC_ICR1      0xa4000010UL
+
+static void __init init_shmin_irq(void)
+{
+       ctrl_outw(0x2a00, PFC_PHCR);    // IRQ0-3=IRQ
+       ctrl_outw(0x0aaa, INTC_ICR1);   // IRQ0-3=IRQ-mode,Low-active.
+       plat_irq_setup_pins(IRQ_MODE_IRQ);
+}
+
+static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)
+{
+       static int dummy;
+
+       if ((port & ~0x1f) == SHMIN_NE_BASE)
+               return (void __iomem *)(SHMIN_IO_BASE + port);
+
+       dummy = 0;
+
+       return &dummy;
+
+}
+
+static struct sh_machine_vector mv_shmin __initmv = {
+       .mv_name        = "SHMIN",
+       .mv_init_irq    = init_shmin_irq,
+       .mv_ioport_map  = shmin_ioport_map,
+};
diff --git a/arch/sh/boards/mach-ap325rxa/Makefile b/arch/sh/boards/mach-ap325rxa/Makefile
deleted file mode 100644 (file)
index f663768..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-y  := setup.o
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
deleted file mode 100644 (file)
index 9c71603..0000000
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * Renesas - AP-325RXA
- * (Compatible with Algo System ., LTD. - AP-320A)
- *
- * Copyright (C) 2008 Renesas Solutions Corp.
- * Author : Yusuke Goda <goda.yuske@renesas.com>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/physmap.h>
-#include <linux/delay.h>
-#include <linux/i2c.h>
-#include <linux/delay.h>
-#include <linux/smc911x.h>
-#include <media/soc_camera_platform.h>
-#include <media/sh_mobile_ceu.h>
-#include <asm/sh_mobile_lcdc.h>
-#include <asm/io.h>
-#include <asm/clock.h>
-
-static struct smc911x_platdata smc911x_info = {
-       .flags = SMC911X_USE_32BIT,
-       .irq_flags = IRQF_TRIGGER_LOW,
-};
-
-static struct resource smc9118_resources[] = {
-       [0] = {
-               .start  = 0xb6080000,
-               .end    = 0xb60fffff,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 35,
-               .end    = 35,
-               .flags  = IORESOURCE_IRQ,
-       }
-};
-
-static struct platform_device smc9118_device = {
-       .name           = "smc911x",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(smc9118_resources),
-       .resource       = smc9118_resources,
-       .dev            = {
-               .platform_data = &smc911x_info,
-       },
-};
-
-static struct mtd_partition ap325rxa_nor_flash_partitions[] = {
-       {
-                .name = "uboot",
-                .offset = 0,
-                .size = (1 * 1024 * 1024),
-                .mask_flags = MTD_WRITEABLE,   /* Read-only */
-       }, {
-                .name = "kernel",
-                .offset = MTDPART_OFS_APPEND,
-                .size = (2 * 1024 * 1024),
-       }, {
-                .name = "other",
-                .offset = MTDPART_OFS_APPEND,
-                .size = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct physmap_flash_data ap325rxa_nor_flash_data = {
-       .width          = 2,
-       .parts          = ap325rxa_nor_flash_partitions,
-       .nr_parts       = ARRAY_SIZE(ap325rxa_nor_flash_partitions),
-};
-
-static struct resource ap325rxa_nor_flash_resources[] = {
-       [0] = {
-               .name   = "NOR Flash",
-               .start  = 0x00000000,
-               .end    = 0x00ffffff,
-               .flags  = IORESOURCE_MEM,
-       }
-};
-
-static struct platform_device ap325rxa_nor_flash_device = {
-       .name           = "physmap-flash",
-       .resource       = ap325rxa_nor_flash_resources,
-       .num_resources  = ARRAY_SIZE(ap325rxa_nor_flash_resources),
-       .dev            = {
-               .platform_data = &ap325rxa_nor_flash_data,
-       },
-};
-
-#define FPGA_LCDREG    0xB4100180
-#define FPGA_BKLREG    0xB4100212
-#define FPGA_LCDREG_VAL        0x0018
-#define PORT_PHCR      0xA405010E
-#define PORT_PLCR      0xA4050114
-#define PORT_PMCR      0xA4050116
-#define PORT_PRCR      0xA405011C
-#define PORT_PSCR      0xA405011E
-#define PORT_PZCR      0xA405014C
-#define PORT_HIZCRA    0xA4050158
-#define PORT_MSELCRB   0xA4050182
-#define PORT_PSDR      0xA405013E
-#define PORT_PZDR      0xA405016C
-#define PORT_PSELD     0xA4050154
-
-static void ap320_wvga_power_on(void *board_data)
-{
-       msleep(100);
-
-       /* ASD AP-320/325 LCD ON */
-       ctrl_outw(FPGA_LCDREG_VAL, FPGA_LCDREG);
-
-       /* backlight */
-       ctrl_outw((ctrl_inw(PORT_PSCR) & ~0x00C0) | 0x40, PORT_PSCR);
-       ctrl_outb(ctrl_inb(PORT_PSDR) & ~0x08, PORT_PSDR);
-       ctrl_outw(0x100, FPGA_BKLREG);
-}
-
-static struct sh_mobile_lcdc_info lcdc_info = {
-       .clock_source = LCDC_CLK_EXTERNAL,
-       .ch[0] = {
-               .chan = LCDC_CHAN_MAINLCD,
-               .bpp = 16,
-               .interface_type = RGB18,
-               .clock_divider = 1,
-               .lcd_cfg = {
-                       .name = "LB070WV1",
-                       .xres = 800,
-                       .yres = 480,
-                       .left_margin = 40,
-                       .right_margin = 160,
-                       .hsync_len = 8,
-                       .upper_margin = 63,
-                       .lower_margin = 80,
-                       .vsync_len = 1,
-                       .sync = 0, /* hsync and vsync are active low */
-               },
-               .board_cfg = {
-                       .display_on = ap320_wvga_power_on,
-               },
-       }
-};
-
-static struct resource lcdc_resources[] = {
-       [0] = {
-               .name   = "LCDC",
-               .start  = 0xfe940000, /* P4-only space */
-               .end    = 0xfe941fff,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct platform_device lcdc_device = {
-       .name           = "sh_mobile_lcdc_fb",
-       .num_resources  = ARRAY_SIZE(lcdc_resources),
-       .resource       = lcdc_resources,
-       .dev            = {
-               .platform_data  = &lcdc_info,
-       },
-};
-
-#ifdef CONFIG_I2C
-static unsigned char camera_ncm03j_magic[] =
-{
-       0x87, 0x00, 0x88, 0x08, 0x89, 0x01, 0x8A, 0xE8,
-       0x1D, 0x00, 0x1E, 0x8A, 0x21, 0x00, 0x33, 0x36,
-       0x36, 0x60, 0x37, 0x08, 0x3B, 0x31, 0x44, 0x0F,
-       0x46, 0xF0, 0x4B, 0x28, 0x4C, 0x21, 0x4D, 0x55,
-       0x4E, 0x1B, 0x4F, 0xC7, 0x50, 0xFC, 0x51, 0x12,
-       0x58, 0x02, 0x66, 0xC0, 0x67, 0x46, 0x6B, 0xA0,
-       0x6C, 0x34, 0x7E, 0x25, 0x7F, 0x25, 0x8D, 0x0F,
-       0x92, 0x40, 0x93, 0x04, 0x94, 0x26, 0x95, 0x0A,
-       0x99, 0x03, 0x9A, 0xF0, 0x9B, 0x14, 0x9D, 0x7A,
-       0xC5, 0x02, 0xD6, 0x07, 0x59, 0x00, 0x5A, 0x1A,
-       0x5B, 0x2A, 0x5C, 0x37, 0x5D, 0x42, 0x5E, 0x56,
-       0xC8, 0x00, 0xC9, 0x1A, 0xCA, 0x2A, 0xCB, 0x37,
-       0xCC, 0x42, 0xCD, 0x56, 0xCE, 0x00, 0xCF, 0x1A,
-       0xD0, 0x2A, 0xD1, 0x37, 0xD2, 0x42, 0xD3, 0x56,
-       0x5F, 0x68, 0x60, 0x87, 0x61, 0xA3, 0x62, 0xBC,
-       0x63, 0xD4, 0x64, 0xEA, 0xD6, 0x0F,
-};
-
-static int camera_set_capture(struct soc_camera_platform_info *info,
-                             int enable)
-{
-       struct i2c_adapter *a = i2c_get_adapter(0);
-       struct i2c_msg msg;
-       int ret = 0;
-       int i;
-
-       if (!enable)
-               return 0; /* no disable for now */
-
-       for (i = 0; i < ARRAY_SIZE(camera_ncm03j_magic); i += 2) {
-               u_int8_t buf[8];
-
-               msg.addr = 0x6e;
-               msg.buf = buf;
-               msg.len = 2;
-               msg.flags = 0;
-
-               buf[0] = camera_ncm03j_magic[i];
-               buf[1] = camera_ncm03j_magic[i + 1];
-
-               ret = (ret < 0) ? ret : i2c_transfer(a, &msg, 1);
-       }
-
-       return ret;
-}
-
-static struct soc_camera_platform_info camera_info = {
-       .iface = 0,
-       .format_name = "UYVY",
-       .format_depth = 16,
-       .format = {
-               .pixelformat = V4L2_PIX_FMT_UYVY,
-               .colorspace = V4L2_COLORSPACE_SMPTE170M,
-               .width = 640,
-               .height = 480,
-       },
-       .bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
-       SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
-       .set_capture = camera_set_capture,
-};
-
-static struct platform_device camera_device = {
-       .name           = "soc_camera_platform",
-       .dev            = {
-               .platform_data  = &camera_info,
-       },
-};
-#endif /* CONFIG_I2C */
-
-static struct sh_mobile_ceu_info sh_mobile_ceu_info = {
-       .flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH |
-       SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8,
-};
-
-static struct resource ceu_resources[] = {
-       [0] = {
-               .name   = "CEU",
-               .start  = 0xfe910000,
-               .end    = 0xfe91009f,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = 52,
-               .flags  = IORESOURCE_IRQ,
-       },
-       [2] = {
-               /* place holder for contiguous memory */
-       },
-};
-
-static struct platform_device ceu_device = {
-       .name           = "sh_mobile_ceu",
-       .num_resources  = ARRAY_SIZE(ceu_resources),
-       .resource       = ceu_resources,
-       .dev            = {
-               .platform_data  = &sh_mobile_ceu_info,
-       },
-};
-
-static struct platform_device *ap325rxa_devices[] __initdata = {
-       &smc9118_device,
-       &ap325rxa_nor_flash_device,
-       &lcdc_device,
-       &ceu_device,
-#ifdef CONFIG_I2C
-       &camera_device,
-#endif
-};
-
-static struct i2c_board_info __initdata ap325rxa_i2c_devices[] = {
-};
-
-static int __init ap325rxa_devices_setup(void)
-{
-       clk_always_enable("mstp200"); /* LCDC */
-       clk_always_enable("mstp203"); /* CEU */
-
-       platform_resource_setup_memory(&ceu_device, "ceu", 4 << 20);
-
-       i2c_register_board_info(0, ap325rxa_i2c_devices,
-                               ARRAY_SIZE(ap325rxa_i2c_devices));
-       return platform_add_devices(ap325rxa_devices,
-                               ARRAY_SIZE(ap325rxa_devices));
-}
-device_initcall(ap325rxa_devices_setup);
-
-static void __init ap325rxa_setup(char **cmdline_p)
-{
-       /* LCDC configuration */
-       ctrl_outw(ctrl_inw(PORT_PHCR) & ~0xffff, PORT_PHCR);
-       ctrl_outw(ctrl_inw(PORT_PLCR) & ~0xffff, PORT_PLCR);
-       ctrl_outw(ctrl_inw(PORT_PMCR) & ~0xffff, PORT_PMCR);
-       ctrl_outw(ctrl_inw(PORT_PRCR) & ~0x03ff, PORT_PRCR);
-       ctrl_outw(ctrl_inw(PORT_HIZCRA) & ~0x01C0, PORT_HIZCRA);
-
-       /* CEU */
-       ctrl_outw(ctrl_inw(PORT_MSELCRB) & ~0x0001, PORT_MSELCRB);
-       ctrl_outw(ctrl_inw(PORT_PSELD) & ~0x0003, PORT_PSELD);
-       ctrl_outw((ctrl_inw(PORT_PZCR) & ~0xff00) | 0x5500, PORT_PZCR);
-       ctrl_outb((ctrl_inb(PORT_PZDR) & ~0xf0) | 0x20, PORT_PZDR);
-}
-
-static struct sh_machine_vector mv_ap325rxa __initmv = {
-       .mv_name = "AP-325RXA",
-       .mv_setup = ap325rxa_setup,
-};
diff --git a/arch/sh/boards/mach-magicpanelr2/Kconfig b/arch/sh/boards/mach-magicpanelr2/Kconfig
deleted file mode 100644 (file)
index b0abddc..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-if SH_MAGIC_PANEL_R2
-
-menu "Magic Panel R2 options"
-
-config SH_MAGIC_PANEL_R2_VERSION
-       int SH_MAGIC_PANEL_R2_VERSION
-       default "3"
-       help
-         Set the version of the Magic Panel R2
-
-endmenu
-
-endif
diff --git a/arch/sh/boards/mach-magicpanelr2/Makefile b/arch/sh/boards/mach-magicpanelr2/Makefile
deleted file mode 100644 (file)
index 7a6d586..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the Magic Panel specific parts
-#
-
-obj-y   := setup.o
\ No newline at end of file
diff --git a/arch/sh/boards/mach-magicpanelr2/setup.c b/arch/sh/boards/mach-magicpanelr2/setup.c
deleted file mode 100644 (file)
index f3b8b07..0000000
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * linux/arch/sh/boards/magicpanel/setup.c
- *
- *  Copyright (C) 2007  Markus Brunner, Mark Jonas
- *
- *  Magic Panel Release 2 board setup
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/mtd/map.h>
-#include <asm/magicpanelr2.h>
-#include <asm/heartbeat.h>
-
-#define LAN9115_READY  (ctrl_inl(0xA8000084UL) & 0x00000001UL)
-
-/* Prefer cmdline over RedBoot */
-static const char *probes[] = { "cmdlinepart", "RedBoot", NULL };
-
-/* Wait until reset finished. Timeout is 100ms. */
-static int __init ethernet_reset_finished(void)
-{
-       int i;
-
-       if (LAN9115_READY)
-               return 1;
-
-       for (i = 0; i < 10; ++i) {
-               mdelay(10);
-               if (LAN9115_READY)
-                       return 1;
-       }
-
-       return 0;
-}
-
-static void __init reset_ethernet(void)
-{
-       /* PMDR: LAN_RESET=on */
-       CLRBITS_OUTB(0x10, PORT_PMDR);
-
-       udelay(200);
-
-       /* PMDR: LAN_RESET=off */
-       SETBITS_OUTB(0x10, PORT_PMDR);
-}
-
-static void __init setup_chip_select(void)
-{
-       /* CS2: LAN (0x08000000 - 0x0bffffff) */
-       /* no idle cycles, normal space, 8 bit data bus */
-       ctrl_outl(0x36db0400, CS2BCR);
-       /* (SW:1.5 WR:3 HW:1.5), ext. wait */
-       ctrl_outl(0x000003c0, CS2WCR);
-
-       /* CS4: CAN1 (0xb0000000 - 0xb3ffffff) */
-       /* no idle cycles, normal space, 8 bit data bus */
-       ctrl_outl(0x00000200, CS4BCR);
-       /* (SW:1.5 WR:3 HW:1.5), ext. wait */
-       ctrl_outl(0x00100981, CS4WCR);
-
-       /* CS5a: CAN2 (0xb4000000 - 0xb5ffffff) */
-       /* no idle cycles, normal space, 8 bit data bus */
-       ctrl_outl(0x00000200, CS5ABCR);
-       /* (SW:1.5 WR:3 HW:1.5), ext. wait */
-       ctrl_outl(0x00100981, CS5AWCR);
-
-       /* CS5b: CAN3 (0xb6000000 - 0xb7ffffff) */
-       /* no idle cycles, normal space, 8 bit data bus */
-       ctrl_outl(0x00000200, CS5BBCR);
-       /* (SW:1.5 WR:3 HW:1.5), ext. wait */
-       ctrl_outl(0x00100981, CS5BWCR);
-
-       /* CS6a: Rotary (0xb8000000 - 0xb9ffffff) */
-       /* no idle cycles, normal space, 8 bit data bus */
-       ctrl_outl(0x00000200, CS6ABCR);
-       /* (SW:1.5 WR:3 HW:1.5), no ext. wait */
-       ctrl_outl(0x001009C1, CS6AWCR);
-}
-
-static void __init setup_port_multiplexing(void)
-{
-       /* A7 GPO(LED8);     A6 GPO(LED7);     A5 GPO(LED6);      A4 GPO(LED5);
-        * A3 GPO(LED4);     A2 GPO(LED3);     A1 GPO(LED2);      A0 GPO(LED1);
-        */
-       ctrl_outw(0x5555, PORT_PACR);   /* 01 01 01 01 01 01 01 01 */
-
-       /* B7 GPO(RST4);   B6 GPO(RST3);  B5 GPO(RST2);    B4 GPO(RST1);
-        * B3 GPO(PB3);    B2 GPO(PB2);   B1 GPO(PB1);     B0 GPO(PB0);
-        */
-       ctrl_outw(0x5555, PORT_PBCR);   /* 01 01 01 01 01 01 01 01 */
-
-       /* C7 GPO(PC7);   C6 GPO(PC6);    C5 GPO(PC5);     C4 GPO(PC4);
-        * C3 LCD_DATA3;  C2 LCD_DATA2;   C1 LCD_DATA1;    C0 LCD_DATA0;
-        */
-       ctrl_outw(0x5500, PORT_PCCR);   /* 01 01 01 01 00 00 00 00 */
-
-       /* D7 GPO(PD7); D6 GPO(PD6);    D5 GPO(PD5);       D4 GPO(PD4);
-        * D3 GPO(PD3); D2 GPO(PD2);    D1 GPO(PD1);       D0 GPO(PD0);
-        */
-       ctrl_outw(0x5555, PORT_PDCR);   /* 01 01 01 01 01 01 01 01 */
-
-       /* E7 (x);        E6 GPI(nu);    E5 GPI(nu);      E4 LCD_M_DISP;
-        * E3 LCD_CL1;    E2 LCD_CL2;    E1 LCD_DON;      E0 LCD_FLM;
-        */
-       ctrl_outw(0x3C00, PORT_PECR);   /* 00 11 11 00 00 00 00 00 */
-
-       /* F7 (x);           F6 DA1(VLCD);     F5 DA0(nc);        F4 AN3;
-        * F3 AN2(MID_AD);   F2 AN1(EARTH_AD); F1 AN0(TEMP);      F0 GPI+(nc);
-        */
-       ctrl_outw(0x0002, PORT_PFCR);   /* 00 00 00 00 00 00 00 10 */
-
-       /* G7 (x);        G6 IRQ5(TOUCH_BUSY); G5 IRQ4(TOUCH_IRQ); G4 GPI(KEY2);
-        * G3 GPI(KEY1);  G2 GPO(LED11);        G1 GPO(LED10);     G0 GPO(LED9);
-        */
-       ctrl_outw(0x03D5, PORT_PGCR);   /* 00 00 00 11 11 01 01 01 */
-
-       /* H7 (x);            H6 /RAS(BRAS);      H5 /CAS(BCAS); H4 CKE(BCKE);
-        * H3 GPO(EARTH_OFF); H2 GPO(EARTH_TEST); H1 USB2_PWR;   H0 USB1_PWR;
-        */
-       ctrl_outw(0x0050, PORT_PHCR);   /* 00 00 00 00 01 01 00 00 */
-
-       /* J7 (x);        J6 AUDCK;        J5 ASEBRKAK;     J4 AUDATA3;
-        * J3 AUDATA2;    J2 AUDATA1;      J1 AUDATA0;      J0 AUDSYNC;
-        */
-       ctrl_outw(0x0000, PORT_PJCR);   /* 00 00 00 00 00 00 00 00 */
-
-       /* K7 (x);          K6 (x);          K5 (x);       K4 (x);
-        * K3 PINT7(/PWR2); K2 PINT6(/PWR1); K1 PINT5(nu); K0 PINT4(FLASH_READY)
-        */
-       ctrl_outw(0x00FF, PORT_PKCR);   /* 00 00 00 00 11 11 11 11 */
-
-       /* L7 TRST;        L6 TMS;           L5 TDO;              L4 TDI;
-        * L3 TCK;         L2 (x);           L1 (x);              L0 (x);
-        */
-       ctrl_outw(0x0000, PORT_PLCR);   /* 00 00 00 00 00 00 00 00 */
-
-       /* M7 GPO(CURRENT_SINK);    M6 GPO(PWR_SWITCH);     M5 GPO(LAN_SPEED);
-        * M4 GPO(LAN_RESET);       M3 GPO(BUZZER);         M2 GPO(LCD_BL);
-        * M1 CS5B(CAN3_CS);        M0 GPI+(nc);
-        */
-       ctrl_outw(0x5552, PORT_PMCR);      /* 01 01 01 01 01 01 00 10 */
-
-       /* CURRENT_SINK=off,    PWR_SWITCH=off, LAN_SPEED=100MBit,
-        * LAN_RESET=off,       BUZZER=off,     LCD_BL=off
-        */
-#if CONFIG_SH_MAGIC_PANEL_R2_VERSION == 2
-       ctrl_outb(0x30, PORT_PMDR);
-#elif CONFIG_SH_MAGIC_PANEL_R2_VERSION == 3
-       ctrl_outb(0xF0, PORT_PMDR);
-#else
-#error Unknown revision of PLATFORM_MP_R2
-#endif
-
-       /* P7 (x);             P6 (x);            P5 (x);
-        * P4 GPO(nu);         P3 IRQ3(LAN_IRQ);  P2 IRQ2(CAN3_IRQ);
-        * P1 IRQ1(CAN2_IRQ);  P0 IRQ0(CAN1_IRQ)
-        */
-       ctrl_outw(0x0100, PORT_PPCR);   /* 00 00 00 01 00 00 00 00 */
-       ctrl_outb(0x10, PORT_PPDR);
-
-       /* R7 A25;           R6 A24;         R5 A23;              R4 A22;
-        * R3 A21;           R2 A20;         R1 A19;              R0 A0;
-        */
-       ctrl_outw(0x0000, PORT_PRCR);   /* 00 00 00 00 00 00 00 00 */
-
-       /* S7 (x);              S6 (x);        S5 (x);       S4 GPO(EEPROM_CS2);
-        * S3 GPO(EEPROM_CS1);  S2 SIOF0_TXD;  S1 SIOF0_RXD; S0 SIOF0_SCK;
-        */
-       ctrl_outw(0x0140, PORT_PSCR);   /* 00 00 00 01 01 00 00 00 */
-
-       /* T7 (x);         T6 (x);        T5 (x);         T4 COM1_CTS;
-        * T3 COM1_RTS;    T2 COM1_TXD;   T1 COM1_RXD;    T0 GPO(WDOG)
-        */
-       ctrl_outw(0x0001, PORT_PTCR);   /* 00 00 00 00 00 00 00 01 */
-
-       /* U7 (x);           U6 (x);       U5 (x);        U4 GPI+(/AC_FAULT);
-        * U3 GPO(TOUCH_CS); U2 TOUCH_TXD; U1 TOUCH_RXD;  U0 TOUCH_SCK;
-        */
-       ctrl_outw(0x0240, PORT_PUCR);   /* 00 00 00 10 01 00 00 00 */
-
-       /* V7 (x);        V6 (x);       V5 (x);           V4 GPO(MID2);
-        * V3 GPO(MID1);  V2 CARD_TxD;  V1 CARD_RxD;      V0 GPI+(/BAT_FAULT);
-        */
-       ctrl_outw(0x0142, PORT_PVCR);   /* 00 00 00 01 01 00 00 10 */
-}
-
-static void __init mpr2_setup(char **cmdline_p)
-{
-       __set_io_port_base(0xa0000000);
-
-       /* set Pin Select Register A:
-        * /PCC_CD1, /PCC_CD2,  PCC_BVD1, PCC_BVD2,
-        * /IOIS16,  IRQ4,      IRQ5,     USB1d_SUSPEND
-        */
-       ctrl_outw(0xAABC, PORT_PSELA);
-       /* set Pin Select Register B:
-        * /SCIF0_RTS, /SCIF0_CTS, LCD_VCPWC,
-        * LCD_VEPWC,  IIC_SDA,    IIC_SCL, Reserved
-        */
-       ctrl_outw(0x3C00, PORT_PSELB);
-       /* set Pin Select Register C:
-        * SIOF1_SCK, SIOF1_RxD, SCIF1_RxD, SCIF1_TxD, Reserved
-        */
-       ctrl_outw(0x0000, PORT_PSELC);
-       /* set Pin Select Register D: Reserved, SIOF1_TxD, Reserved, SIOF1_MCLK,
-        * Reserved, SIOF1_SYNC, Reserved, SCIF1_SCK, Reserved
-        */
-       ctrl_outw(0x0000, PORT_PSELD);
-       /* set USB TxRx Control: Reserved, DRV, Reserved, USB_TRANS, USB_SEL */
-       ctrl_outw(0x0101, PORT_UTRCTL);
-       /* set USB Clock Control: USSCS, USSTB, Reserved (HighByte always A5) */
-       ctrl_outw(0xA5C0, PORT_UCLKCR_W);
-
-       setup_chip_select();
-
-       setup_port_multiplexing();
-
-       reset_ethernet();
-
-       printk(KERN_INFO "Magic Panel Release 2 A.%i\n",
-                               CONFIG_SH_MAGIC_PANEL_R2_VERSION);
-
-       if (ethernet_reset_finished() == 0)
-               printk(KERN_WARNING "Ethernet not ready\n");
-}
-
-static struct resource smc911x_resources[] = {
-       [0] = {
-               .start          = 0xa8000000,
-               .end            = 0xabffffff,
-               .flags          = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start          = 35,
-               .end            = 35,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device smc911x_device = {
-       .name           = "smc911x",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(smc911x_resources),
-       .resource       = smc911x_resources,
-};
-
-static struct resource heartbeat_resources[] = {
-       [0] = {
-               .start  = PA_LED,
-               .end    = PA_LED,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct heartbeat_data heartbeat_data = {
-       .flags          = HEARTBEAT_INVERTED,
-};
-
-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 *parsed_partitions;
-
-static struct mtd_partition mpr2_partitions[] = {
-       /* Reserved for bootloader, read-only */
-       {
-               .name = "Bootloader",
-               .offset = 0x00000000UL,
-               .size = MPR2_MTD_BOOTLOADER_SIZE,
-               .mask_flags = MTD_WRITEABLE,
-       },
-       /* Reserved for kernel image */
-       {
-               .name = "Kernel",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size = MPR2_MTD_KERNEL_SIZE,
-       },
-       /* Rest is used for Flash FS */
-       {
-               .name = "Flash_FS",
-               .offset = MTDPART_OFS_NXTBLK,
-               .size = MTDPART_SIZ_FULL,
-       }
-};
-
-static struct physmap_flash_data flash_data = {
-       .width          = 2,
-};
-
-static struct resource flash_resource = {
-       .start          = 0x00000000,
-       .end            = 0x2000000UL,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device flash_device = {
-       .name           = "physmap-flash",
-       .id             = -1,
-       .resource       = &flash_resource,
-       .num_resources  = 1,
-       .dev            = {
-               .platform_data = &flash_data,
-       },
-};
-
-static struct mtd_info *flash_mtd;
-
-static struct map_info mpr2_flash_map = {
-       .name = "Magic Panel R2 Flash",
-       .size = 0x2000000UL,
-       .bankwidth = 2,
-};
-
-static void __init set_mtd_partitions(void)
-{
-       int nr_parts = 0;
-
-       simple_map_init(&mpr2_flash_map);
-       flash_mtd = do_map_probe("cfi_probe", &mpr2_flash_map);
-       nr_parts = parse_mtd_partitions(flash_mtd, probes,
-                                       &parsed_partitions, 0);
-       /* If there is no partition table, used the hard coded table */
-       if (nr_parts <= 0) {
-               flash_data.parts = mpr2_partitions;
-               flash_data.nr_parts = ARRAY_SIZE(mpr2_partitions);
-       } else {
-               flash_data.nr_parts = nr_parts;
-               flash_data.parts = parsed_partitions;
-       }
-}
-
-/*
- * Add all resources to the platform_device
- */
-
-static struct platform_device *mpr2_devices[] __initdata = {
-       &heartbeat_device,
-       &smc911x_device,
-       &flash_device,
-};
-
-
-static int __init mpr2_devices_setup(void)
-{
-       set_mtd_partitions();
-       return platform_add_devices(mpr2_devices, ARRAY_SIZE(mpr2_devices));
-}
-device_initcall(mpr2_devices_setup);
-
-/*
- * Initialize IRQ setting
- */
-static void __init init_mpr2_IRQ(void)
-{
-       plat_irq_setup_pins(IRQ_MODE_IRQ); /* install handlers for IRQ0-5 */
-
-       set_irq_type(32, IRQ_TYPE_LEVEL_LOW);    /* IRQ0 CAN1 */
-       set_irq_type(33, IRQ_TYPE_LEVEL_LOW);    /* IRQ1 CAN2 */
-       set_irq_type(34, IRQ_TYPE_LEVEL_LOW);    /* IRQ2 CAN3 */
-       set_irq_type(35, IRQ_TYPE_LEVEL_LOW);    /* IRQ3 SMSC9115 */
-       set_irq_type(36, IRQ_TYPE_EDGE_RISING);  /* IRQ4 touchscreen */
-       set_irq_type(37, IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */
-
-       intc_set_priority(32, 13);              /* IRQ0 CAN1 */
-       intc_set_priority(33, 13);              /* IRQ0 CAN2 */
-       intc_set_priority(34, 13);              /* IRQ0 CAN3 */
-       intc_set_priority(35, 6);               /* IRQ3 SMSC9115 */
-}
-
-/*
- * The Machine Vector
- */
-
-static struct sh_machine_vector mv_mpr2 __initmv = {
-       .mv_name                = "mpr2",
-       .mv_setup               = mpr2_setup,
-       .mv_init_irq            = init_mpr2_IRQ,
-};
diff --git a/arch/sh/boards/mach-rsk7203/Makefile b/arch/sh/boards/mach-rsk7203/Makefile
deleted file mode 100644 (file)
index f663768..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-y  := setup.o
diff --git a/arch/sh/boards/mach-rsk7203/setup.c b/arch/sh/boards/mach-rsk7203/setup.c
deleted file mode 100644 (file)
index ffbedc5..0000000
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Renesas Technology Europe RSK+ 7203 Support.
- *
- * Copyright (C) 2008 Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/physmap.h>
-#include <linux/mtd/map.h>
-#include <linux/smc911x.h>
-#include <asm/machvec.h>
-#include <asm/io.h>
-
-static struct smc911x_platdata smc911x_info = {
-       .flags          = SMC911X_USE_16BIT,
-       .irq_flags      = IRQF_TRIGGER_LOW,
-};
-
-static struct resource smc911x_resources[] = {
-       [0] = {
-               .start          = 0x24000000,
-               .end            = 0x24000000 + 0x100,
-               .flags          = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start          = 64,
-               .end            = 64,
-               .flags          = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device smc911x_device = {
-       .name           = "smc911x",
-       .id             = -1,
-       .num_resources  = ARRAY_SIZE(smc911x_resources),
-       .resource       = smc911x_resources,
-       .dev            = {
-               .platform_data = &smc911x_info,
-       },
-};
-
-static const char *probes[] = { "cmdlinepart", NULL };
-
-static struct mtd_partition *parsed_partitions;
-
-static struct mtd_partition rsk7203_partitions[] = {
-       {
-               .name           = "Bootloader",
-               .offset         = 0x00000000,
-               .size           = 0x00040000,
-               .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "Kernel",
-               .offset         = MTDPART_OFS_NXTBLK,
-               .size           = 0x001c0000,
-       }, {
-               .name           = "Flash_FS",
-               .offset         = MTDPART_OFS_NXTBLK,
-               .size           = MTDPART_SIZ_FULL,
-       }
-};
-
-static struct physmap_flash_data flash_data = {
-       .width          = 2,
-};
-
-static struct resource flash_resource = {
-       .start          = 0x20000000,
-       .end            = 0x20400000,
-       .flags          = IORESOURCE_MEM,
-};
-
-static struct platform_device flash_device = {
-       .name           = "physmap-flash",
-       .id             = -1,
-       .resource       = &flash_resource,
-       .num_resources  = 1,
-       .dev            = {
-               .platform_data = &flash_data,
-       },
-};
-
-static struct mtd_info *flash_mtd;
-
-static struct map_info rsk7203_flash_map = {
-       .name           = "RSK+ Flash",
-       .size           = 0x400000,
-       .bankwidth      = 2,
-};
-
-static void __init set_mtd_partitions(void)
-{
-       int nr_parts = 0;
-
-       simple_map_init(&rsk7203_flash_map);
-       flash_mtd = do_map_probe("cfi_probe", &rsk7203_flash_map);
-       nr_parts = parse_mtd_partitions(flash_mtd, probes,
-                                       &parsed_partitions, 0);
-       /* If there is no partition table, used the hard coded table */
-       if (nr_parts <= 0) {
-               flash_data.parts = rsk7203_partitions;
-               flash_data.nr_parts = ARRAY_SIZE(rsk7203_partitions);
-       } else {
-               flash_data.nr_parts = nr_parts;
-               flash_data.parts = parsed_partitions;
-       }
-}
-
-
-static struct platform_device *rsk7203_devices[] __initdata = {
-       &smc911x_device,
-       &flash_device,
-};
-
-static int __init rsk7203_devices_setup(void)
-{
-       set_mtd_partitions();
-       return platform_add_devices(rsk7203_devices,
-                                   ARRAY_SIZE(rsk7203_devices));
-}
-device_initcall(rsk7203_devices_setup);
-
-/*
- * The Machine Vector
- */
-static struct sh_machine_vector mv_rsk7203 __initmv = {
-       .mv_name        = "RSK+7203",
-};
diff --git a/arch/sh/boards/mach-se/7619/Makefile b/arch/sh/boards/mach-se/7619/Makefile
deleted file mode 100644 (file)
index d21775c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the 7619 SolutionEngine specific parts of the kernel
-#
-
-obj-y   := setup.o
diff --git a/arch/sh/boards/mach-se/7619/setup.c b/arch/sh/boards/mach-se/7619/setup.c
deleted file mode 100644 (file)
index 1d0ef7f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/sh/boards/se/7619/setup.c
- *
- * Copyright (C) 2006 Yoshinori Sato
- *
- * Hitachi SH7619 SolutionEngine Support.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <asm/io.h>
-#include <asm/machvec.h>
-
-/*
- * The Machine Vector
- */
-
-static struct sh_machine_vector mv_se __initmv = {
-       .mv_name                = "SolutionEngine",
-       .mv_nr_irqs             = 108,
-};
index ad2b38ef65dcde5b538cd44778401484f57bfd82..2de42bae4b4f8da56cf4bde589c4c3b2e7c08286 100644 (file)
@@ -1,6 +1,7 @@
+obj-$(CONFIG_SH_7619_SOLUTION_ENGINE)  += board-se7619.o
+
 obj-$(CONFIG_SH_SOLUTION_ENGINE)       += 770x/
 obj-$(CONFIG_SH_7206_SOLUTION_ENGINE)  += 7206/
-obj-$(CONFIG_SH_7619_SOLUTION_ENGINE)  += 7619/
 obj-$(CONFIG_SH_7722_SOLUTION_ENGINE)  += 7722/
 obj-$(CONFIG_SH_7751_SOLUTION_ENGINE)  += 7751/
 obj-$(CONFIG_SH_7780_SOLUTION_ENGINE)  += 7780/
diff --git a/arch/sh/boards/mach-se/board-se7619.c b/arch/sh/boards/mach-se/board-se7619.c
new file mode 100644 (file)
index 0000000..1d0ef7f
--- /dev/null
@@ -0,0 +1,21 @@
+/*
+ * arch/sh/boards/se/7619/setup.c
+ *
+ * Copyright (C) 2006 Yoshinori Sato
+ *
+ * Hitachi SH7619 SolutionEngine Support.
+ */
+
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <asm/io.h>
+#include <asm/machvec.h>
+
+/*
+ * The Machine Vector
+ */
+
+static struct sh_machine_vector mv_se __initmv = {
+       .mv_name                = "SolutionEngine",
+       .mv_nr_irqs             = 108,
+};
diff --git a/arch/sh/boards/mach-sh7785lcr/Makefile b/arch/sh/boards/mach-sh7785lcr/Makefile
deleted file mode 100644 (file)
index 7703756..0000000
+++ /dev/null
@@ -1 +0,0 @@
-obj-y   := setup.o
diff --git a/arch/sh/boards/mach-sh7785lcr/setup.c b/arch/sh/boards/mach-sh7785lcr/setup.c
deleted file mode 100644 (file)
index b95d674..0000000
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Renesas Technology Corp. R0P7785LC0011RL Support.
- *
- * Copyright (C) 2008  Yoshihiro Shimoda
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/sm501.h>
-#include <linux/sm501-regs.h>
-#include <linux/fb.h>
-#include <linux/mtd/physmap.h>
-#include <linux/delay.h>
-#include <linux/i2c.h>
-#include <linux/i2c-pca-platform.h>
-#include <linux/i2c-algo-pca.h>
-#include <asm/heartbeat.h>
-#include <asm/sh7785lcr.h>
-
-/*
- * NOTE: This board has 2 physical memory maps.
- *      Please look at include/asm-sh/sh7785lcr.h or hardware manual.
- */
-static struct resource heartbeat_resources[] = {
-       [0] = {
-               .start  = PLD_LEDCR,
-               .end    = PLD_LEDCR,
-               .flags  = IORESOURCE_MEM,
-       },
-};
-
-static struct heartbeat_data heartbeat_data = {
-       .regsize = 8,
-};
-
-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           = 512 * 1024,
-       },
-       {
-               .name           = "bootenv",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 512 * 1024,
-       },
-       {
-               .name           = "kernel",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 4 * 1024 * 1024,
-       },
-       {
-               .name           = "data",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = MTDPART_SIZ_FULL,
-       },
-};
-
-static struct physmap_flash_data nor_flash_data = {
-       .width          = 4,
-       .parts          = nor_flash_partitions,
-       .nr_parts       = ARRAY_SIZE(nor_flash_partitions),
-};
-
-static struct resource nor_flash_resources[] = {
-       [0]     = {
-               .start  = NOR_FLASH_ADDR,
-               .end    = NOR_FLASH_ADDR + NOR_FLASH_SIZE - 1,
-               .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 resource r8a66597_usb_host_resources[] = {
-       [0] = {
-               .name   = "r8a66597_hcd",
-               .start  = R8A66597_ADDR,
-               .end    = R8A66597_ADDR + R8A66597_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .name   = "r8a66597_hcd",
-               .start  = 2,
-               .end    = 2,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct platform_device r8a66597_usb_host_device = {
-       .name           = "r8a66597_hcd",
-       .id             = -1,
-       .dev = {
-               .dma_mask               = NULL,
-               .coherent_dma_mask      = 0xffffffff,
-       },
-       .num_resources  = ARRAY_SIZE(r8a66597_usb_host_resources),
-       .resource       = r8a66597_usb_host_resources,
-};
-
-static struct resource sm501_resources[] = {
-       [0]     = {
-               .start  = SM107_MEM_ADDR,
-               .end    = SM107_MEM_ADDR + SM107_MEM_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1]     = {
-               .start  = SM107_REG_ADDR,
-               .end    = SM107_REG_ADDR + SM107_REG_SIZE - 1,
-               .flags  = IORESOURCE_MEM,
-       },
-       [2]     = {
-               .start  = 10,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct fb_videomode sm501_default_mode_crt = {
-       .pixclock       = 35714,        /* 28MHz */
-       .xres           = 640,
-       .yres           = 480,
-       .left_margin    = 105,
-       .right_margin   = 16,
-       .upper_margin   = 33,
-       .lower_margin   = 10,
-       .hsync_len      = 39,
-       .vsync_len      = 2,
-       .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-};
-
-static struct fb_videomode sm501_default_mode_pnl = {
-       .pixclock       = 40000,        /* 25MHz */
-       .xres           = 640,
-       .yres           = 480,
-       .left_margin    = 2,
-       .right_margin   = 16,
-       .upper_margin   = 33,
-       .lower_margin   = 10,
-       .hsync_len      = 39,
-       .vsync_len      = 2,
-       .sync           = 0,
-};
-
-static struct sm501_platdata_fbsub sm501_pdata_fbsub_pnl = {
-       .def_bpp        = 16,
-       .def_mode       = &sm501_default_mode_pnl,
-       .flags          = SM501FB_FLAG_USE_INIT_MODE |
-                         SM501FB_FLAG_USE_HWCURSOR |
-                         SM501FB_FLAG_USE_HWACCEL |
-                         SM501FB_FLAG_DISABLE_AT_EXIT |
-                         SM501FB_FLAG_PANEL_NO_VBIASEN,
-};
-
-static struct sm501_platdata_fbsub sm501_pdata_fbsub_crt = {
-       .def_bpp        = 16,
-       .def_mode       = &sm501_default_mode_crt,
-       .flags          = SM501FB_FLAG_USE_INIT_MODE |
-                         SM501FB_FLAG_USE_HWCURSOR |
-                         SM501FB_FLAG_USE_HWACCEL |
-                         SM501FB_FLAG_DISABLE_AT_EXIT,
-};
-
-static struct sm501_platdata_fb sm501_fb_pdata = {
-       .fb_route       = SM501_FB_OWN,
-       .fb_crt         = &sm501_pdata_fbsub_crt,
-       .fb_pnl         = &sm501_pdata_fbsub_pnl,
-};
-
-static struct sm501_initdata sm501_initdata = {
-       .gpio_high      = {
-               .set    = 0x00001fe0,
-               .mask   = 0x0,
-       },
-       .devices        = 0,
-       .mclk           = 84 * 1000000,
-       .m1xclk         = 112 * 1000000,
-};
-
-static struct sm501_platdata sm501_platform_data = {
-       .init           = &sm501_initdata,
-       .fb             = &sm501_fb_pdata,
-};
-
-static struct platform_device sm501_device = {
-       .name           = "sm501",
-       .id             = -1,
-       .dev            = {
-               .platform_data  = &sm501_platform_data,
-       },
-       .num_resources  = ARRAY_SIZE(sm501_resources),
-       .resource       = sm501_resources,
-};
-
-static struct resource i2c_resources[] = {
-       [0] = {
-               .start  = PCA9564_ADDR,
-               .end    = PCA9564_ADDR + PCA9564_SIZE - 1,
-               .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
-       },
-       [1] = {
-               .start  = 12,
-               .end    = 12,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static struct i2c_pca9564_pf_platform_data i2c_platform_data = {
-       .gpio                   = 0,
-       .i2c_clock_speed        = I2C_PCA_CON_330kHz,
-       .timeout                = 100,
-};
-
-static struct platform_device i2c_device = {
-       .name           = "i2c-pca-platform",
-       .id             = -1,
-       .dev            = {
-               .platform_data  = &i2c_platform_data,
-       },
-       .num_resources  = ARRAY_SIZE(i2c_resources),
-       .resource       = i2c_resources,
-};
-
-static struct platform_device *sh7785lcr_devices[] __initdata = {
-       &heartbeat_device,
-       &nor_flash_device,
-       &r8a66597_usb_host_device,
-       &sm501_device,
-       &i2c_device,
-};
-
-static struct i2c_board_info __initdata sh7785lcr_i2c_devices[] = {
-       {
-               I2C_BOARD_INFO("r2025sd", 0x32),
-       },
-};
-
-static int __init sh7785lcr_devices_setup(void)
-{
-       i2c_register_board_info(0, sh7785lcr_i2c_devices,
-                               ARRAY_SIZE(sh7785lcr_i2c_devices));
-
-       return platform_add_devices(sh7785lcr_devices,
-                                   ARRAY_SIZE(sh7785lcr_devices));
-}
-__initcall(sh7785lcr_devices_setup);
-
-/* Initialize IRQ setting */
-void __init init_sh7785lcr_IRQ(void)
-{
-       plat_irq_setup_pins(IRQ_MODE_IRQ7654);
-       plat_irq_setup_pins(IRQ_MODE_IRQ3210);
-}
-
-static void sh7785lcr_power_off(void)
-{
-       ctrl_outb(0x01, P2SEGADDR(PLD_POFCR));
-}
-
-/* Initialize the board */
-static void __init sh7785lcr_setup(char **cmdline_p)
-{
-       void __iomem *sm501_reg;
-
-       printk(KERN_INFO "Renesas Technology Corp. R0P7785LC0011RL support.\n");
-
-       pm_power_off = sh7785lcr_power_off;
-
-       /* sm501 DRAM configuration */
-       sm501_reg = (void __iomem *)0xb3e00000 + SM501_DRAM_CONTROL;
-       writel(0x000307c2, sm501_reg);
-}
-
-/*
- * The Machine Vector
- */
-static struct sh_machine_vector mv_sh7785lcr __initmv = {
-       .mv_name                = "SH7785LCR",
-       .mv_setup               = sh7785lcr_setup,
-       .mv_init_irq            = init_sh7785lcr_IRQ,
-};
-
diff --git a/arch/sh/boards/mach-shmin/Makefile b/arch/sh/boards/mach-shmin/Makefile
deleted file mode 100644 (file)
index 3190cc7..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the SHMIN board.
-#
-
-obj-y   := setup.o
diff --git a/arch/sh/boards/mach-shmin/setup.c b/arch/sh/boards/mach-shmin/setup.c
deleted file mode 100644 (file)
index 16e5dae..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * arch/sh/boards/shmin/setup.c
- *
- * Copyright (C) 2006 Takashi YOSHII
- *
- * SHMIN Support.
- */
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <asm/machvec.h>
-#include <asm/shmin.h>
-#include <asm/clock.h>
-#include <asm/io.h>
-
-#define PFC_PHCR       0xa400010eUL
-#define INTC_ICR1      0xa4000010UL
-
-static void __init init_shmin_irq(void)
-{
-       ctrl_outw(0x2a00, PFC_PHCR);    // IRQ0-3=IRQ
-       ctrl_outw(0x0aaa, INTC_ICR1);   // IRQ0-3=IRQ-mode,Low-active.
-       plat_irq_setup_pins(IRQ_MODE_IRQ);
-}
-
-static void __iomem *shmin_ioport_map(unsigned long port, unsigned int size)
-{
-       static int dummy;
-
-       if ((port & ~0x1f) == SHMIN_NE_BASE)
-               return (void __iomem *)(SHMIN_IO_BASE + port);
-
-       dummy = 0;
-
-       return &dummy;
-
-}
-
-static struct sh_machine_vector mv_shmin __initmv = {
-       .mv_name        = "SHMIN",
-       .mv_init_irq    = init_shmin_irq,
-       .mv_ioport_map  = shmin_ioport_map,
-};