65 files changed, 2189 insertions, 1689 deletions
diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
index 07b35ca2f644..d893411022d5 100644
--- a/arch/sh/boards/Kconfig
+++ b/arch/sh/boards/Kconfig
@@ -3,6 +3,9 @@ menu "Board support"
 config SOLUTION_ENGINE
        bool
+config SH_ALPHA_BOARD
+        bool
 config SH_SOLUTION_ENGINE
        bool "SolutionEngine"
        select SOLUTION_ENGINE
@@ -81,13 +84,6 @@ config SH_7343_SOLUTION_ENGINE
          Select 7343 SolutionEngine if configuring for a Hitachi
          SH7343 (SH-Mobile 3AS) evaluation board.
-config SH_7751_SYSTEMH
-        bool "SystemH7751R"
-        depends on CPU_SUBTYPE_SH7751R
-        help
-          Select SystemH if you are configuring for a Renesas SystemH
-          7751R evaluation board.
 config SH_HP6XX
        bool "HP6XX"
        select SYS_SUPPORTS_APM_EMULATION
@@ -155,6 +151,8 @@ config SH_SDK7786
        depends on CPU_SUBTYPE_SH7786
        select SYS_SUPPORTS_PCI
        select NO_IOPORT if !PCI
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select HAVE_SRAM_POOL
        help
          Select SDK7786 if configuring for a Renesas Technology Europe
          SH7786-65nm board.
@@ -165,6 +163,11 @@ config SH_HIGHLANDER
        select SYS_SUPPORTS_PCI
        select IO_TRAPPED if MMU
+config SH_SH7757LCR
+        bool "SH7757LCR"
+        depends on CPU_SUBTYPE_SH7757
+        select ARCH_REQUIRE_GPIOLIB
 config SH_SH7785LCR
        bool "SH7785LCR"
        depends on CPU_SUBTYPE_SH7785
@@ -309,6 +312,32 @@ config SH_POLARIS
        help
          Select if configuring for an SMSC Polaris development board
+config SH_SH2007
+        bool "SH-2007 board"
+        select NO_IOPORT
+        depends on CPU_SUBTYPE_SH7780
+        help
+          SH-2007 is a single-board computer based around SH7780 chip
+          intended for embedded applications.
+          It has an Ethernet interface (SMC9118), direct connected
+          Compact Flash socket, two serial ports and PC-104 bus.
+          More information at <http://sh2000.sh-linux.org>.
+config SH_APSH4A3A
+        bool "AP-SH4A-3A"
+        select SH_ALPHA_BOARD
+        depends on CPU_SUBTYPE_SH7785
+        help
+          Select AP-SH4A-3A if configuring for an ALPHAPROJECT AP-SH4A-3A.
+config SH_APSH4AD0A
+        bool "AP-SH4AD-0A"
+        select SH_ALPHA_BOARD
+        select SYS_SUPPORTS_PCI
+        depends on CPU_SUBTYPE_SH7786
+        help
+          Select AP-SH4AD-0A if configuring for an ALPHAPROJECT AP-SH4AD-0A.
 endmenu
 source "arch/sh/boards/mach-r2d/Kconfig"
diff --git a/arch/sh/boards/Makefile b/arch/sh/boards/Makefile
index 4f90f9b7a922..975a0f64ff20 100644
--- a/arch/sh/boards/Makefile
+++ b/arch/sh/boards/Makefile
@@ -2,10 +2,16 @@
 # Specific board support, not covered by a mach group.
 #
 obj-$(CONFIG_SH_MAGIC_PANEL_R2) += board-magicpanelr2.o
+obj-$(CONFIG_SH_SECUREEDGE5410) += board-secureedge5410.o
+obj-$(CONFIG_SH_SH2007)         += board-sh2007.o
 obj-$(CONFIG_SH_SH7785LCR)      += board-sh7785lcr.o
 obj-$(CONFIG_SH_URQUELL)        += board-urquell.o
 obj-$(CONFIG_SH_SHMIN)          += board-shmin.o
+obj-$(CONFIG_SH_EDOSK7705)      += board-edosk7705.o
 obj-$(CONFIG_SH_EDOSK7760)      += board-edosk7760.o
 obj-$(CONFIG_SH_ESPT)           += board-espt.o
 obj-$(CONFIG_SH_POLARIS)        += board-polaris.o
 obj-$(CONFIG_SH_TITAN)          += board-titan.o
+obj-$(CONFIG_SH_SH7757LCR)      += board-sh7757lcr.o
+obj-$(CONFIG_SH_APSH4A3A)       += board-apsh4a3a.o
+obj-$(CONFIG_SH_APSH4AD0A)      += board-apsh4ad0a.o
diff --git a/arch/sh/boards/board-apsh4a3a.c b/arch/sh/boards/board-apsh4a3a.c
new file mode 100644
index 000000000000..8e2a27057bc9
--- /dev/null
+++ b/arch/sh/boards/board-apsh4a3a.c
@@ -0,0 +1,175 @@
+/*
+ * ALPHAPROJECT AP-SH4A-3A Support.
+ *
+ * Copyright (C) 2010 ALPHAPROJECT Co.,Ltd.
+ * Copyright (C) 2008  Yoshihiro Shimoda
+ * Copyright (C) 2009  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/platform_device.h>
+#include <linux/io.h>
+#include <linux/mtd/physmap.h>
+#include <linux/smsc911x.h>
+#include <linux/irq.h>
+#include <linux/clk.h>
+#include <asm/machvec.h>
+#include <asm/sizes.h>
+#include <asm/clock.h>
+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  = 0x00000000,
+                .end    = 0x01000000 - 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 smsc911x_resources[] = {
+        [0] = {
+                .name           = "smsc911x-memory",
+                .start          = 0xA4000000,
+                .end            = 0xA4000000 + SZ_256 - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name           = "smsc911x-irq",
+                .start          = evt2irq(0x200),
+                .end            = evt2irq(0x200),
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct smsc911x_platform_config smsc911x_config = {
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .flags          = SMSC911X_USE_16BIT,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+static struct platform_device smsc911x_device = {
+        .name           = "smsc911x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smsc911x_resources),
+        .resource       = smsc911x_resources,
+        .dev = {
+                .platform_data = &smsc911x_config,
+        },
+};
+static struct platform_device *apsh4a3a_devices[] __initdata = {
+        &nor_flash_device,
+        &smsc911x_device,
+};
+static int __init apsh4a3a_devices_setup(void)
+{
+        return platform_add_devices(apsh4a3a_devices,
+                                    ARRAY_SIZE(apsh4a3a_devices));
+}
+device_initcall(apsh4a3a_devices_setup);
+static int apsh4a3a_clk_init(void)
+{
+        struct clk *clk;
+        int ret;
+        clk = clk_get(NULL, "extal");
+        if (!clk || IS_ERR(clk))
+                return PTR_ERR(clk);
+        ret = clk_set_rate(clk, 33333000);
+        clk_put(clk);
+        return ret;
+}
+/* Initialize the board */
+static void __init apsh4a3a_setup(char **cmdline_p)
+{
+        printk(KERN_INFO "Alpha Project AP-SH4A-3A support:\n");
+}
+static void __init apsh4a3a_init_irq(void)
+{
+        plat_irq_setup_pins(IRQ_MODE_IRQ7654);
+}
+/* Return the board specific boot mode pin configuration */
+static int apsh4a3a_mode_pins(void)
+{
+        int value = 0;
+        /* These are the factory default settings of SW1 and SW2.
+         * If you change these dip switches then you will need to
+         * adjust the values below as well.
+         */
+        value &= ~MODE_PIN0;  /* Clock Mode 16 */
+        value &= ~MODE_PIN1;
+        value &= ~MODE_PIN2;
+        value &= ~MODE_PIN3;
+        value |=  MODE_PIN4;
+        value &= ~MODE_PIN5;  /* 16-bit Area0 bus width */
+        value |=  MODE_PIN6;  /* Area 0 SRAM interface */
+        value |=  MODE_PIN7;
+        value |=  MODE_PIN8;  /* Little Endian */
+        value |=  MODE_PIN9;  /* Master Mode */
+        value |=  MODE_PIN10; /* Crystal resonator */
+        value |=  MODE_PIN11; /* Display Unit */
+        value |=  MODE_PIN12;
+        value &= ~MODE_PIN13; /* 29-bit address mode */
+        value |=  MODE_PIN14; /* No PLL step-up */
+        return value;
+}
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_apsh4a3a __initmv = {
+        .mv_name                = "AP-SH4A-3A",
+        .mv_setup               = apsh4a3a_setup,
+        .mv_clk_init            = apsh4a3a_clk_init,
+        .mv_init_irq            = apsh4a3a_init_irq,
+        .mv_mode_pins           = apsh4a3a_mode_pins,
+};
diff --git a/arch/sh/boards/board-apsh4ad0a.c b/arch/sh/boards/board-apsh4ad0a.c
new file mode 100644
index 000000000000..e2bd218a054e
--- /dev/null
+++ b/arch/sh/boards/board-apsh4ad0a.c
@@ -0,0 +1,125 @@
+/*
+ * ALPHAPROJECT AP-SH4AD-0A Support.
+ *
+ * Copyright (C) 2010 ALPHAPROJECT Co.,Ltd.
+ * Copyright (C) 2010  Matt Fleming
+ * Copyright (C) 2010  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/platform_device.h>
+#include <linux/io.h>
+#include <linux/smsc911x.h>
+#include <linux/irq.h>
+#include <linux/clk.h>
+#include <asm/machvec.h>
+#include <asm/sizes.h>
+static struct resource smsc911x_resources[] = {
+        [0] = {
+                .name           = "smsc911x-memory",
+                .start          = 0xA4000000,
+                .end            = 0xA4000000 + SZ_256 - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+        [1] = {
+                .name           = "smsc911x-irq",
+                .start          = evt2irq(0x200),
+                .end            = evt2irq(0x200),
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+static struct smsc911x_platform_config smsc911x_config = {
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_OPEN_DRAIN,
+        .flags          = SMSC911X_USE_16BIT,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+static struct platform_device smsc911x_device = {
+        .name           = "smsc911x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smsc911x_resources),
+        .resource       = smsc911x_resources,
+        .dev = {
+                .platform_data = &smsc911x_config,
+        },
+};
+static struct platform_device *apsh4ad0a_devices[] __initdata = {
+        &smsc911x_device,
+};
+static int __init apsh4ad0a_devices_setup(void)
+{
+        return platform_add_devices(apsh4ad0a_devices,
+                                    ARRAY_SIZE(apsh4ad0a_devices));
+}
+device_initcall(apsh4ad0a_devices_setup);
+static int apsh4ad0a_mode_pins(void)
+{
+        int value = 0;
+        /* These are the factory default settings of SW1 and SW2.
+         * If you change these dip switches then you will need to
+         * adjust the values below as well.
+         */
+        value |=  MODE_PIN0;  /* Clock Mode 3 */
+        value |=  MODE_PIN1;
+        value &= ~MODE_PIN2;
+        value &= ~MODE_PIN3;
+        value &= ~MODE_PIN4;  /* 16-bit Area0 bus width  */
+        value |=  MODE_PIN5;
+        value |=  MODE_PIN6;
+        value |=  MODE_PIN7;  /* Normal mode */
+        value |=  MODE_PIN8;  /* Little Endian */
+        value |=  MODE_PIN9;  /* Crystal resonator */
+        value &= ~MODE_PIN10; /* 29-bit address mode */
+        value &= ~MODE_PIN11; /* PCI-E Root port */
+        value &= ~MODE_PIN12; /* 4 lane + 1 lane */
+        value |=  MODE_PIN13; /* AUD Enable */
+        value &= ~MODE_PIN14; /* Normal Operation */
+        return value;
+}
+static int apsh4ad0a_clk_init(void)
+{
+        struct clk *clk;
+        int ret;
+        clk = clk_get(NULL, "extal");
+        if (!clk || IS_ERR(clk))
+                return PTR_ERR(clk);
+        ret = clk_set_rate(clk, 33333000);
+        clk_put(clk);
+        return ret;
+}
+/* Initialize the board */
+static void __init apsh4ad0a_setup(char **cmdline_p)
+{
+        pr_info("Alpha Project AP-SH4AD-0A support:\n");
+}
+static void __init apsh4ad0a_init_irq(void)
+{
+        plat_irq_setup_pins(IRQ_MODE_IRQ3210);
+}
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_apsh4ad0a __initmv = {
+        .mv_name                = "AP-SH4AD-0A",
+        .mv_setup               = apsh4ad0a_setup,
+        .mv_mode_pins           = apsh4ad0a_mode_pins,
+        .mv_clk_init            = apsh4ad0a_clk_init,
+        .mv_init_irq            = apsh4ad0a_init_irq,
+};
diff --git a/arch/sh/boards/board-edosk7705.c b/arch/sh/boards/board-edosk7705.c
new file mode 100644
index 000000000000..541d8a281035
--- /dev/null
+++ b/arch/sh/boards/board-edosk7705.c
@@ -0,0 +1,78 @@
+/*
+ * arch/sh/boards/renesas/edosk7705/setup.c
+ *
+ * Copyright (C) 2000  Kazumoto Kojima
+ *
+ * Hitachi SolutionEngine Support.
+ *
+ * Modified for edosk7705 development
+ * board by S. Dunn, 2003.
+ */
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/smc91x.h>
+#include <asm/machvec.h>
+#include <asm/sizes.h>
+#define SMC_IOBASE      0xA2000000
+#define SMC_IO_OFFSET   0x300
+#define SMC_IOADDR      (SMC_IOBASE + SMC_IO_OFFSET)
+#define ETHERNET_IRQ    0x09
+static void __init sh_edosk7705_init_irq(void)
+{
+        make_imask_irq(ETHERNET_IRQ);
+}
+/* eth initialization functions */
+static struct smc91x_platdata smc91x_info = {
+        .flags = SMC91X_USE_16BIT | SMC91X_IO_SHIFT_1 | IORESOURCE_IRQ_LOWLEVEL,
+};
+static struct resource smc91x_res[] = {
+        [0] = {
+                .start  = SMC_IOADDR,
+                .end    = SMC_IOADDR + SZ_32 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = ETHERNET_IRQ,
+                .end    = ETHERNET_IRQ,
+                .flags  = IORESOURCE_IRQ ,
+        }
+};
+static struct platform_device smc91x_dev = {
+        .name           = "smc91x",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(smc91x_res),
+        .resource       = smc91x_res,
+        .dev    = {
+                .platform_data  = &smc91x_info,
+        },
+};
+/* platform init code */
+static struct platform_device *edosk7705_devices[] __initdata = {
+        &smc91x_dev,
+};
+static int __init init_edosk7705_devices(void)
+{
+        return platform_add_devices(edosk7705_devices,
+                                    ARRAY_SIZE(edosk7705_devices));
+}
+device_initcall(init_edosk7705_devices);
+/*
+ * The Machine Vector
+ */
+static struct sh_machine_vector mv_edosk7705 __initmv = {
+        .mv_name                = "EDOSK7705",
+        .mv_nr_irqs             = 80,
+        .mv_init_irq            = sh_edosk7705_init_irq,
+};
diff --git a/arch/sh/boards/board-edosk7760.c b/arch/sh/boards/board-edosk7760.c
index 35dc0994875d..e9656a2cc4cc 100644
--- a/arch/sh/boards/board-edosk7760.c
+++ b/arch/sh/boards/board-edosk7760.c
@@ -56,7 +56,7 @@ static struct mtd_partition edosk7760_nor_flash_partitions[] = {
        }, {
                .name = "fs",
                .offset = MTDPART_OFS_APPEND,
-                .size = SZ_26M,
+                .size = (26 << 20),
        }, {
                .name = "other",
                .offset = MTDPART_OFS_APPEND,
@@ -182,7 +182,7 @@ static int __init init_edosk7760_devices(void)
        return platform_add_devices(edosk7760_devices,
                                    ARRAY_SIZE(edosk7760_devices));
 }
-__initcall(init_edosk7760_devices);
+device_initcall(init_edosk7760_devices);
 /*
 * The Machine Vector
diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c
index d5ce5e18eb37..9da92ac36533 100644
--- a/arch/sh/boards/board-espt.c
+++ b/arch/sh/boards/board-espt.c
@@ -66,6 +66,11 @@ static struct resource sh_eth_resources[] = {
                .end    = 0xFEE00F7C - 1,
                .flags  = IORESOURCE_MEM,
        }, {
+                .start  = 0xFEE01800,   /* TSU */
+                .end    = 0xFEE01FFF,
+                .flags  = IORESOURCE_MEM,
+        }, {
                .start  = 57,   /* irq number */
                .flags  = IORESOURCE_IRQ,
        },
@@ -74,6 +79,8 @@ static struct resource sh_eth_resources[] = {
 static struct sh_eth_plat_data sh7763_eth_pdata = {
        .phy = 0,
        .edmac_endian = EDMAC_LITTLE_ENDIAN,
+        .register_type = SH_ETH_REG_GIGABIT,
+        .phy_interface = PHY_INTERFACE_MODE_MII,
 };
 static struct platform_device espt_eth_device = {
diff --git a/arch/sh/boards/board-magicpanelr2.c b/arch/sh/boards/board-magicpanelr2.c
index efba450a0518..93f5039099b7 100644
--- a/arch/sh/boards/board-magicpanelr2.c
+++ b/arch/sh/boards/board-magicpanelr2.c
@@ -388,12 +388,12 @@ 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 */
+        irq_set_irq_type(32, IRQ_TYPE_LEVEL_LOW);    /* IRQ0 CAN1 */
-        set_irq_type(33, IRQ_TYPE_LEVEL_LOW);    /* IRQ1 CAN2 */
+        irq_set_irq_type(33, IRQ_TYPE_LEVEL_LOW);    /* IRQ1 CAN2 */
-        set_irq_type(34, IRQ_TYPE_LEVEL_LOW);    /* IRQ2 CAN3 */
+        irq_set_irq_type(34, IRQ_TYPE_LEVEL_LOW);    /* IRQ2 CAN3 */
-        set_irq_type(35, IRQ_TYPE_LEVEL_LOW);    /* IRQ3 SMSC9115 */
+        irq_set_irq_type(35, IRQ_TYPE_LEVEL_LOW);    /* IRQ3 SMSC9115 */
-        set_irq_type(36, IRQ_TYPE_EDGE_RISING);  /* IRQ4 touchscreen */
+        irq_set_irq_type(36, IRQ_TYPE_EDGE_RISING);  /* IRQ4 touchscreen */
-        set_irq_type(37, IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */
+        irq_set_irq_type(37, IRQ_TYPE_EDGE_FALLING); /* IRQ5 touchscreen */
        intc_set_priority(32, 13);              /* IRQ0 CAN1 */
        intc_set_priority(33, 13);              /* IRQ0 CAN2 */
diff --git a/arch/sh/boards/mach-snapgear/setup.c b/arch/sh/boards/board-secureedge5410.c
index 331745dee379..f968f17891a4 100644
--- a/arch/sh/boards/mach-snapgear/setup.c
+++ b/arch/sh/boards/board-secureedge5410.c
@@ -1,6 +1,4 @@
 /*
- * linux/arch/sh/boards/snapgear/setup.c
- *
 * Copyright (C) 2002  David McCullough <davidm@snapgear.com>
 * Copyright (C) 2003  Paul Mundt <lethal@linux-sh.org>
 *
@@ -19,19 +17,18 @@
 #include <linux/module.h>
 #include <linux/sched.h>
 #include <asm/machvec.h>
-#include <mach/snapgear.h>
+#include <mach/secureedge5410.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <cpu/timer.h>
+unsigned short secureedge5410_ioport;
 /*
 * EraseConfig handling functions
 */
 static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id)
 {
-        (void)__raw_readb(0xb8000000);  /* dummy read */
        printk("SnapGear: erase switch interrupt!\n");
        return IRQ_HANDLED;
@@ -39,21 +36,22 @@ static irqreturn_t eraseconfig_interrupt(int irq, void *dev_id)
 static int __init eraseconfig_init(void)
 {
+        unsigned int irq = evt2irq(0x240);
        printk("SnapGear: EraseConfig init\n");
        /* Setup "EraseConfig" switch on external IRQ 0 */
-        if (request_irq(IRL0_IRQ, eraseconfig_interrupt, IRQF_DISABLED,
+        if (request_irq(irq, eraseconfig_interrupt, IRQF_DISABLED,
                                "Erase Config", NULL))
                printk("SnapGear: failed to register IRQ%d for Reset witch\n",
-                                IRL0_IRQ);
+                                irq);
        else
                printk("SnapGear: registered EraseConfig switch on IRQ%d\n",
-                                IRL0_IRQ);
+                                irq);
-        return(0);
+        return 0;
 }
 module_init(eraseconfig_init);
-/****************************************************************************/
 /*
 * Initialize IRQ setting
 *
@@ -62,7 +60,6 @@ module_init(eraseconfig_init);
 * IRL2 = eth1
 * IRL3 = crypto
 */
 static void __init init_snapgear_IRQ(void)
 {
        printk("Setup SnapGear IRQ/IPR ...\n");
@@ -76,20 +73,5 @@ static void __init init_snapgear_IRQ(void)
 static struct sh_machine_vector mv_snapgear __initmv = {
        .mv_name                = "SnapGear SecureEdge5410",
        .mv_nr_irqs             = 72,
-        .mv_inb                 = snapgear_inb,
-        .mv_inw                 = snapgear_inw,
-        .mv_inl                 = snapgear_inl,
-        .mv_outb                = snapgear_outb,
-        .mv_outw                = snapgear_outw,
-        .mv_outl                = snapgear_outl,
-        .mv_inb_p               = snapgear_inb_p,
-        .mv_inw_p               = snapgear_inw,
-        .mv_inl_p               = snapgear_inl,
-        .mv_outb_p              = snapgear_outb_p,
-        .mv_outw_p              = snapgear_outw,
-        .mv_outl_p              = snapgear_outl,
        .mv_init_irq            = init_snapgear_IRQ,
 };
diff --git a/arch/sh/boards/board-sh2007.c b/arch/sh/boards/board-sh2007.c
new file mode 100644
index 000000000000..b90b78f6a829
--- /dev/null
+++ b/arch/sh/boards/board-sh2007.c
@@ -0,0 +1,133 @@
+/*
+ * SH-2007 board support.
+ *
+ * Copyright (C) 2003, 2004  SUGIOKA Toshinobu
+ * Copyright (C) 2010  Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
+ */
+#include <linux/init.h>
+#include <linux/irq.h>
+#include <linux/smsc911x.h>
+#include <linux/platform_device.h>
+#include <linux/ata_platform.h>
+#include <linux/io.h>
+#include <asm/machvec.h>
+#include <mach/sh2007.h>
+struct smsc911x_platform_config smc911x_info = {
+        .flags          = SMSC911X_USE_32BIT,
+        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
+        .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
+};
+static struct resource smsc9118_0_resources[] = {
+        [0] = {
+                .start  = SMC0_BASE,
+                .end    = SMC0_BASE + 0xff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = evt2irq(0x240),
+                .end    = evt2irq(0x240),
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+static struct resource smsc9118_1_resources[] = {
+        [0] = {
+                .start  = SMC1_BASE,
+                .end    = SMC1_BASE + 0xff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = evt2irq(0x280),
+                .end    = evt2irq(0x280),
+                .flags  = IORESOURCE_IRQ,
+        }
+};
+static struct platform_device smsc9118_0_device = {
+        .name           = "smsc911x",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(smsc9118_0_resources),
+        .resource       = smsc9118_0_resources,
+        .dev = {
+                .platform_data = &smc911x_info,
+        },
+};
+static struct platform_device smsc9118_1_device = {
+        .name           = "smsc911x",
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(smsc9118_1_resources),
+        .resource       = smsc9118_1_resources,
+        .dev = {
+                .platform_data = &smc911x_info,
+        },
+};
+static struct resource cf_resources[] = {
+        [0] = {
+                .start  = CF_BASE + CF_OFFSET,
+                .end    = CF_BASE + CF_OFFSET + 0x0f,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = CF_BASE + CF_OFFSET + 0x206,
+                .end    = CF_BASE + CF_OFFSET + 0x20f,
+                .flags  = IORESOURCE_MEM,
+        },
+        [2] = {
+                .start  = evt2irq(0x2c0),
+                .end    = evt2irq(0x2c0),
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct platform_device cf_device  = {
+        .name           = "pata_platform",
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(cf_resources),
+        .resource       = cf_resources,
+};
+static struct platform_device *sh2007_devices[] __initdata = {
+        &smsc9118_0_device,
+        &smsc9118_1_device,
+        &cf_device,
+};
+static int __init sh2007_io_init(void)
+{
+        platform_add_devices(sh2007_devices, ARRAY_SIZE(sh2007_devices));
+        return 0;
+}
+subsys_initcall(sh2007_io_init);
+static void __init sh2007_init_irq(void)
+{
+        plat_irq_setup_pins(IRQ_MODE_IRQ);
+}
+/*
+ * Initialize the board
+ */
+static void __init sh2007_setup(char **cmdline_p)
+{
+        printk(KERN_INFO "SH-2007 Setup...");
+        /* setup wait control registers for area 5 */
+        __raw_writel(CS5BCR_D, CS5BCR);
+        __raw_writel(CS5WCR_D, CS5WCR);
+        __raw_writel(CS5PCR_D, CS5PCR);
+        printk(KERN_INFO " done.\n");
+}
+/*
+ * The Machine Vector
+ */
+struct sh_machine_vector mv_sh2007 __initmv = {
+        .mv_setup               = sh2007_setup,
+        .mv_name                = "sh2007",
+        .mv_init_irq            = sh2007_init_irq,
+};
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
new file mode 100644
index 000000000000..fa2a208ec6cb
--- /dev/null
+++ b/arch/sh/boards/board-sh7757lcr.c
@@ -0,0 +1,559 @@
+/*
+ * Renesas R0P7757LC0012RL Support.
+ *
+ * Copyright (C) 2009 - 2010  Renesas Solutions Corp.
+ *
+ * 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/gpio.h>
+#include <linux/irq.h>
+#include <linux/spi/spi.h>
+#include <linux/spi/flash.h>
+#include <linux/io.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
+#include <cpu/sh7757.h>
+#include <asm/sh_eth.h>
+#include <asm/heartbeat.h>
+static struct resource heartbeat_resource = {
+        .start  = 0xffec005c,   /* PUDR */
+        .end    = 0xffec005c,
+        .flags  = IORESOURCE_MEM | IORESOURCE_MEM_8BIT,
+};
+static unsigned char heartbeat_bit_pos[] = { 0, 1, 2, 3 };
+static struct heartbeat_data heartbeat_data = {
+        .bit_pos        = heartbeat_bit_pos,
+        .nr_bits        = ARRAY_SIZE(heartbeat_bit_pos),
+        .flags          = HEARTBEAT_INVERTED,
+};
+static struct platform_device heartbeat_device = {
+        .name           = "heartbeat",
+        .id             = -1,
+        .dev    = {
+                .platform_data  = &heartbeat_data,
+        },
+        .num_resources  = 1,
+        .resource       = &heartbeat_resource,
+};
+/* Fast Ethernet */
+#define GBECONT         0xffc10100
+#define GBECONT_RMII1   BIT(17)
+#define GBECONT_RMII0   BIT(16)
+static void sh7757_eth_set_mdio_gate(unsigned long addr)
+{
+        if ((addr & 0x00000fff) < 0x0800)
+                writel(readl(GBECONT) | GBECONT_RMII0, GBECONT);
+        else
+                writel(readl(GBECONT) | GBECONT_RMII1, GBECONT);
+}
+static struct resource sh_eth0_resources[] = {
+        {
+                .start  = 0xfef00000,
+                .end    = 0xfef001ff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = 84,
+                .end    = 84,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct sh_eth_plat_data sh7757_eth0_pdata = {
+        .phy = 1,
+        .edmac_endian = EDMAC_LITTLE_ENDIAN,
+        .register_type = SH_ETH_REG_FAST_SH4,
+        .set_mdio_gate = sh7757_eth_set_mdio_gate,
+};
+static struct platform_device sh7757_eth0_device = {
+        .name           = "sh-eth",
+        .resource       = sh_eth0_resources,
+        .id             = 0,
+        .num_resources  = ARRAY_SIZE(sh_eth0_resources),
+        .dev            = {
+                .platform_data = &sh7757_eth0_pdata,
+        },
+};
+static struct resource sh_eth1_resources[] = {
+        {
+                .start  = 0xfef00800,
+                .end    = 0xfef009ff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = 84,
+                .end    = 84,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct sh_eth_plat_data sh7757_eth1_pdata = {
+        .phy = 1,
+        .edmac_endian = EDMAC_LITTLE_ENDIAN,
+        .register_type = SH_ETH_REG_FAST_SH4,
+        .set_mdio_gate = sh7757_eth_set_mdio_gate,
+};
+static struct platform_device sh7757_eth1_device = {
+        .name           = "sh-eth",
+        .resource       = sh_eth1_resources,
+        .id             = 1,
+        .num_resources  = ARRAY_SIZE(sh_eth1_resources),
+        .dev            = {
+                .platform_data = &sh7757_eth1_pdata,
+        },
+};
+static void sh7757_eth_giga_set_mdio_gate(unsigned long addr)
+{
+        if ((addr & 0x00000fff) < 0x0800) {
+                gpio_set_value(GPIO_PTT4, 1);
+                writel(readl(GBECONT) & ~GBECONT_RMII0, GBECONT);
+        } else {
+                gpio_set_value(GPIO_PTT4, 0);
+                writel(readl(GBECONT) & ~GBECONT_RMII1, GBECONT);
+        }
+}
+static struct resource sh_eth_giga0_resources[] = {
+        {
+                .start  = 0xfee00000,
+                .end    = 0xfee007ff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                /* TSU */
+                .start  = 0xfee01800,
+                .end    = 0xfee01fff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = 315,
+                .end    = 315,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct sh_eth_plat_data sh7757_eth_giga0_pdata = {
+        .phy = 18,
+        .edmac_endian = EDMAC_LITTLE_ENDIAN,
+        .register_type = SH_ETH_REG_GIGABIT,
+        .set_mdio_gate = sh7757_eth_giga_set_mdio_gate,
+        .phy_interface = PHY_INTERFACE_MODE_RGMII_ID,
+};
+static struct platform_device sh7757_eth_giga0_device = {
+        .name           = "sh-eth",
+        .resource       = sh_eth_giga0_resources,
+        .id             = 2,
+        .num_resources  = ARRAY_SIZE(sh_eth_giga0_resources),
+        .dev            = {
+                .platform_data = &sh7757_eth_giga0_pdata,
+        },
+};
+static struct resource sh_eth_giga1_resources[] = {
+        {
+                .start  = 0xfee00800,
+                .end    = 0xfee00fff,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = 316,
+                .end    = 316,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct sh_eth_plat_data sh7757_eth_giga1_pdata = {
+        .phy = 19,
+        .edmac_endian = EDMAC_LITTLE_ENDIAN,
+        .register_type = SH_ETH_REG_GIGABIT,
+        .set_mdio_gate = sh7757_eth_giga_set_mdio_gate,
+        .phy_interface = PHY_INTERFACE_MODE_RGMII_ID,
+};
+static struct platform_device sh7757_eth_giga1_device = {
+        .name           = "sh-eth",
+        .resource       = sh_eth_giga1_resources,
+        .id             = 3,
+        .num_resources  = ARRAY_SIZE(sh_eth_giga1_resources),
+        .dev            = {
+                .platform_data = &sh7757_eth_giga1_pdata,
+        },
+};
+/* SH_MMCIF */
+static struct resource sh_mmcif_resources[] = {
+        [0] = {
+                .start  = 0xffcb0000,
+                .end    = 0xffcb00ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 211,
+                .flags  = IORESOURCE_IRQ,
+        },
+        [2] = {
+                .start  = 212,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct sh_mmcif_dma sh7757lcr_mmcif_dma = {
+        .chan_priv_tx   = SHDMA_SLAVE_MMCIF_TX,
+        .chan_priv_rx   = SHDMA_SLAVE_MMCIF_RX,
+};
+static struct sh_mmcif_plat_data sh_mmcif_plat = {
+        .dma            = &sh7757lcr_mmcif_dma,
+        .sup_pclk       = 0x0f,
+        .caps           = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
+        .ocr            = MMC_VDD_32_33 | MMC_VDD_33_34,
+};
+static struct platform_device sh_mmcif_device = {
+        .name           = "sh_mmcif",
+        .id             = 0,
+        .dev            = {
+                .platform_data          = &sh_mmcif_plat,
+        },
+        .num_resources  = ARRAY_SIZE(sh_mmcif_resources),
+        .resource       = sh_mmcif_resources,
+};
+/* SDHI0 */
+static struct sh_mobile_sdhi_info sdhi_info = {
+        .dma_slave_tx   = SHDMA_SLAVE_SDHI_TX,
+        .dma_slave_rx   = SHDMA_SLAVE_SDHI_RX,
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
+};
+static struct resource sdhi_resources[] = {
+        [0] = {
+                .start  = 0xffe50000,
+                .end    = 0xffe501ff,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 20,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct platform_device sdhi_device = {
+        .name           = "sh_mobile_sdhi",
+        .num_resources  = ARRAY_SIZE(sdhi_resources),
+        .resource       = sdhi_resources,
+        .id             = 0,
+        .dev    = {
+                .platform_data  = &sdhi_info,
+        },
+};
+static struct platform_device *sh7757lcr_devices[] __initdata = {
+        &heartbeat_device,
+        &sh7757_eth0_device,
+        &sh7757_eth1_device,
+        &sh7757_eth_giga0_device,
+        &sh7757_eth_giga1_device,
+        &sh_mmcif_device,
+        &sdhi_device,
+};
+static struct flash_platform_data spi_flash_data = {
+        .name = "m25p80",
+        .type = "m25px64",
+};
+static struct spi_board_info spi_board_info[] = {
+        {
+                .modalias = "m25p80",
+                .max_speed_hz = 25000000,
+                .bus_num = 0,
+                .chip_select = 1,
+                .platform_data = &spi_flash_data,
+        },
+};
+static int __init sh7757lcr_devices_setup(void)
+{
+        /* RGMII (PTA) */
+        gpio_request(GPIO_FN_ET0_MDC, NULL);
+        gpio_request(GPIO_FN_ET0_MDIO, NULL);
+        gpio_request(GPIO_FN_ET1_MDC, NULL);
+        gpio_request(GPIO_FN_ET1_MDIO, NULL);
+        /* ONFI (PTB, PTZ) */
+        gpio_request(GPIO_FN_ON_NRE, NULL);
+        gpio_request(GPIO_FN_ON_NWE, NULL);
+        gpio_request(GPIO_FN_ON_NWP, NULL);
+        gpio_request(GPIO_FN_ON_NCE0, NULL);
+        gpio_request(GPIO_FN_ON_R_B0, NULL);
+        gpio_request(GPIO_FN_ON_ALE, NULL);
+        gpio_request(GPIO_FN_ON_CLE, NULL);
+        gpio_request(GPIO_FN_ON_DQ7, NULL);
+        gpio_request(GPIO_FN_ON_DQ6, NULL);
+        gpio_request(GPIO_FN_ON_DQ5, NULL);
+        gpio_request(GPIO_FN_ON_DQ4, NULL);
+        gpio_request(GPIO_FN_ON_DQ3, NULL);
+        gpio_request(GPIO_FN_ON_DQ2, NULL);
+        gpio_request(GPIO_FN_ON_DQ1, NULL);
+        gpio_request(GPIO_FN_ON_DQ0, NULL);
+        /* IRQ8 to 0 (PTB, PTC) */
+        gpio_request(GPIO_FN_IRQ8, NULL);
+        gpio_request(GPIO_FN_IRQ7, NULL);
+        gpio_request(GPIO_FN_IRQ6, NULL);
+        gpio_request(GPIO_FN_IRQ5, NULL);
+        gpio_request(GPIO_FN_IRQ4, NULL);
+        gpio_request(GPIO_FN_IRQ3, NULL);
+        gpio_request(GPIO_FN_IRQ2, NULL);
+        gpio_request(GPIO_FN_IRQ1, NULL);
+        gpio_request(GPIO_FN_IRQ0, NULL);
+        /* SPI0 (PTD) */
+        gpio_request(GPIO_FN_SP0_MOSI, NULL);
+        gpio_request(GPIO_FN_SP0_MISO, NULL);
+        gpio_request(GPIO_FN_SP0_SCK, NULL);
+        gpio_request(GPIO_FN_SP0_SCK_FB, NULL);
+        gpio_request(GPIO_FN_SP0_SS0, NULL);
+        gpio_request(GPIO_FN_SP0_SS1, NULL);
+        gpio_request(GPIO_FN_SP0_SS2, NULL);
+        gpio_request(GPIO_FN_SP0_SS3, NULL);
+        /* RMII 0/1 (PTE, PTF) */
+        gpio_request(GPIO_FN_RMII0_CRS_DV, NULL);
+        gpio_request(GPIO_FN_RMII0_TXD1, NULL);
+        gpio_request(GPIO_FN_RMII0_TXD0, NULL);
+        gpio_request(GPIO_FN_RMII0_TXEN, NULL);
+        gpio_request(GPIO_FN_RMII0_REFCLK, NULL);
+        gpio_request(GPIO_FN_RMII0_RXD1, NULL);
+        gpio_request(GPIO_FN_RMII0_RXD0, NULL);
+        gpio_request(GPIO_FN_RMII0_RX_ER, NULL);
+        gpio_request(GPIO_FN_RMII1_CRS_DV, NULL);
+        gpio_request(GPIO_FN_RMII1_TXD1, NULL);
+        gpio_request(GPIO_FN_RMII1_TXD0, NULL);
+        gpio_request(GPIO_FN_RMII1_TXEN, NULL);
+        gpio_request(GPIO_FN_RMII1_REFCLK, NULL);
+        gpio_request(GPIO_FN_RMII1_RXD1, NULL);
+        gpio_request(GPIO_FN_RMII1_RXD0, NULL);
+        gpio_request(GPIO_FN_RMII1_RX_ER, NULL);
+        /* eMMC (PTG) */
+        gpio_request(GPIO_FN_MMCCLK, NULL);
+        gpio_request(GPIO_FN_MMCCMD, NULL);
+        gpio_request(GPIO_FN_MMCDAT7, NULL);
+        gpio_request(GPIO_FN_MMCDAT6, NULL);
+        gpio_request(GPIO_FN_MMCDAT5, NULL);
+        gpio_request(GPIO_FN_MMCDAT4, NULL);
+        gpio_request(GPIO_FN_MMCDAT3, NULL);
+        gpio_request(GPIO_FN_MMCDAT2, NULL);
+        gpio_request(GPIO_FN_MMCDAT1, NULL);
+        gpio_request(GPIO_FN_MMCDAT0, NULL);
+        /* LPC (PTG, PTH, PTQ, PTU) */
+        gpio_request(GPIO_FN_SERIRQ, NULL);
+        gpio_request(GPIO_FN_LPCPD, NULL);
+        gpio_request(GPIO_FN_LDRQ, NULL);
+        gpio_request(GPIO_FN_WP, NULL);
+        gpio_request(GPIO_FN_FMS0, NULL);
+        gpio_request(GPIO_FN_LAD3, NULL);
+        gpio_request(GPIO_FN_LAD2, NULL);
+        gpio_request(GPIO_FN_LAD1, NULL);
+        gpio_request(GPIO_FN_LAD0, NULL);
+        gpio_request(GPIO_FN_LFRAME, NULL);
+        gpio_request(GPIO_FN_LRESET, NULL);
+        gpio_request(GPIO_FN_LCLK, NULL);
+        gpio_request(GPIO_FN_LGPIO7, NULL);
+        gpio_request(GPIO_FN_LGPIO6, NULL);
+        gpio_request(GPIO_FN_LGPIO5, NULL);
+        gpio_request(GPIO_FN_LGPIO4, NULL);
+        /* SPI1 (PTH) */
+        gpio_request(GPIO_FN_SP1_MOSI, NULL);
+        gpio_request(GPIO_FN_SP1_MISO, NULL);
+        gpio_request(GPIO_FN_SP1_SCK, NULL);
+        gpio_request(GPIO_FN_SP1_SCK_FB, NULL);
+        gpio_request(GPIO_FN_SP1_SS0, NULL);
+        gpio_request(GPIO_FN_SP1_SS1, NULL);
+        /* SDHI (PTI) */
+        gpio_request(GPIO_FN_SD_WP, NULL);
+        gpio_request(GPIO_FN_SD_CD, NULL);
+        gpio_request(GPIO_FN_SD_CLK, NULL);
+        gpio_request(GPIO_FN_SD_CMD, NULL);
+        gpio_request(GPIO_FN_SD_D3, NULL);
+        gpio_request(GPIO_FN_SD_D2, NULL);
+        gpio_request(GPIO_FN_SD_D1, NULL);
+        gpio_request(GPIO_FN_SD_D0, NULL);
+        /* SCIF3/4 (PTJ, PTW) */
+        gpio_request(GPIO_FN_RTS3, NULL);
+        gpio_request(GPIO_FN_CTS3, NULL);
+        gpio_request(GPIO_FN_TXD3, NULL);
+        gpio_request(GPIO_FN_RXD3, NULL);
+        gpio_request(GPIO_FN_RTS4, NULL);
+        gpio_request(GPIO_FN_RXD4, NULL);
+        gpio_request(GPIO_FN_TXD4, NULL);
+        gpio_request(GPIO_FN_CTS4, NULL);
+        /* SERMUX (PTK, PTL, PTO, PTV) */
+        gpio_request(GPIO_FN_COM2_TXD, NULL);
+        gpio_request(GPIO_FN_COM2_RXD, NULL);
+        gpio_request(GPIO_FN_COM2_RTS, NULL);
+        gpio_request(GPIO_FN_COM2_CTS, NULL);
+        gpio_request(GPIO_FN_COM2_DTR, NULL);
+        gpio_request(GPIO_FN_COM2_DSR, NULL);
+        gpio_request(GPIO_FN_COM2_DCD, NULL);
+        gpio_request(GPIO_FN_COM2_RI, NULL);
+        gpio_request(GPIO_FN_RAC_RXD, NULL);
+        gpio_request(GPIO_FN_RAC_RTS, NULL);
+        gpio_request(GPIO_FN_RAC_CTS, NULL);
+        gpio_request(GPIO_FN_RAC_DTR, NULL);
+        gpio_request(GPIO_FN_RAC_DSR, NULL);
+        gpio_request(GPIO_FN_RAC_DCD, NULL);
+        gpio_request(GPIO_FN_RAC_TXD, NULL);
+        gpio_request(GPIO_FN_COM1_TXD, NULL);
+        gpio_request(GPIO_FN_COM1_RXD, NULL);
+        gpio_request(GPIO_FN_COM1_RTS, NULL);
+        gpio_request(GPIO_FN_COM1_CTS, NULL);
+        writeb(0x10, 0xfe470000);       /* SMR0: SerMux mode 0 */
+        /* IIC (PTM, PTR, PTS) */
+        gpio_request(GPIO_FN_SDA7, NULL);
+        gpio_request(GPIO_FN_SCL7, NULL);
+        gpio_request(GPIO_FN_SDA6, NULL);
+        gpio_request(GPIO_FN_SCL6, NULL);
+        gpio_request(GPIO_FN_SDA5, NULL);
+        gpio_request(GPIO_FN_SCL5, NULL);
+        gpio_request(GPIO_FN_SDA4, NULL);
+        gpio_request(GPIO_FN_SCL4, NULL);
+        gpio_request(GPIO_FN_SDA3, NULL);
+        gpio_request(GPIO_FN_SCL3, NULL);
+        gpio_request(GPIO_FN_SDA2, NULL);
+        gpio_request(GPIO_FN_SCL2, NULL);
+        gpio_request(GPIO_FN_SDA1, NULL);
+        gpio_request(GPIO_FN_SCL1, NULL);
+        gpio_request(GPIO_FN_SDA0, NULL);
+        gpio_request(GPIO_FN_SCL0, NULL);
+        /* USB (PTN) */
+        gpio_request(GPIO_FN_VBUS_EN, NULL);
+        gpio_request(GPIO_FN_VBUS_OC, NULL);
+        /* SGPIO1/0 (PTN, PTO) */
+        gpio_request(GPIO_FN_SGPIO1_CLK, NULL);
+        gpio_request(GPIO_FN_SGPIO1_LOAD, NULL);
+        gpio_request(GPIO_FN_SGPIO1_DI, NULL);
+        gpio_request(GPIO_FN_SGPIO1_DO, NULL);
+        gpio_request(GPIO_FN_SGPIO0_CLK, NULL);
+        gpio_request(GPIO_FN_SGPIO0_LOAD, NULL);
+        gpio_request(GPIO_FN_SGPIO0_DI, NULL);
+        gpio_request(GPIO_FN_SGPIO0_DO, NULL);
+        /* WDT (PTN) */
+        gpio_request(GPIO_FN_SUB_CLKIN, NULL);
+        /* System (PTT) */
+        gpio_request(GPIO_FN_STATUS1, NULL);
+        gpio_request(GPIO_FN_STATUS0, NULL);
+        /* PWMX (PTT) */
+        gpio_request(GPIO_FN_PWMX1, NULL);
+        gpio_request(GPIO_FN_PWMX0, NULL);
+        /* R-SPI (PTV) */
+        gpio_request(GPIO_FN_R_SPI_MOSI, NULL);
+        gpio_request(GPIO_FN_R_SPI_MISO, NULL);
+        gpio_request(GPIO_FN_R_SPI_RSPCK, NULL);
+        gpio_request(GPIO_FN_R_SPI_SSL0, NULL);
+        gpio_request(GPIO_FN_R_SPI_SSL1, NULL);
+        /* EVC (PTV, PTW) */
+        gpio_request(GPIO_FN_EVENT7, NULL);
+        gpio_request(GPIO_FN_EVENT6, NULL);
+        gpio_request(GPIO_FN_EVENT5, NULL);
+        gpio_request(GPIO_FN_EVENT4, NULL);
+        gpio_request(GPIO_FN_EVENT3, NULL);
+        gpio_request(GPIO_FN_EVENT2, NULL);
+        gpio_request(GPIO_FN_EVENT1, NULL);
+        gpio_request(GPIO_FN_EVENT0, NULL);
+        /* LED for heartbeat */
+        gpio_request(GPIO_PTU3, NULL);
+        gpio_direction_output(GPIO_PTU3, 1);
+        gpio_request(GPIO_PTU2, NULL);
+        gpio_direction_output(GPIO_PTU2, 1);
+        gpio_request(GPIO_PTU1, NULL);
+        gpio_direction_output(GPIO_PTU1, 1);
+        gpio_request(GPIO_PTU0, NULL);
+        gpio_direction_output(GPIO_PTU0, 1);
+        /* control for MDIO of Gigabit Ethernet */
+        gpio_request(GPIO_PTT4, NULL);
+        gpio_direction_output(GPIO_PTT4, 1);
+        /* control for eMMC */
+        gpio_request(GPIO_PTT7, NULL);          /* eMMC_RST# */
+        gpio_direction_output(GPIO_PTT7, 0);
+        gpio_request(GPIO_PTT6, NULL);          /* eMMC_INDEX# */
+        gpio_direction_output(GPIO_PTT6, 0);
+        gpio_request(GPIO_PTT5, NULL);          /* eMMC_PRST# */
+        gpio_direction_output(GPIO_PTT5, 1);
+        /* register SPI device information */
+        spi_register_board_info(spi_board_info,
+                                ARRAY_SIZE(spi_board_info));
+        /* General platform */
+        return platform_add_devices(sh7757lcr_devices,
+                                    ARRAY_SIZE(sh7757lcr_devices));
+}
+arch_initcall(sh7757lcr_devices_setup);
+/* Initialize IRQ setting */
+void __init init_sh7757lcr_IRQ(void)
+{
+        plat_irq_setup_pins(IRQ_MODE_IRQ7654);
+        plat_irq_setup_pins(IRQ_MODE_IRQ3210);
+}
+/* Initialize the board */
+static void __init sh7757lcr_setup(char **cmdline_p)
+{
+        printk(KERN_INFO "Renesas R0P7757LC0012RL support.\n");
+}
+static int sh7757lcr_mode_pins(void)
+{
+        int value = 0;
+        /* These are the factory default settings of S3 (Low active).
+         * If you change these dip switches then you will need to
+         * adjust the values below as well.
+         */
+        value |= MODE_PIN0;     /* Clock Mode: 1 */
+        return value;
+}
+/* The Machine Vector */
+static struct sh_machine_vector mv_sh7757lcr __initmv = {
+        .mv_name                = "SH7757LCR",
+        .mv_setup               = sh7757lcr_setup,
+        .mv_init_irq            = init_sh7757lcr_IRQ,
+        .mv_mode_pins           = sh7757lcr_mode_pins,
+};
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c
index fe7e686c94ac..ee65ff05c558 100644
--- a/arch/sh/boards/board-sh7785lcr.c
+++ b/arch/sh/boards/board-sh7785lcr.c
@@ -284,7 +284,7 @@ static int __init sh7785lcr_devices_setup(void)
        return platform_add_devices(sh7785lcr_devices,
                                    ARRAY_SIZE(sh7785lcr_devices));
 }
-__initcall(sh7785lcr_devices_setup);
+device_initcall(sh7785lcr_devices_setup);
 /* Initialize IRQ setting */
 void __init init_sh7785lcr_IRQ(void)
diff --git a/arch/sh/boards/mach-ap325rxa/setup.c b/arch/sh/boards/mach-ap325rxa/setup.c
index 3da116f47f01..969421f64a15 100644
--- a/arch/sh/boards/mach-ap325rxa/setup.c
+++ b/arch/sh/boards/mach-ap325rxa/setup.c
@@ -14,6 +14,8 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/sh_flctl.h>
 #include <linux/delay.h>
@@ -154,28 +156,53 @@ static struct platform_device nand_flash_device = {
 #define PORT_DRVCRA     0xA405018A
 #define PORT_DRVCRB     0xA405018C
+static int ap320_wvga_set_brightness(void *board_data, int brightness)
+{
+        if (brightness) {
+                gpio_set_value(GPIO_PTS3, 0);
+                __raw_writew(0x100, FPGA_BKLREG);
+        } else {
+                __raw_writew(0, FPGA_BKLREG);
+                gpio_set_value(GPIO_PTS3, 1);
+        }
+        
+        return 0;
+}
+static int ap320_wvga_get_brightness(void *board_data)
+{
+        return gpio_get_value(GPIO_PTS3);
+}
 static void ap320_wvga_power_on(void *board_data, struct fb_info *info)
 {
        msleep(100);
        /* ASD AP-320/325 LCD ON */
        __raw_writew(FPGA_LCDREG_VAL, FPGA_LCDREG);
-        /* backlight */
-        gpio_set_value(GPIO_PTS3, 0);
-        __raw_writew(0x100, FPGA_BKLREG);
 }
 static void ap320_wvga_power_off(void *board_data)
 {
-        /* backlight */
-        __raw_writew(0, FPGA_BKLREG);
-        gpio_set_value(GPIO_PTS3, 1);
        /* ASD AP-320/325 LCD OFF */
        __raw_writew(0, FPGA_LCDREG);
 }
+const static struct fb_videomode ap325rxa_lcdc_modes[] = {
+        {
+                .name = "LB070WV1",
+                .xres = 800,
+                .yres = 480,
+                .left_margin = 32,
+                .right_margin = 160,
+                .hsync_len = 8,
+                .upper_margin = 63,
+                .lower_margin = 80,
+                .vsync_len = 1,
+                .sync = 0, /* hsync and vsync are active low */
+        },
+};
 static struct sh_mobile_lcdc_info lcdc_info = {
        .clock_source = LCDC_CLK_EXTERNAL,
        .ch[0] = {
@@ -183,18 +210,8 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                .bpp = 16,
                .interface_type = RGB18,
                .clock_divider = 1,
-                .lcd_cfg = {
+                .lcd_cfg = ap325rxa_lcdc_modes,
-                        .name = "LB070WV1",
+                .num_cfg = ARRAY_SIZE(ap325rxa_lcdc_modes),
-                        .xres = 800,
-                        .yres = 480,
-                        .left_margin = 32,
-                        .right_margin = 160,
-                        .hsync_len = 8,
-                        .upper_margin = 63,
-                        .lower_margin = 80,
-                        .vsync_len = 1,
-                        .sync = 0, /* hsync and vsync are active low */
-                },
                .lcd_size_cfg = { /* 7.0 inch */
                        .width = 152,
                        .height = 91,
@@ -202,6 +219,12 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                .board_cfg = {
                        .display_on = ap320_wvga_power_on,
                        .display_off = ap320_wvga_power_off,
+                        .set_brightness = ap320_wvga_set_brightness,
+                        .get_brightness = ap320_wvga_get_brightness,
+                },
+                .bl_info = {
+                        .name = "sh_mobile_lcdc_bl",
+                        .max_brightness = 1,
                },
        }
 };
@@ -336,37 +359,31 @@ static struct soc_camera_link camera_link = {
        .priv           = &camera_info,
 };
-static void dummy_release(struct device *dev)
+static struct platform_device *camera_device;
+static void ap325rxa_camera_release(struct device *dev)
 {
+        soc_camera_platform_release(&camera_device);
 }
-static struct platform_device camera_device = {
-        .name           = "soc_camera_platform",
-        .dev            = {
-                .platform_data  = &camera_info,
-                .release        = dummy_release,
-        },
-};
 static int ap325rxa_camera_add(struct soc_camera_link *icl,
                               struct device *dev)
 {
-        if (icl != &camera_link || camera_probe() <= 0)
+        int ret = soc_camera_platform_add(icl, dev, &camera_device, &camera_link,
-                return -ENODEV;
+                                          ap325rxa_camera_release, 0);
+        if (ret < 0)
+                return ret;
-        camera_info.dev = dev;
+        ret = camera_probe();
+        if (ret < 0)
+                soc_camera_platform_del(icl, camera_device, &camera_link);
-        return platform_device_register(&camera_device);
+        return ret;
 }
 static void ap325rxa_camera_del(struct soc_camera_link *icl)
 {
-        if (icl != &camera_link)
+        soc_camera_platform_del(icl, camera_device, &camera_link);
-                return;
-        platform_device_unregister(&camera_device);
-        memset(&camera_device.dev.kobj, 0,
-               sizeof(camera_device.dev.kobj));
 }
 #endif /* CONFIG_I2C */
@@ -416,7 +433,7 @@ static struct resource sdhi0_cn3_resources[] = {
        [0] = {
                .name   = "SDHI0",
                .start  = 0x04ce0000,
-                .end    = 0x04ce01ff,
+                .end    = 0x04ce00ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -425,11 +442,18 @@ static struct resource sdhi0_cn3_resources[] = {
        },
 };
+static struct sh_mobile_sdhi_info sdhi0_cn3_data = {
+        .tmio_caps      = MMC_CAP_SDIO_IRQ,
+};
 static struct platform_device sdhi0_cn3_device = {
        .name           = "sh_mobile_sdhi",
        .id             = 0, /* "sdhi0" clock */
        .num_resources  = ARRAY_SIZE(sdhi0_cn3_resources),
        .resource       = sdhi0_cn3_resources,
+        .dev = {
+                .platform_data = &sdhi0_cn3_data,
+        },
        .archdata = {
                .hwblk_id = HWBLK_SDHI0,
        },
@@ -439,7 +463,7 @@ static struct resource sdhi1_cn7_resources[] = {
        [0] = {
                .name   = "SDHI1",
                .start  = 0x04cf0000,
-                .end    = 0x04cf01ff,
+                .end    = 0x04cf00ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -448,11 +472,18 @@ static struct resource sdhi1_cn7_resources[] = {
        },
 };
+static struct sh_mobile_sdhi_info sdhi1_cn7_data = {
+        .tmio_caps      = MMC_CAP_SDIO_IRQ,
+};
 static struct platform_device sdhi1_cn7_device = {
        .name           = "sh_mobile_sdhi",
        .id             = 1, /* "sdhi1" clock */
        .num_resources  = ARRAY_SIZE(sdhi1_cn7_resources),
        .resource       = sdhi1_cn7_resources,
+        .dev = {
+                .platform_data = &sdhi1_cn7_data,
+        },
        .archdata = {
                .hwblk_id = HWBLK_SDHI1,
        },
@@ -481,7 +512,6 @@ static struct soc_camera_link ov7725_link = {
        .power          = ov7725_power,
        .board_info     = &ap325rxa_i2c_camera[0],
        .i2c_adapter_id = 0,
-        .module_name    = "ov772x",
        .priv           = &ov7725_info,
 };
diff --git a/arch/sh/boards/mach-cayman/irq.c b/arch/sh/boards/mach-cayman/irq.c
index 1394b078db36..311bcebdbd07 100644
--- a/arch/sh/boards/mach-cayman/irq.c
+++ b/arch/sh/boards/mach-cayman/irq.c
@@ -55,8 +55,9 @@ static struct irqaction cayman_action_pci2 = {
        .flags          = IRQF_DISABLED,
 };
-static void enable_cayman_irq(unsigned int irq)
+static void enable_cayman_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        unsigned long flags;
        unsigned long mask;
        unsigned int reg;
@@ -72,8 +73,9 @@ static void enable_cayman_irq(unsigned int irq)
        local_irq_restore(flags);
 }
-void disable_cayman_irq(unsigned int irq)
+static void disable_cayman_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        unsigned long flags;
        unsigned long mask;
        unsigned int reg;
@@ -89,16 +91,10 @@ void disable_cayman_irq(unsigned int irq)
        local_irq_restore(flags);
 }
-static void ack_cayman_irq(unsigned int irq)
-{
-        disable_cayman_irq(irq);
-}
 struct irq_chip cayman_irq_type = {
        .name           = "Cayman-IRQ",
-        .unmask         = enable_cayman_irq,
+        .irq_unmask     = enable_cayman_irq,
-        .mask           = disable_cayman_irq,
+        .irq_mask       = disable_cayman_irq,
-        .mask_ack       = ack_cayman_irq,
 };
 int cayman_irq_demux(int evt)
@@ -153,8 +149,8 @@ void init_cayman_irq(void)
        }
        for (i = 0; i < NR_EXT_IRQS; i++) {
-                set_irq_chip_and_handler(START_EXT_IRQS + i, &cayman_irq_type,
+                irq_set_chip_and_handler(START_EXT_IRQS + i,
-                                         handle_level_irq);
+                                         &cayman_irq_type, handle_level_irq);
        }
        /* Setup the SMSC interrupt */
diff --git a/arch/sh/boards/mach-cayman/setup.c b/arch/sh/boards/mach-cayman/setup.c
index 7e8216ac31bd..e89e8e122a26 100644
--- a/arch/sh/boards/mach-cayman/setup.c
+++ b/arch/sh/boards/mach-cayman/setup.c
@@ -165,7 +165,7 @@ static int __init smsc_superio_setup(void)
        return 0;
 }
-__initcall(smsc_superio_setup);
+device_initcall(smsc_superio_setup);
 static void __iomem *cayman_ioport_map(unsigned long port, unsigned int len)
 {
diff --git a/arch/sh/boards/mach-dreamcast/irq.c b/arch/sh/boards/mach-dreamcast/irq.c
index d932667410ab..f63d323f411f 100644
--- a/arch/sh/boards/mach-dreamcast/irq.c
+++ b/arch/sh/boards/mach-dreamcast/irq.c
@@ -51,7 +51,7 @@
 */
 #define LEVEL(event) (((event) - HW_EVENT_IRQ_BASE) / 32)
-/* Return the hardware event's bit positon within the EMR/ESR */
+/* Return the hardware event's bit position within the EMR/ESR */
 #define EVENT_BIT(event) (((event) - HW_EVENT_IRQ_BASE) & 31)
 /*
@@ -60,8 +60,9 @@
 */
 /* Disable the hardware event by masking its bit in its EMR */
-static inline void disable_systemasic_irq(unsigned int irq)
+static inline void disable_systemasic_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        __u32 emr = EMR_BASE + (LEVEL(irq) << 4) + (LEVEL(irq) << 2);
        __u32 mask;
@@ -71,8 +72,9 @@ static inline void disable_systemasic_irq(unsigned int irq)
 }
 /* Enable the hardware event by setting its bit in its EMR */
-static inline void enable_systemasic_irq(unsigned int irq)
+static inline void enable_systemasic_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        __u32 emr = EMR_BASE + (LEVEL(irq) << 4) + (LEVEL(irq) << 2);
        __u32 mask;
@@ -82,18 +84,19 @@ static inline void enable_systemasic_irq(unsigned int irq)
 }
 /* Acknowledge a hardware event by writing its bit back to its ESR */
-static void mask_ack_systemasic_irq(unsigned int irq)
+static void mask_ack_systemasic_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        __u32 esr = ESR_BASE + (LEVEL(irq) << 2);
-        disable_systemasic_irq(irq);
+        disable_systemasic_irq(data);
        outl((1 << EVENT_BIT(irq)), esr);
 }
 struct irq_chip systemasic_int = {
        .name           = "System ASIC",
-        .mask           = disable_systemasic_irq,
+        .irq_mask       = disable_systemasic_irq,
-        .mask_ack       = mask_ack_systemasic_irq,
+        .irq_mask_ack   = mask_ack_systemasic_irq,
-        .unmask         = enable_systemasic_irq,
+        .irq_unmask     = enable_systemasic_irq,
 };
 /*
@@ -158,7 +161,6 @@ void systemasic_irq_init(void)
                        return;
                }
-                set_irq_chip_and_handler(i, &systemasic_int,
+                irq_set_chip_and_handler(i, &systemasic_int, handle_level_irq);
-                                         handle_level_irq);
        }
 }
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 1d7b495a7db4..513cb1a2e6c8 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -11,15 +11,16 @@
 #include <linux/init.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/physmap.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/usb/r8a66597.h>
+#include <linux/usb/renesas_usbhs.h>
 #include <linux/i2c.h>
 #include <linux/i2c/tsc2007.h>
 #include <linux/spi/spi.h>
@@ -142,6 +143,8 @@ static struct resource sh_eth_resources[] = {
 static struct sh_eth_plat_data sh_eth_plat = {
        .phy = 0x1f, /* SMSC LAN8700 */
        .edmac_endian = EDMAC_LITTLE_ENDIAN,
+        .register_type = SH_ETH_REG_FAST_SH4,
+        .phy_interface = PHY_INTERFACE_MODE_MII,
        .ether_link_active_low = 1
 };
@@ -230,20 +233,111 @@ static struct platform_device usb1_common_device = {
        .resource       = usb1_common_resources,
 };
+/*
+ * USBHS
+ */
+static int usbhs_get_id(struct platform_device *pdev)
+{
+        return gpio_get_value(GPIO_PTB3);
+}
+static struct renesas_usbhs_platform_info usbhs_info = {
+        .platform_callback = {
+                .get_id         = usbhs_get_id,
+        },
+        .driver_param = {
+                .buswait_bwait          = 4,
+                .detection_delay        = 5,
+        },
+};
+static struct resource usbhs_resources[] = {
+        [0] = {
+                .start  = 0xa4d90000,
+                .end    = 0xa4d90124 - 1,
+                .flags  = IORESOURCE_MEM,
+        },
+        [1] = {
+                .start  = 66,
+                .end    = 66,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+static struct platform_device usbhs_device = {
+        .name   = "renesas_usbhs",
+        .id     = 1,
+        .dev = {
+                .dma_mask               = NULL,         /*  not use dma */
+                .coherent_dma_mask      = 0xffffffff,
+                .platform_data          = &usbhs_info,
+        },
+        .num_resources  = ARRAY_SIZE(usbhs_resources),
+        .resource       = usbhs_resources,
+        .archdata = {
+                .hwblk_id = HWBLK_USB1,
+        },
+};
 /* LCDC */
+const static struct fb_videomode ecovec_lcd_modes[] = {
+        {
+                .name           = "Panel",
+                .xres           = 800,
+                .yres           = 480,
+                .left_margin    = 220,
+                .right_margin   = 110,
+                .hsync_len      = 70,
+                .upper_margin   = 20,
+                .lower_margin   = 5,
+                .vsync_len      = 5,
+                .sync           = 0, /* hsync and vsync are active low */
+        },
+};
+const static struct fb_videomode ecovec_dvi_modes[] = {
+        {
+                .name           = "DVI",
+                .xres           = 1280,
+                .yres           = 720,
+                .left_margin    = 220,
+                .right_margin   = 110,
+                .hsync_len      = 40,
+                .upper_margin   = 20,
+                .lower_margin   = 5,
+                .vsync_len      = 5,
+                .sync = 0, /* hsync and vsync are active low */
+        },
+};
+static int ecovec24_set_brightness(void *board_data, int brightness)
+{
+        gpio_set_value(GPIO_PTR1, brightness);
+        return 0;
+}
+static int ecovec24_get_brightness(void *board_data)
+{
+        return gpio_get_value(GPIO_PTR1);
+}
 static struct sh_mobile_lcdc_info lcdc_info = {
        .ch[0] = {
                .interface_type = RGB18,
                .chan = LCDC_CHAN_MAINLCD,
                .bpp = 16,
-                .lcd_cfg = {
-                        .sync = 0, /* hsync and vsync are active low */
-                },
                .lcd_size_cfg = { /* 7.0 inch */
                        .width = 152,
                        .height = 91,
                },
                .board_cfg = {
+                        .set_brightness = ecovec24_set_brightness,
+                        .get_brightness = ecovec24_get_brightness,
+                },
+                .bl_info = {
+                        .name = "sh_mobile_lcdc_bl",
+                        .max_brightness = 1,
                },
        }
 };
@@ -435,7 +529,7 @@ static struct i2c_board_info ts_i2c_clients = {
        .irq            = IRQ0,
 };
-#ifdef CONFIG_MFD_SH_MOBILE_SDHI
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
 /* SDHI0 */
 static void sdhi0_set_pwr(struct platform_device *pdev, int state)
 {
@@ -446,13 +540,14 @@ static struct sh_mobile_sdhi_info sdhi0_info = {
        .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
        .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
        .set_pwr        = sdhi0_set_pwr,
+        .tmio_caps      = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD,
 };
 static struct resource sdhi0_resources[] = {
        [0] = {
                .name   = "SDHI0",
                .start  = 0x04ce0000,
-                .end    = 0x04ce01ff,
+                .end    = 0x04ce00ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -474,7 +569,7 @@ static struct platform_device sdhi0_device = {
        },
 };
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SDHI1 */
 static void sdhi1_set_pwr(struct platform_device *pdev, int state)
 {
@@ -484,6 +579,7 @@ static void sdhi1_set_pwr(struct platform_device *pdev, int state)
 static struct sh_mobile_sdhi_info sdhi1_info = {
        .dma_slave_tx   = SHDMA_SLAVE_SDHI1_TX,
        .dma_slave_rx   = SHDMA_SLAVE_SDHI1_RX,
+        .tmio_caps      = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD,
        .set_pwr        = sdhi1_set_pwr,
 };
@@ -491,7 +587,7 @@ static struct resource sdhi1_resources[] = {
        [0] = {
                .name   = "SDHI1",
                .start  = 0x04cf0000,
-                .end    = 0x04cf01ff,
+                .end    = 0x04cf00ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -620,7 +716,6 @@ static struct soc_camera_link tw9910_link = {
        .bus_id         = 1,
        .power          = tw9910_power,
        .board_info     = &i2c_camera[0],
-        .module_name    = "tw9910",
        .priv           = &tw9910_info,
 };
@@ -644,7 +739,6 @@ static struct soc_camera_link mt9t112_link1 = {
        .power          = mt9t112_power1,
        .bus_id         = 0,
        .board_info     = &i2c_camera[1],
-        .module_name    = "mt9t112",
        .priv           = &mt9t112_info1,
 };
@@ -667,7 +761,6 @@ static struct soc_camera_link mt9t112_link2 = {
        .power          = mt9t112_power2,
        .bus_id         = 1,
        .board_info     = &i2c_camera[2],
-        .module_name    = "mt9t112",
        .priv           = &mt9t112_info2,
 };
@@ -696,38 +789,8 @@ static struct platform_device camera_devices[] = {
 };
 /* FSI */
-/*
- * FSI-B use external clock which came from da7210.
- * So, we should change parent of fsi
- */
-#define FCLKBCR         0xa415000c
-static void fsimck_init(struct clk *clk)
-{
-        u32 status = __raw_readl(clk->enable_reg);
-        /* use external clock */
-        status &= ~0x000000ff;
-        status |= 0x00000080;
-        __raw_writel(status, clk->enable_reg);
-}
-static struct clk_ops fsimck_clk_ops = {
-        .init = fsimck_init,
-};
-static struct clk fsimckb_clk = {
-        .ops            = &fsimck_clk_ops,
-        .enable_reg     = (void __iomem *)FCLKBCR,
-        .rate           = 0, /* unknown */
-};
 static struct sh_fsi_platform_info fsi_info = {
-        .portb_flags = SH_FSI_BRS_INV |
+        .portb_flags = SH_FSI_BRS_INV,
-                       SH_FSI_OUT_SLAVE_MODE |
-                       SH_FSI_IN_SLAVE_MODE |
-                       SH_FSI_OFMT(I2S) |
-                       SH_FSI_IFMT(I2S),
 };
 static struct resource fsi_resources[] = {
@@ -793,7 +856,6 @@ static struct sh_vou_pdata sh_vou_pdata = {
        .flags          = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
        .board_info     = &ak8813,
        .i2c_adap       = 0,
-        .module_name    = "ak881x",
 };
 static struct resource sh_vou_resources[] = {
@@ -821,7 +883,7 @@ static struct platform_device vou_device = {
        },
 };
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SH_MMCIF */
 static void mmcif_set_pwr(struct platform_device *pdev, int state)
 {
@@ -870,6 +932,9 @@ static struct platform_device sh_mmcif_device = {
        },
        .num_resources  = ARRAY_SIZE(sh_mmcif_resources),
        .resource       = sh_mmcif_resources,
+        .archdata = {
+                .hwblk_id = HWBLK_MMC,
+        },
 };
 #endif
@@ -879,13 +944,14 @@ static struct platform_device *ecovec_devices[] __initdata = {
        &sh_eth_device,
        &usb0_host_device,
        &usb1_common_device,
+        &usbhs_device,
        &lcdc_device,
        &ceu0_device,
        &ceu1_device,
        &keysc_device,
-#ifdef CONFIG_MFD_SH_MOBILE_SDHI
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
        &sdhi0_device,
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
        &sdhi1_device,
 #endif
 #else
@@ -897,7 +963,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
        &fsi_device,
        &irda_device,
        &vou_device,
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
        &sh_mmcif_device,
 #endif
 };
@@ -939,7 +1005,7 @@ static void __init sh_eth_init(struct sh_eth_plat_data *pd)
                return;
        }
-        /* read MAC address frome EEPROM */
+        /* read MAC address from EEPROM */
        for (i = 0; i < sizeof(pd->mac_addr); i++) {
                pd->mac_addr[i] = mac_read(a, 0x10 + i);
                msleep(10);
@@ -1079,33 +1145,18 @@ static int __init arch_setup(void)
        if (gpio_get_value(GPIO_PTE6)) {
                /* DVI */
                lcdc_info.clock_source                  = LCDC_CLK_EXTERNAL;
-                lcdc_info.ch[0].clock_divider           = 1,
+                lcdc_info.ch[0].clock_divider           = 1;
-                lcdc_info.ch[0].lcd_cfg.name            = "DVI";
+                lcdc_info.ch[0].lcd_cfg                 = ecovec_dvi_modes;
-                lcdc_info.ch[0].lcd_cfg.xres            = 1280;
+                lcdc_info.ch[0].num_cfg                 = ARRAY_SIZE(ecovec_dvi_modes);
-                lcdc_info.ch[0].lcd_cfg.yres            = 720;
-                lcdc_info.ch[0].lcd_cfg.left_margin     = 220;
-                lcdc_info.ch[0].lcd_cfg.right_margin    = 110;
-                lcdc_info.ch[0].lcd_cfg.hsync_len       = 40;
-                lcdc_info.ch[0].lcd_cfg.upper_margin    = 20;
-                lcdc_info.ch[0].lcd_cfg.lower_margin    = 5;
-                lcdc_info.ch[0].lcd_cfg.vsync_len       = 5;
                gpio_set_value(GPIO_PTA2, 1);
                gpio_set_value(GPIO_PTU1, 1);
        } else {
                /* Panel */
                lcdc_info.clock_source                  = LCDC_CLK_PERIPHERAL;
-                lcdc_info.ch[0].clock_divider           = 2,
+                lcdc_info.ch[0].clock_divider           = 2;
-                lcdc_info.ch[0].lcd_cfg.name            = "Panel";
+                lcdc_info.ch[0].lcd_cfg                 = ecovec_lcd_modes;
-                lcdc_info.ch[0].lcd_cfg.xres            = 800;
+                lcdc_info.ch[0].num_cfg                 = ARRAY_SIZE(ecovec_lcd_modes);
-                lcdc_info.ch[0].lcd_cfg.yres            = 480;
-                lcdc_info.ch[0].lcd_cfg.left_margin     = 220;
-                lcdc_info.ch[0].lcd_cfg.right_margin    = 110;
-                lcdc_info.ch[0].lcd_cfg.hsync_len       = 70;
-                lcdc_info.ch[0].lcd_cfg.upper_margin    = 20;
-                lcdc_info.ch[0].lcd_cfg.lower_margin    = 5;
-                lcdc_info.ch[0].lcd_cfg.vsync_len       = 5;
                gpio_set_value(GPIO_PTR1, 1);
@@ -1120,7 +1171,7 @@ static int __init arch_setup(void)
                /* enable TouchScreen */
                i2c_register_board_info(0, &ts_i2c_clients, 1);
-                set_irq_type(IRQ0, IRQ_TYPE_LEVEL_LOW);
+                irq_set_irq_type(IRQ0, IRQ_TYPE_LEVEL_LOW);
        }
        /* enable CEU0 */
@@ -1180,7 +1231,7 @@ static int __init arch_setup(void)
        gpio_direction_input(GPIO_PTR5);
        gpio_direction_input(GPIO_PTR6);
-#ifdef CONFIG_MFD_SH_MOBILE_SDHI
+#if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
        /* enable SDHI0 on CN11 (needs DS2.4 set to ON) */
        gpio_request(GPIO_FN_SDHI0CD,  NULL);
        gpio_request(GPIO_FN_SDHI0WP,  NULL);
@@ -1193,7 +1244,7 @@ static int __init arch_setup(void)
        gpio_request(GPIO_PTB6, NULL);
        gpio_direction_output(GPIO_PTB6, 0);
-#if !defined(CONFIG_MMC_SH_MMCIF)
+#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
        /* enable SDHI1 on CN12 (needs DS2.6,7 set to ON,OFF) */
        gpio_request(GPIO_FN_SDHI1CD,  NULL);
        gpio_request(GPIO_FN_SDHI1WP,  NULL);
@@ -1248,18 +1299,18 @@ static int __init arch_setup(void)
        /* set SPU2 clock to 83.4 MHz */
        clk = clk_get(NULL, "spu_clk");
-        if (clk) {
+        if (!IS_ERR(clk)) {
                clk_set_rate(clk, clk_round_rate(clk, 83333333));
                clk_put(clk);
        }
        /* change parent of FSI B */
        clk = clk_get(NULL, "fsib_clk");
-        if (clk) {
+        if (!IS_ERR(clk)) {
-                clk_register(&fsimckb_clk);
+                /* 48kHz dummy clock was used to make sure 1/1 divide */
-                clk_set_parent(clk, &fsimckb_clk);
+                clk_set_rate(&sh7724_fsimckb_clk, 48000);
-                clk_set_rate(clk, 11000);
+                clk_set_parent(clk, &sh7724_fsimckb_clk);
-                clk_set_rate(&fsimckb_clk, 11000);
+                clk_set_rate(clk, 48000);
                clk_put(clk);
        }
@@ -1273,7 +1324,7 @@ static int __init arch_setup(void)
        /* set VPU clock to 166 MHz */
        clk = clk_get(NULL, "vpu_clk");
-        if (clk) {
+        if (!IS_ERR(clk)) {
                clk_set_rate(clk, clk_round_rate(clk, 166000000));
                clk_put(clk);
        }
@@ -1284,7 +1335,7 @@ static int __init arch_setup(void)
        gpio_request(GPIO_PTU5, NULL);
        gpio_direction_output(GPIO_PTU5, 0);
-#if defined(CONFIG_MMC_SH_MMCIF)
+#if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
        /* enable MMCIF (needs DS2.6,7 set to OFF,ON) */
        gpio_request(GPIO_FN_MMC_D7, NULL);
        gpio_request(GPIO_FN_MMC_D6, NULL);
@@ -1310,6 +1361,7 @@ static int __init arch_setup(void)
        i2c_register_board_info(1, i2c1_devices,
                                ARRAY_SIZE(i2c1_devices));
+#if defined(CONFIG_VIDEO_SH_VOU) || defined(CONFIG_VIDEO_SH_VOU_MODULE)
        /* VOU */
        gpio_request(GPIO_FN_DV_D15, NULL);
        gpio_request(GPIO_FN_DV_D14, NULL);
@@ -1341,6 +1393,7 @@ static int __init arch_setup(void)
        /* Remove reset */
        gpio_set_value(GPIO_PTG4, 1);
+#endif
        return platform_add_devices(ecovec_devices,
                                    ARRAY_SIZE(ecovec_devices));
diff --git a/arch/sh/boards/mach-edosk7705/Makefile b/arch/sh/boards/mach-edosk7705/Makefile
deleted file mode 100644
index cd54acb51499..000000000000
--- a/arch/sh/boards/mach-edosk7705/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the EDOSK7705 specific parts of the kernel
-#
-obj-y    := setup.o io.o
diff --git a/arch/sh/boards/mach-edosk7705/io.c b/arch/sh/boards/mach-edosk7705/io.c
deleted file mode 100644
index 5b9c57c43241..000000000000
--- a/arch/sh/boards/mach-edosk7705/io.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * arch/sh/boards/renesas/edosk7705/io.c
- *
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routines for Hitachi EDOSK7705 board.
- *
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/io.h>
-#include <mach/edosk7705.h>
-#include <asm/addrspace.h>
-#define SMC_IOADDR      0xA2000000
-/* Map the Ethernet addresses as if it is at 0x300 - 0x320 */
-static unsigned long sh_edosk7705_isa_port2addr(unsigned long port)
-{
-        /*
-         * SMC91C96 registers are 4 byte aligned rather than the
-         * usual 2 byte!
-         */
-        if (port >= 0x300 && port < 0x320)
-                return SMC_IOADDR + ((port - 0x300) * 2);
-        maybebadio(port);
-        return port;
-}
-/* Trying to read / write bytes on odd-byte boundaries to the Ethernet
- * registers causes problems. So we bit-shift the value and read / write
- * in 2 byte chunks. Setting the low byte to 0 does not cause problems
- * now as odd byte writes are only made on the bit mask / interrupt
- * register. This may not be the case in future Mar-2003 SJD
- */
-unsigned char sh_edosk7705_inb(unsigned long port)
-{
-        if (port >= 0x300 && port < 0x320 && port & 0x01)
-                return __raw_readw(port - 1) >> 8;
-        return __raw_readb(sh_edosk7705_isa_port2addr(port));
-}
-void sh_edosk7705_outb(unsigned char value, unsigned long port)
-{
-        if (port >= 0x300 && port < 0x320 && port & 0x01) {
-                __raw_writew(((unsigned short)value << 8), port - 1);
-                return;
-        }
-        __raw_writeb(value, sh_edosk7705_isa_port2addr(port));
-}
-void sh_edosk7705_insb(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned char *p = addr;
-        while (count--)
-                *p++ = sh_edosk7705_inb(port);
-}
-void sh_edosk7705_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned char *p = (unsigned char *)addr;
-        while (count--)
-                sh_edosk7705_outb(*p++, port);
-}
diff --git a/arch/sh/boards/mach-edosk7705/setup.c b/arch/sh/boards/mach-edosk7705/setup.c
deleted file mode 100644
index d59225e26fb9..000000000000
--- a/arch/sh/boards/mach-edosk7705/setup.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/sh/boards/renesas/edosk7705/setup.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Hitachi SolutionEngine Support.
- *
- * Modified for edosk7705 development
- * board by S. Dunn, 2003.
- */
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <asm/machvec.h>
-#include <mach/edosk7705.h>
-static void __init sh_edosk7705_init_irq(void)
-{
-        /* This is the Ethernet interrupt */
-        make_imask_irq(0x09);
-}
-/*
- * The Machine Vector
- */
-static struct sh_machine_vector mv_edosk7705 __initmv = {
-        .mv_name                = "EDOSK7705",
-        .mv_nr_irqs             = 80,
-        .mv_inb                 = sh_edosk7705_inb,
-        .mv_outb                = sh_edosk7705_outb,
-        .mv_insb                = sh_edosk7705_insb,
-        .mv_outsb               = sh_edosk7705_outsb,
-        .mv_init_irq            = sh_edosk7705_init_irq,
-};
diff --git a/arch/sh/boards/mach-highlander/setup.c b/arch/sh/boards/mach-highlander/setup.c
index a5ecfbacaf36..87618c91d178 100644
--- a/arch/sh/boards/mach-highlander/setup.c
+++ b/arch/sh/boards/mach-highlander/setup.c
@@ -24,10 +24,10 @@
 #include <linux/interrupt.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/usb/m66592.h>
+#include <linux/clkdev.h>
 #include <net/ax88796.h>
 #include <asm/machvec.h>
 #include <mach/highlander.h>
-#include <asm/clkdev.h>
 #include <asm/clock.h>
 #include <asm/heartbeat.h>
 #include <asm/io.h>
diff --git a/arch/sh/boards/mach-hp6xx/pm.c b/arch/sh/boards/mach-hp6xx/pm.c
index 4499a3749d40..adc9b4bba828 100644
--- a/arch/sh/boards/mach-hp6xx/pm.c
+++ b/arch/sh/boards/mach-hp6xx/pm.c
@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_t state)
        return 0;
 }
-static struct platform_suspend_ops hp6x0_pm_ops = {
+static const struct platform_suspend_ops hp6x0_pm_ops = {
        .enter          = hp6x0_pm_enter,
        .valid          = suspend_valid_only_mem,
 };
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index 68994a163f6c..8b4abbbd1477 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -10,7 +10,8 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/onenand.h>
@@ -126,6 +127,21 @@ static struct platform_device kfr2r09_sh_keysc_device = {
        },
 };
+const static struct fb_videomode kfr2r09_lcdc_modes[] = {
+        {
+                .name = "TX07D34VM0AAA",
+                .xres = 240,
+                .yres = 400,
+                .left_margin = 0,
+                .right_margin = 16,
+                .hsync_len = 8,
+                .upper_margin = 0,
+                .lower_margin = 1,
+                .vsync_len = 1,
+                .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+        },
+};
 static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
        .clock_source = LCDC_CLK_BUS,
        .ch[0] = {
@@ -134,18 +150,8 @@ static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
                .interface_type = SYS18,
                .clock_divider = 6,
                .flags = LCDC_FLAGS_DWPOL,
-                .lcd_cfg = {
+                .lcd_cfg = kfr2r09_lcdc_modes,
-                        .name = "TX07D34VM0AAA",
+                .num_cfg = ARRAY_SIZE(kfr2r09_lcdc_modes),
-                        .xres = 240,
-                        .yres = 400,
-                        .left_margin = 0,
-                        .right_margin = 16,
-                        .hsync_len = 8,
-                        .upper_margin = 0,
-                        .lower_margin = 1,
-                        .vsync_len = 1,
-                        .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-                },
                .lcd_size_cfg = {
                        .width = 35,
                        .height = 58,
@@ -333,7 +339,6 @@ static struct soc_camera_link rj54n1_link = {
        .power          = camera_power,
        .board_info     = &kfr2r09_i2c_camera,
        .i2c_adapter_id = 1,
-        .module_name    = "rj54n1cb0c",
        .priv           = &rj54n1_priv,
 };
@@ -349,7 +354,7 @@ static struct resource kfr2r09_sh_sdhi0_resources[] = {
        [0] = {
                .name   = "SDHI0",
                .start  = 0x04ce0000,
-                .end    = 0x04ce01ff,
+                .end    = 0x04ce00ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -362,6 +367,7 @@ static struct sh_mobile_sdhi_info sh7724_sdhi0_data = {
        .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
        .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
        .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE,
+        .tmio_caps      = MMC_CAP_SDIO_IRQ,
 };
 static struct platform_device kfr2r09_sh_sdhi0_device = {
diff --git a/arch/sh/boards/mach-landisk/gio.c b/arch/sh/boards/mach-landisk/gio.c
index 01e6abb769b9..8132dff078fb 100644
--- a/arch/sh/boards/mach-landisk/gio.c
+++ b/arch/sh/boards/mach-landisk/gio.c
@@ -128,6 +128,7 @@ static const struct file_operations gio_fops = {
        .open = gio_open,       /* open */
        .release = gio_close,   /* release */
        .unlocked_ioctl = gio_ioctl,
+        .llseek = noop_llseek,
 };
 static int __init gio_init(void)
diff --git a/arch/sh/boards/mach-landisk/irq.c b/arch/sh/boards/mach-landisk/irq.c
index 96f38a4187d0..c00ace38db3f 100644
--- a/arch/sh/boards/mach-landisk/irq.c
+++ b/arch/sh/boards/mach-landisk/irq.c
@@ -1,9 +1,10 @@
 /*
- * arch/sh/boards/landisk/irq.c
+ * arch/sh/boards/mach-landisk/irq.c
 *
 * I-O DATA Device, Inc. LANDISK Support
 *
 * Copyright (C) 2005-2007 kogiidena
+ * Copyright (C) 2011 Nobuhiro Iwamatsu
 *
 * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
 * Based largely on io_se.c.
@@ -12,45 +13,54 @@
 * 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/interrupt.h>
 #include <linux/io.h>
 #include <mach-landisk/mach/iodata_landisk.h>
-static void disable_landisk_irq(unsigned int irq)
+enum {
-{
+        UNUSED = 0,
-        unsigned char mask = 0xff ^ (0x01 << (irq - 5));
-        __raw_writeb(__raw_readb(PA_IMASK) & mask, PA_IMASK);
+        PCI_INTA, /* PCI int A */
-}
+        PCI_INTB, /* PCI int B */
+        PCI_INTC, /* PCI int C */
-static void enable_landisk_irq(unsigned int irq)
+        PCI_INTD, /* PCI int D */
-{
+        ATA,      /* ATA */
-        unsigned char value = (0x01 << (irq - 5));
+        FATA,     /* CF */
+        POWER,    /* Power swtich */
+        BUTTON,   /* Button swtich */
+};
-        __raw_writeb(__raw_readb(PA_IMASK) | value, PA_IMASK);
+/* Vectors for LANDISK */
-}
+static struct intc_vect vectors_landisk[] __initdata = {
+        INTC_IRQ(PCI_INTA, IRQ_PCIINTA),
+        INTC_IRQ(PCI_INTB, IRQ_PCIINTB),
+        INTC_IRQ(PCI_INTC, IRQ_PCIINTC),
+        INTC_IRQ(PCI_INTD, IRQ_PCIINTD),
+        INTC_IRQ(ATA, IRQ_ATA),
+        INTC_IRQ(FATA, IRQ_FATA),
+        INTC_IRQ(POWER, IRQ_POWER),
+        INTC_IRQ(BUTTON, IRQ_BUTTON),
+};
-static struct irq_chip landisk_irq_chip __read_mostly = {
+/* IRLMSK mask register layout for LANDISK */
-        .name           = "LANDISK",
+static struct intc_mask_reg mask_registers_landisk[] __initdata = {
-        .mask           = disable_landisk_irq,
+        { PA_IMASK, 0, 8, /* IRLMSK */
-        .unmask         = enable_landisk_irq,
+          {  BUTTON, POWER, FATA, ATA,
-        .mask_ack       = disable_landisk_irq,
+             PCI_INTD, PCI_INTC, PCI_INTB, PCI_INTA,
+          }
+        },
 };
+static DECLARE_INTC_DESC(intc_desc_landisk, "landisk", vectors_landisk, NULL,
+                        mask_registers_landisk, NULL, NULL);
 /*
 * Initialize IRQ setting
 */
 void __init init_landisk_IRQ(void)
 {
-        int i;
+        register_intc_controller(&intc_desc_landisk);
-        for (i = 5; i < 14; i++) {
-                disable_irq_nosync(i);
-                set_irq_chip_and_handler_name(i, &landisk_irq_chip,
-                                              handle_level_irq, "level");
-                enable_landisk_irq(i);
-        }
        __raw_writeb(0x00, PA_PWRINT_CLR);
 }
diff --git a/arch/sh/boards/mach-landisk/setup.c b/arch/sh/boards/mach-landisk/setup.c
index 50337acc18c5..f1147caebacf 100644
--- a/arch/sh/boards/mach-landisk/setup.c
+++ b/arch/sh/boards/mach-landisk/setup.c
@@ -21,11 +21,9 @@
 #include <mach-landisk/mach/iodata_landisk.h>
 #include <asm/io.h>
-void init_landisk_IRQ(void);
 static void landisk_power_off(void)
 {
-        __raw_writeb(0x01, PA_SHUTDOWN);
+        __raw_writeb(0x01, PA_SHUTDOWN);
 }
 static struct resource cf_ide_resources[3];
@@ -83,11 +81,11 @@ static int __init landisk_devices_setup(void)
                                    ARRAY_SIZE(landisk_devices));
 }
-__initcall(landisk_devices_setup);
+device_initcall(landisk_devices_setup);
 static void __init landisk_setup(char **cmdline_p)
 {
-        /* LED ON */
+        /* LED ON */
        __raw_writeb(__raw_readb(PA_LED) | 0x03, PA_LED);
        printk(KERN_INFO "I-O DATA DEVICE, INC. \"LANDISK Series\" support.\n");
@@ -99,7 +97,6 @@ static void __init landisk_setup(char **cmdline_p)
 */
 static struct sh_machine_vector mv_landisk __initmv = {
        .mv_name = "LANDISK",
-        .mv_nr_irqs = 72,
        .mv_setup = landisk_setup,
        .mv_init_irq = init_landisk_IRQ,
 };
diff --git a/arch/sh/boards/mach-microdev/io.c b/arch/sh/boards/mach-microdev/io.c
index 2960c659020e..acdafb0c6404 100644
--- a/arch/sh/boards/mach-microdev/io.c
+++ b/arch/sh/boards/mach-microdev/io.c
@@ -54,7 +54,7 @@
 /*
 * map I/O ports to memory-mapped addresses
 */
-static unsigned long microdev_isa_port2addr(unsigned long offset)
+void __iomem *microdev_ioport_map(unsigned long offset, unsigned int len)
 {
        unsigned long result;
@@ -72,16 +72,6 @@ static unsigned long microdev_isa_port2addr(unsigned long offset)
                         *      Configuration Registers
                         */
                result = IO_SUPERIO_PHYS + (offset << 1);
-#if 0
-        } else if (offset == KBD_DATA_REG || offset == KBD_CNTL_REG ||
-                   offset == KBD_STATUS_REG) {
-                        /*
-                         *      SMSC FDC37C93xAPM SuperIO chip
-                         *
-                         *      PS/2 Keyboard + Mouse (ports 0x60 and 0x64).
-                         */
-                result = IO_SUPERIO_PHYS + (offset << 1);
-#endif
        } else if (((offset >= IO_IDE1_BASE) &&
                    (offset <  IO_IDE1_BASE + IO_IDE_EXTENT)) ||
                    (offset == IO_IDE1_MISC)) {
@@ -131,237 +121,5 @@ static unsigned long microdev_isa_port2addr(unsigned long offset)
                result = PVR;
        }
-        return result;
+        return (void __iomem *)result;
-}
-#define PORT2ADDR(x) (microdev_isa_port2addr(x))
-static inline void delay(void)
-{
-#if defined(CONFIG_PCI)
-        /* System board present, just make a dummy SRAM access.  (CS0 will be
-           mapped to PCI memory, probably good to avoid it.) */
-        __raw_readw(0xa6800000);
-#else
-        /* CS0 will be mapped to flash, ROM etc so safe to access it. */
-        __raw_readw(0xa0000000);
-#endif
-}
-unsigned char microdev_inb(unsigned long port)
-{
-#ifdef CONFIG_PCI
-        if (port >= PCIBIOS_MIN_IO)
-                return microdev_pci_inb(port);
-#endif
-        return *(volatile unsigned char*)PORT2ADDR(port);
-}
-unsigned short microdev_inw(unsigned long port)
-{
-#ifdef CONFIG_PCI
-        if (port >= PCIBIOS_MIN_IO)
-                return microdev_pci_inw(port);
-#endif
-        return *(volatile unsigned short*)PORT2ADDR(port);
-}
-unsigned int microdev_inl(unsigned long port)
-{
-#ifdef CONFIG_PCI
-        if (port >= PCIBIOS_MIN_IO)
-                return microdev_pci_inl(port);
-#endif
-        return *(volatile unsigned int*)PORT2ADDR(port);
-}
-void microdev_outw(unsigned short b, unsigned long port)
-{
-#ifdef CONFIG_PCI
-        if (port >= PCIBIOS_MIN_IO) {
-                microdev_pci_outw(b, port);
-                return;
-        }
-#endif
-        *(volatile unsigned short*)PORT2ADDR(port) = b;
-}
-void microdev_outb(unsigned char b, unsigned long port)
-{
-#ifdef CONFIG_PCI
-        if (port >= PCIBIOS_MIN_IO) {
-                microdev_pci_outb(b, port);
-                return;
-        }
-#endif
-        /*
-         *      There is a board feature with the current SH4-202 MicroDev in
-         *      that the 2 byte enables (nBE0 and nBE1) are tied together (and
-         *      to the Chip Select Line (Ethernet_CS)). Due to this connectivity,
-         *      it is not possible to safely perform 8-bit writes to the
-         *      Ethernet registers, as 16-bits will be consumed from the Data
-         *      lines (corrupting the other byte).  Hence, this function is
-         *      written to implement 16-bit read/modify/write for all byte-wide
-         *      accesses.
-         *
-         *      Note: there is no problem with byte READS (even or odd).
-         *
-         *                      Sean McGoogan - 16th June 2003.
-         */
-        if ((port >= IO_LAN91C111_BASE) &&
-            (port <  IO_LAN91C111_BASE + IO_LAN91C111_EXTENT)) {
-                        /*
-                         * Then are trying to perform a byte-write to the
-                         * LAN91C111.  This needs special care.
-                         */
-                if (port % 2 == 1) {    /* is the port odd ? */
-                        /* unset bit-0, i.e. make even */
-                        const unsigned long evenPort = port-1;
-                        unsigned short word;
-                        /*
-                         * do a 16-bit read/write to write to 'port',
-                         * preserving even byte.
-                         *
-                         *      Even addresses are bits 0-7
-                         *      Odd  addresses are bits 8-15
-                         */
-                        word = microdev_inw(evenPort);
-                        word = (word & 0xffu) | (b << 8);
-                        microdev_outw(word, evenPort);
-                } else {
-                        /* else, we are trying to do an even byte write */
-                        unsigned short word;
-                        /*
-                         * do a 16-bit read/write to write to 'port',
-                         * preserving odd byte.
-                         *
-                         *      Even addresses are bits 0-7
-                         *      Odd  addresses are bits 8-15
-                         */
-                        word = microdev_inw(port);
-                        word = (word & 0xff00u) | (b);
-                        microdev_outw(word, port);
-                }
-        } else {
-                *(volatile unsigned char*)PORT2ADDR(port) = b;
-        }
-}
-void microdev_outl(unsigned int b, unsigned long port)
-{
-#ifdef CONFIG_PCI
-        if (port >= PCIBIOS_MIN_IO) {
-                microdev_pci_outl(b, port);
-                return;
-        }
-#endif
-        *(volatile unsigned int*)PORT2ADDR(port) = b;
-}
-unsigned char microdev_inb_p(unsigned long port)
-{
-        unsigned char v = microdev_inb(port);
-        delay();
-        return v;
-}
-unsigned short microdev_inw_p(unsigned long port)
-{
-        unsigned short v = microdev_inw(port);
-        delay();
-        return v;
-}
-unsigned int microdev_inl_p(unsigned long port)
-{
-        unsigned int v = microdev_inl(port);
-        delay();
-        return v;
-}
-void microdev_outb_p(unsigned char b, unsigned long port)
-{
-        microdev_outb(b, port);
-        delay();
-}
-void microdev_outw_p(unsigned short b, unsigned long port)
-{
-        microdev_outw(b, port);
-        delay();
-}
-void microdev_outl_p(unsigned int b, unsigned long port)
-{
-        microdev_outl(b, port);
-        delay();
-}
-void microdev_insb(unsigned long port, void *buffer, unsigned long count)
-{
-        volatile unsigned char *port_addr;
-        unsigned char *buf = buffer;
-        port_addr = (volatile unsigned char *)PORT2ADDR(port);
-        while (count--)
-                *buf++ = *port_addr;
-}
-void microdev_insw(unsigned long port, void *buffer, unsigned long count)
-{
-        volatile unsigned short *port_addr;
-        unsigned short *buf = buffer;
-        port_addr = (volatile unsigned short *)PORT2ADDR(port);
-        while (count--)
-                *buf++ = *port_addr;
-}
-void microdev_insl(unsigned long port, void *buffer, unsigned long count)
-{
-        volatile unsigned long *port_addr;
-        unsigned int *buf = buffer;
-        port_addr = (volatile unsigned long *)PORT2ADDR(port);
-        while (count--)
-                *buf++ = *port_addr;
-}
-void microdev_outsb(unsigned long port, const void *buffer, unsigned long count)
-{
-        volatile unsigned char *port_addr;
-        const unsigned char *buf = buffer;
-        port_addr = (volatile unsigned char *)PORT2ADDR(port);
-        while (count--)
-                *port_addr = *buf++;
-}
-void microdev_outsw(unsigned long port, const void *buffer, unsigned long count)
-{
-        volatile unsigned short *port_addr;
-        const unsigned short *buf = buffer;
-        port_addr = (volatile unsigned short *)PORT2ADDR(port);
-        while (count--)
-                *port_addr = *buf++;
-}
-void microdev_outsl(unsigned long port, const void *buffer, unsigned long count)
-{
-        volatile unsigned long *port_addr;
-        const unsigned int *buf = buffer;
-        port_addr = (volatile unsigned long *)PORT2ADDR(port);
-        while (count--)
-                *port_addr = *buf++;
 }
diff --git a/arch/sh/boards/mach-microdev/irq.c b/arch/sh/boards/mach-microdev/irq.c
index a26d16669aa2..4fb00369f0e2 100644
--- a/arch/sh/boards/mach-microdev/irq.c
+++ b/arch/sh/boards/mach-microdev/irq.c
@@ -65,19 +65,9 @@ static const struct {
 #  error Inconsistancy in defining the IRQ# for primary IDE!
 #endif
-static void enable_microdev_irq(unsigned int irq);
+static void disable_microdev_irq(struct irq_data *data)
-static void disable_microdev_irq(unsigned int irq);
-static void mask_and_ack_microdev(unsigned int);
-static struct irq_chip microdev_irq_type = {
-        .name = "MicroDev-IRQ",
-        .unmask = enable_microdev_irq,
-        .mask = disable_microdev_irq,
-        .ack = mask_and_ack_microdev,
-};
-static void disable_microdev_irq(unsigned int irq)
 {
+        unsigned int irq = data->irq;
        unsigned int fpgaIrq;
        if (irq >= NUM_EXTERNAL_IRQS)
@@ -91,8 +81,9 @@ static void disable_microdev_irq(unsigned int irq)
        __raw_writel(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTDSB_REG);
 }
-static void enable_microdev_irq(unsigned int irq)
+static void enable_microdev_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        unsigned long priorityReg, priorities, pri;
        unsigned int fpgaIrq;
@@ -116,17 +107,18 @@ static void enable_microdev_irq(unsigned int irq)
        __raw_writel(MICRODEV_FPGA_INTC_MASK(fpgaIrq), MICRODEV_FPGA_INTENB_REG);
 }
+static struct irq_chip microdev_irq_type = {
+        .name = "MicroDev-IRQ",
+        .irq_unmask = enable_microdev_irq,
+        .irq_mask = disable_microdev_irq,
+};
 /* This function sets the desired irq handler to be a MicroDev type */
 static void __init make_microdev_irq(unsigned int irq)
 {
        disable_irq_nosync(irq);
-        set_irq_chip_and_handler(irq, &microdev_irq_type, handle_level_irq);
+        irq_set_chip_and_handler(irq, &microdev_irq_type, handle_level_irq);
-        disable_microdev_irq(irq);
+        disable_microdev_irq(irq_get_irq_data(irq));
-}
-static void mask_and_ack_microdev(unsigned int irq)
-{
-        disable_microdev_irq(irq);
 }
 extern void __init init_microdev_irq(void)
diff --git a/arch/sh/boards/mach-microdev/setup.c b/arch/sh/boards/mach-microdev/setup.c
index d1df2a4fb9b8..d8a747291e03 100644
--- a/arch/sh/boards/mach-microdev/setup.c
+++ b/arch/sh/boards/mach-microdev/setup.c
@@ -195,27 +195,6 @@ device_initcall(microdev_devices_setup);
 static struct sh_machine_vector mv_sh4202_microdev __initmv = {
        .mv_name                = "SH4-202 MicroDev",
        .mv_nr_irqs             = 72,
+        .mv_ioport_map          = microdev_ioport_map,
-        .mv_inb                 = microdev_inb,
-        .mv_inw                 = microdev_inw,
-        .mv_inl                 = microdev_inl,
-        .mv_outb                = microdev_outb,
-        .mv_outw                = microdev_outw,
-        .mv_outl                = microdev_outl,
-        .mv_inb_p               = microdev_inb_p,
-        .mv_inw_p               = microdev_inw_p,
-        .mv_inl_p               = microdev_inl_p,
-        .mv_outb_p              = microdev_outb_p,
-        .mv_outw_p              = microdev_outw_p,
-        .mv_outl_p              = microdev_outl_p,
-        .mv_insb                = microdev_insb,
-        .mv_insw                = microdev_insw,
-        .mv_insl                = microdev_insl,
-        .mv_outsb               = microdev_outsb,
-        .mv_outsw               = microdev_outsw,
-        .mv_outsl               = microdev_outsl,
        .mv_init_irq            = init_microdev_irq,
 };
diff --git a/arch/sh/boards/mach-migor/setup.c b/arch/sh/boards/mach-migor/setup.c
index 662debe4ead2..184fde169132 100644
--- a/arch/sh/boards/mach-migor/setup.c
+++ b/arch/sh/boards/mach-migor/setup.c
@@ -12,7 +12,8 @@
 #include <linux/interrupt.h>
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/nand.h>
 #include <linux/i2c.h>
@@ -213,51 +214,55 @@ static struct platform_device migor_nand_flash_device = {
        }
 };
+const static struct fb_videomode migor_lcd_modes[] = {
+        {
+#if defined(CONFIG_SH_MIGOR_RTA_WVGA)
+                .name = "LB070WV1",
+                .xres = 800,
+                .yres = 480,
+                .left_margin = 64,
+                .right_margin = 16,
+                .hsync_len = 120,
+                .sync = 0,
+#elif defined(CONFIG_SH_MIGOR_QVGA)
+                .name = "PH240320T",
+                .xres = 320,
+                .yres = 240,
+                .left_margin = 0,
+                .right_margin = 16,
+                .hsync_len = 8,
+                .sync = FB_SYNC_HOR_HIGH_ACT,
+#endif
+                .upper_margin = 1,
+                .lower_margin = 17,
+                .vsync_len = 2,
+        },
+};
 static struct sh_mobile_lcdc_info sh_mobile_lcdc_info = {
-#ifdef CONFIG_SH_MIGOR_RTA_WVGA
+#if defined(CONFIG_SH_MIGOR_RTA_WVGA)
        .clock_source = LCDC_CLK_BUS,
        .ch[0] = {
                .chan = LCDC_CHAN_MAINLCD,
                .bpp = 16,
                .interface_type = RGB16,
                .clock_divider = 2,
-                .lcd_cfg = {
+                .lcd_cfg = migor_lcd_modes,
-                        .name = "LB070WV1",
+                .num_cfg = ARRAY_SIZE(migor_lcd_modes),
-                        .xres = 800,
-                        .yres = 480,
-                        .left_margin = 64,
-                        .right_margin = 16,
-                        .hsync_len = 120,
-                        .upper_margin = 1,
-                        .lower_margin = 17,
-                        .vsync_len = 2,
-                        .sync = 0,
-                },
                .lcd_size_cfg = { /* 7.0 inch */
                        .width = 152,
                        .height = 91,
                },
        }
-#endif
+#elif defined(CONFIG_SH_MIGOR_QVGA)
-#ifdef CONFIG_SH_MIGOR_QVGA
        .clock_source = LCDC_CLK_PERIPHERAL,
        .ch[0] = {
                .chan = LCDC_CHAN_MAINLCD,
                .bpp = 16,
                .interface_type = SYS16A,
                .clock_divider = 10,
-                .lcd_cfg = {
+                .lcd_cfg = migor_lcd_modes,
-                        .name = "PH240320T",
+                .num_cfg = ARRAY_SIZE(migor_lcd_modes),
-                        .xres = 320,
-                        .yres = 240,
-                        .left_margin = 0,
-                        .right_margin = 16,
-                        .hsync_len = 8,
-                        .upper_margin = 1,
-                        .lower_margin = 17,
-                        .vsync_len = 2,
-                        .sync = FB_SYNC_HOR_HIGH_ACT,
-                },
                .lcd_size_cfg = { /* 2.4 inch */
                        .width = 49,
                        .height = 37,
@@ -394,7 +399,7 @@ static struct resource sdhi_cn9_resources[] = {
        [0] = {
                .name   = "SDHI",
                .start  = 0x04ce0000,
-                .end    = 0x04ce01ff,
+                .end    = 0x04ce00ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -406,6 +411,7 @@ static struct resource sdhi_cn9_resources[] = {
 static struct sh_mobile_sdhi_info sh7724_sdhi_data = {
        .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
        .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
+        .tmio_caps      = MMC_CAP_SDIO_IRQ,
 };
 static struct platform_device sdhi_cn9_device = {
@@ -450,7 +456,6 @@ static struct soc_camera_link ov7725_link = {
        .power          = ov7725_power,
        .board_info     = &migor_i2c_camera[0],
        .i2c_adapter_id = 0,
-        .module_name    = "ov772x",
        .priv           = &ov7725_info,
 };
@@ -463,7 +468,6 @@ static struct soc_camera_link tw9910_link = {
        .power          = tw9910_power,
        .board_info     = &migor_i2c_camera[1],
        .i2c_adapter_id = 0,
-        .module_name    = "tw9910",
        .priv           = &tw9910_info,
 };
diff --git a/arch/sh/boards/mach-r2d/setup.c b/arch/sh/boards/mach-r2d/setup.c
index b84df6a3a93c..4b98a5251f83 100644
--- a/arch/sh/boards/mach-r2d/setup.c
+++ b/arch/sh/boards/mach-r2d/setup.c
@@ -258,7 +258,7 @@ static int __init rts7751r2d_devices_setup(void)
        return platform_add_devices(rts7751r2d_devices,
                                    ARRAY_SIZE(rts7751r2d_devices));
 }
-__initcall(rts7751r2d_devices_setup);
+device_initcall(rts7751r2d_devices_setup);
 static void rts7751r2d_power_off(void)
 {
diff --git a/arch/sh/boards/mach-rsk/devices-rsk7203.c b/arch/sh/boards/mach-rsk/devices-rsk7203.c
index 4fa08ba10253..a8089f79d058 100644
--- a/arch/sh/boards/mach-rsk/devices-rsk7203.c
+++ b/arch/sh/boards/mach-rsk/devices-rsk7203.c
@@ -1,7 +1,7 @@
 /*
 * Renesas Technology Europe RSK+ 7203 Support.
 *
- * Copyright (C) 2008 Paul Mundt
+ * Copyright (C) 2008 - 2010  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
@@ -12,7 +12,9 @@
 #include <linux/platform_device.h>
 #include <linux/interrupt.h>
 #include <linux/smsc911x.h>
+#include <linux/input.h>
 #include <linux/gpio.h>
+#include <linux/gpio_keys.h>
 #include <linux/leds.h>
 #include <asm/machvec.h>
 #include <asm/io.h>
@@ -84,9 +86,42 @@ static struct platform_device led_device = {
        },
 };
+static struct gpio_keys_button rsk7203_gpio_keys_table[] = {
+        {
+                .code           = BTN_0,
+                .gpio           = GPIO_PB0,
+                .active_low     = 1,
+                .desc           = "SW1",
+        }, {
+                .code           = BTN_1,
+                .gpio           = GPIO_PB1,
+                .active_low     = 1,
+                .desc           = "SW2",
+        }, {
+                .code           = BTN_2,
+                .gpio           = GPIO_PB2,
+                .active_low     = 1,
+                .desc           = "SW3",
+        },
+};
+static struct gpio_keys_platform_data rsk7203_gpio_keys_info = {
+        .buttons        = rsk7203_gpio_keys_table,
+        .nbuttons       = ARRAY_SIZE(rsk7203_gpio_keys_table),
+        .poll_interval  = 50, /* default to 50ms */
+};
+static struct platform_device keys_device = {
+        .name           = "gpio-keys-polled",
+        .dev            = {
+                .platform_data  = &rsk7203_gpio_keys_info,
+        },
+};
 static struct platform_device *rsk7203_devices[] __initdata = {
        &smsc911x_device,
        &led_device,
+        &keys_device,
 };
 static int __init rsk7203_devices_setup(void)
diff --git a/arch/sh/boards/mach-sdk7786/Makefile b/arch/sh/boards/mach-sdk7786/Makefile
index a29f19e85b63..8ae56e9560ac 100644
--- a/arch/sh/boards/mach-sdk7786/Makefile
+++ b/arch/sh/boards/mach-sdk7786/Makefile
@@ -1 +1,4 @@
-obj-y   := setup.o fpga.o irq.o
+obj-y   := fpga.o irq.o nmi.o setup.o
+obj-$(CONFIG_GENERIC_GPIO)      += gpio.o
+obj-$(CONFIG_HAVE_SRAM_POOL)    += sram.o
diff --git a/arch/sh/boards/mach-sdk7786/gpio.c b/arch/sh/boards/mach-sdk7786/gpio.c
new file mode 100644
index 000000000000..f71ce09d4e15
--- /dev/null
+++ b/arch/sh/boards/mach-sdk7786/gpio.c
@@ -0,0 +1,49 @@
+/*
+ * SDK7786 FPGA USRGPIR Support.
+ *
+ * Copyright (C) 2010  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/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <mach/fpga.h>
+#define NR_FPGA_GPIOS   8
+static const char *usrgpir_gpio_names[NR_FPGA_GPIOS] = {
+        "in0", "in1", "in2", "in3", "in4", "in5", "in6", "in7",
+};
+static int usrgpir_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
+{
+        /* always in */
+        return 0;
+}
+static int usrgpir_gpio_get(struct gpio_chip *chip, unsigned gpio)
+{
+        return !!(fpga_read_reg(USRGPIR) & (1 << gpio));
+}
+static struct gpio_chip usrgpir_gpio_chip = {
+        .label                  = "sdk7786-fpga",
+        .names                  = usrgpir_gpio_names,
+        .direction_input        = usrgpir_gpio_direction_input,
+        .get                    = usrgpir_gpio_get,
+        .base                   = -1, /* don't care */
+        .ngpio                  = NR_FPGA_GPIOS,
+};
+static int __init usrgpir_gpio_setup(void)
+{
+        return gpiochip_add(&usrgpir_gpio_chip);
+}
+device_initcall(usrgpir_gpio_setup);
diff --git a/arch/sh/boards/mach-sdk7786/nmi.c b/arch/sh/boards/mach-sdk7786/nmi.c
new file mode 100644
index 000000000000..edcfa1f568ba
--- /dev/null
+++ b/arch/sh/boards/mach-sdk7786/nmi.c
@@ -0,0 +1,83 @@
+/*
+ * SDK7786 FPGA NMI Support.
+ *
+ * Copyright (C) 2010  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/kernel.h>
+#include <linux/string.h>
+#include <mach/fpga.h>
+enum {
+        NMI_MODE_MANUAL,
+        NMI_MODE_AUX,
+        NMI_MODE_MASKED,
+        NMI_MODE_ANY,
+        NMI_MODE_UNKNOWN,
+};
+/*
+ * Default to the manual NMI switch.
+ */
+static unsigned int __initdata nmi_mode = NMI_MODE_ANY;
+static int __init nmi_mode_setup(char *str)
+{
+        if (!str)
+                return 0;
+        if (strcmp(str, "manual") == 0)
+                nmi_mode = NMI_MODE_MANUAL;
+        else if (strcmp(str, "aux") == 0)
+                nmi_mode = NMI_MODE_AUX;
+        else if (strcmp(str, "masked") == 0)
+                nmi_mode = NMI_MODE_MASKED;
+        else if (strcmp(str, "any") == 0)
+                nmi_mode = NMI_MODE_ANY;
+        else {
+                nmi_mode = NMI_MODE_UNKNOWN;
+                pr_warning("Unknown NMI mode %s\n", str);
+        }
+        printk("Set NMI mode to %d\n", nmi_mode);
+        return 0;
+}
+early_param("nmi_mode", nmi_mode_setup);
+void __init sdk7786_nmi_init(void)
+{
+        unsigned int source, mask, tmp;
+        switch (nmi_mode) {
+        case NMI_MODE_MANUAL:
+                source = NMISR_MAN_NMI;
+                mask = NMIMR_MAN_NMIM;
+                break;
+        case NMI_MODE_AUX:
+                source = NMISR_AUX_NMI;
+                mask = NMIMR_AUX_NMIM;
+                break;
+        case NMI_MODE_ANY:
+                source = NMISR_MAN_NMI | NMISR_AUX_NMI;
+                mask = NMIMR_MAN_NMIM | NMIMR_AUX_NMIM;
+                break;
+        case NMI_MODE_MASKED:
+        case NMI_MODE_UNKNOWN:
+        default:
+                source = mask = 0;
+                break;
+        }
+        /* Set the NMI source */
+        tmp = fpga_read_reg(NMISR);
+        tmp &= ~NMISR_MASK;
+        tmp |= source;
+        fpga_write_reg(tmp, NMISR);
+        /* And the IRQ masking */
+        fpga_write_reg(NMIMR_MASK ^ mask, NMIMR);
+}
diff --git a/arch/sh/boards/mach-sdk7786/setup.c b/arch/sh/boards/mach-sdk7786/setup.c
index 2ec1ea5cf8ef..1521aa75ee3a 100644
--- a/arch/sh/boards/mach-sdk7786/setup.c
+++ b/arch/sh/boards/mach-sdk7786/setup.c
@@ -15,11 +15,13 @@
 #include <linux/i2c.h>
 #include <linux/irq.h>
 #include <linux/clk.h>
+#include <linux/clkdev.h>
 #include <mach/fpga.h>
 #include <mach/irq.h>
 #include <asm/machvec.h>
 #include <asm/heartbeat.h>
 #include <asm/sizes.h>
+#include <asm/clock.h>
 #include <asm/reboot.h>
 #include <asm/smp-ops.h>
@@ -133,13 +135,52 @@ static int __init sdk7786_devices_setup(void)
        return sdk7786_i2c_setup();
 }
-__initcall(sdk7786_devices_setup);
+device_initcall(sdk7786_devices_setup);
 static int sdk7786_mode_pins(void)
 {
        return fpga_read_reg(MODSWR);
 }
+/*
+ * FPGA-driven PCIe clocks
+ *
+ * Historically these include the oscillator, clock B (slots 2/3/4) and
+ * clock A (slot 1 and the CPU clock). Newer revs of the PCB shove
+ * everything under a single PCIe clocks enable bit that happens to map
+ * to the same bit position as the oscillator bit for earlier FPGA
+ * versions.
+ *
+ * Given that the legacy clocks have the side-effect of shutting the CPU
+ * off through the FPGA along with the PCI slots, we simply leave them in
+ * their initial state and don't bother registering them with the clock
+ * framework.
+ */
+static int sdk7786_pcie_clk_enable(struct clk *clk)
+{
+        fpga_write_reg(fpga_read_reg(PCIECR) | PCIECR_CLKEN, PCIECR);
+        return 0;
+}
+static void sdk7786_pcie_clk_disable(struct clk *clk)
+{
+        fpga_write_reg(fpga_read_reg(PCIECR) & ~PCIECR_CLKEN, PCIECR);
+}
+static struct clk_ops sdk7786_pcie_clk_ops = {
+        .enable         = sdk7786_pcie_clk_enable,
+        .disable        = sdk7786_pcie_clk_disable,
+};
+static struct clk sdk7786_pcie_clk = {
+        .ops            = &sdk7786_pcie_clk_ops,
+};
+static struct clk_lookup sdk7786_pcie_cl = {
+        .con_id         = "pcie_plat_clk",
+        .clk            = &sdk7786_pcie_clk,
+};
 static int sdk7786_clk_init(void)
 {
        struct clk *clk;
@@ -158,7 +199,18 @@ static int sdk7786_clk_init(void)
        ret = clk_set_rate(clk, 33333333);
        clk_put(clk);
-        return ret;
+        /*
+         * Setup the FPGA clocks.
+         */
+        ret = clk_register(&sdk7786_pcie_clk);
+        if (unlikely(ret)) {
+                pr_err("FPGA clock registration failed\n");
+                return ret;
+        }
+        clkdev_add(&sdk7786_pcie_cl);
+        return 0;
 }
 static void sdk7786_restart(char *cmd)
@@ -185,6 +237,7 @@ static void __init sdk7786_setup(char **cmdline_p)
        pr_info("Renesas Technology Europe SDK7786 support:\n");
        sdk7786_fpga_init();
+        sdk7786_nmi_init();
        pr_info("\tPCB revision:\t%d\n", fpga_read_reg(PCBRR) & 0xf);
diff --git a/arch/sh/boards/mach-sdk7786/sram.c b/arch/sh/boards/mach-sdk7786/sram.c
new file mode 100644
index 000000000000..c81c3abbe01c
--- /dev/null
+++ b/arch/sh/boards/mach-sdk7786/sram.c
@@ -0,0 +1,72 @@
+/*
+ * SDK7786 FPGA SRAM Support.
+ *
+ * Copyright (C) 2010  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.
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/io.h>
+#include <linux/string.h>
+#include <mach/fpga.h>
+#include <asm/sram.h>
+#include <asm/sizes.h>
+static int __init fpga_sram_init(void)
+{
+        unsigned long phys;
+        unsigned int area;
+        void __iomem *vaddr;
+        int ret;
+        u16 data;
+        /* Enable FPGA SRAM */
+        data = fpga_read_reg(LCLASR);
+        data |= LCLASR_FRAMEN;
+        fpga_write_reg(data, LCLASR);
+        /*
+         * FPGA_SEL determines the area mapping
+         */
+        area = (data & LCLASR_FPGA_SEL_MASK) >> LCLASR_FPGA_SEL_SHIFT;
+        if (unlikely(area == LCLASR_AREA_MASK)) {
+                pr_err("FPGA memory unmapped.\n");
+                return -ENXIO;
+        }
+        /*
+         * The memory itself occupies a 2KiB range at the top of the area
+         * immediately below the system registers.
+         */
+        phys = (area << 26) + SZ_64M - SZ_4K;
+        /*
+         * The FPGA SRAM resides in translatable physical space, so set
+         * up a mapping prior to inserting it in to the pool.
+         */
+        vaddr = ioremap(phys, SZ_2K);
+        if (unlikely(!vaddr)) {
+                pr_err("Failed remapping FPGA memory.\n");
+                return -ENXIO;
+        }
+        pr_info("Adding %dKiB of FPGA memory at 0x%08lx-0x%08lx "
+                "(area %d) to pool.\n",
+                SZ_2K >> 10, phys, phys + SZ_2K - 1, area);
+        ret = gen_pool_add(sram_pool, (unsigned long)vaddr, SZ_2K, -1);
+        if (unlikely(ret < 0)) {
+                pr_err("Failed adding memory\n");
+                iounmap(vaddr);
+                return ret;
+        }
+        return 0;
+}
+postcore_initcall(fpga_sram_init);
diff --git a/arch/sh/boards/mach-se/7206/Makefile b/arch/sh/boards/mach-se/7206/Makefile
index 63e7ed699f39..5c9eaa0535b9 100644
--- a/arch/sh/boards/mach-se/7206/Makefile
+++ b/arch/sh/boards/mach-se/7206/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the 7206 SolutionEngine specific parts of the kernel
 #
-obj-y    := setup.o io.o irq.o
+obj-y    := setup.o irq.o
diff --git a/arch/sh/boards/mach-se/7206/io.c b/arch/sh/boards/mach-se/7206/io.c
deleted file mode 100644
index adadc77532ee..000000000000
--- a/arch/sh/boards/mach-se/7206/io.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/* $Id: io.c,v 1.5 2004/02/22 23:08:43 kkojima Exp $
- *
- * linux/arch/sh/boards/se/7206/io.c
- *
- * Copyright (C) 2006 Yoshinori Sato
- *
- * I/O routine for Hitachi 7206 SolutionEngine.
- *
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <asm/io.h>
-#include <mach-se/mach/se7206.h>
-static inline void delay(void)
-{
-        __raw_readw(0x20000000);  /* P2 ROM Area */
-}
-/* MS7750 requires special versions of in*, out* routines, since
-   PC-like io ports are located at upper half byte of 16-bit word which
-   can be accessed only with 16-bit wide.  */
-static inline volatile __u16 *
-port2adr(unsigned int port)
-{
-        if (port >= 0x2000 && port < 0x2020)
-                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-        else if (port >= 0x300 && port < 0x310)
-                return (volatile __u16 *) (PA_SMSC + (port - 0x300));
-        return (volatile __u16 *)port;
-}
-unsigned char se7206_inb(unsigned long port)
-{
-        return (*port2adr(port)) & 0xff;
-}
-unsigned char se7206_inb_p(unsigned long port)
-{
-        unsigned long v;
-        v = (*port2adr(port)) & 0xff;
-        delay();
-        return v;
-}
-unsigned short se7206_inw(unsigned long port)
-{
-        return *port2adr(port);
-}
-void se7206_outb(unsigned char value, unsigned long port)
-{
-        *(port2adr(port)) = value;
-}
-void se7206_outb_p(unsigned char value, unsigned long port)
-{
-        *(port2adr(port)) = value;
-        delay();
-}
-void se7206_outw(unsigned short value, unsigned long port)
-{
-        *port2adr(port) = value;
-}
-void se7206_insb(unsigned long port, void *addr, unsigned long count)
-{
-        volatile __u16 *p = port2adr(port);
-        __u8 *ap = addr;
-        while (count--)
-                *ap++ = *p;
-}
-void se7206_insw(unsigned long port, void *addr, unsigned long count)
-{
-        volatile __u16 *p = port2adr(port);
-        __u16 *ap = addr;
-        while (count--)
-                *ap++ = *p;
-}
-void se7206_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        volatile __u16 *p = port2adr(port);
-        const __u8 *ap = addr;
-        while (count--)
-                *p = *ap++;
-}
-void se7206_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        volatile __u16 *p = port2adr(port);
-        const __u16 *ap = addr;
-        while (count--)
-                *p = *ap++;
-}
diff --git a/arch/sh/boards/mach-se/7206/irq.c b/arch/sh/boards/mach-se/7206/irq.c
index 8d82175d83ab..0db058e709e9 100644
--- a/arch/sh/boards/mach-se/7206/irq.c
+++ b/arch/sh/boards/mach-se/7206/irq.c
@@ -25,8 +25,9 @@
 #define INTC_IPR01 0xfffe0818
 #define INTC_ICR1  0xfffe0802
-static void disable_se7206_irq(unsigned int irq)
+static void disable_se7206_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        unsigned short val;
        unsigned short mask = 0xffff ^ (0x0f << 4 * (3 - (IRQ0_IRQ - irq)));
        unsigned short msk0,msk1;
@@ -55,8 +56,9 @@ static void disable_se7206_irq(unsigned int irq)
        __raw_writew(msk1, INTMSK1);
 }
-static void enable_se7206_irq(unsigned int irq)
+static void enable_se7206_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        unsigned short val;
        unsigned short value = (0x0001 << 4 * (3 - (IRQ0_IRQ - irq)));
        unsigned short msk0,msk1;
@@ -86,13 +88,13 @@ static void enable_se7206_irq(unsigned int irq)
        __raw_writew(msk1, INTMSK1);
 }
-static void eoi_se7206_irq(unsigned int irq)
+static void eoi_se7206_irq(struct irq_data *data)
 {
        unsigned short sts0,sts1;
-        struct irq_desc *desc = irq_to_desc(irq);
+        unsigned int irq = data->irq;
-        if (!(desc->status & (IRQ_DISABLED|IRQ_INPROGRESS)))
+        if (!irqd_irq_disabled(data) && !irqd_irq_inprogress(data))
-                enable_se7206_irq(irq);
+                enable_se7206_irq(data);
        /* FPGA isr clear */
        sts0 = __raw_readw(INTSTS0);
        sts1 = __raw_readw(INTSTS1);
@@ -115,18 +117,17 @@ static void eoi_se7206_irq(unsigned int irq)
 static struct irq_chip se7206_irq_chip __read_mostly = {
        .name           = "SE7206-FPGA",
-        .mask           = disable_se7206_irq,
+        .irq_mask       = disable_se7206_irq,
-        .unmask         = enable_se7206_irq,
+        .irq_unmask     = enable_se7206_irq,
-        .mask_ack       = disable_se7206_irq,
+        .irq_eoi        = eoi_se7206_irq,
-        .eoi            = eoi_se7206_irq,
 };
 static void make_se7206_irq(unsigned int irq)
 {
        disable_irq_nosync(irq);
-        set_irq_chip_and_handler_name(irq, &se7206_irq_chip,
+        irq_set_chip_and_handler_name(irq, &se7206_irq_chip,
                                      handle_level_irq, "level");
-        disable_se7206_irq(irq);
+        disable_se7206_irq(irq_get_irq_data(irq));
 }
 /*
@@ -137,11 +138,13 @@ void __init init_se7206_IRQ(void)
        make_se7206_irq(IRQ0_IRQ); /* SMC91C111 */
        make_se7206_irq(IRQ1_IRQ); /* ATA */
        make_se7206_irq(IRQ3_IRQ); /* SLOT / PCM */
-        __raw_writew(inw(INTC_ICR1) | 0x000b ,INTC_ICR1 ) ; /* ICR1 */
+        __raw_writew(__raw_readw(INTC_ICR1) | 0x000b, INTC_ICR1); /* ICR1 */
        /* FPGA System register setup*/
        __raw_writew(0x0000,INTSTS0); /* Clear INTSTS0 */
        __raw_writew(0x0000,INTSTS1); /* Clear INTSTS1 */
        /* IRQ0=LAN, IRQ1=ATA, IRQ3=SLT,PCM */
        __raw_writew(0x0001,INTSEL);
 }
diff --git a/arch/sh/boards/mach-se/7206/setup.c b/arch/sh/boards/mach-se/7206/setup.c
index 8f5c65d43d1d..8ab8330e3fd1 100644
--- a/arch/sh/boards/mach-se/7206/setup.c
+++ b/arch/sh/boards/mach-se/7206/setup.c
@@ -77,7 +77,12 @@ static int __init se7206_devices_setup(void)
 {
        return platform_add_devices(se7206_devices, ARRAY_SIZE(se7206_devices));
 }
-__initcall(se7206_devices_setup);
+device_initcall(se7206_devices_setup);
+static int se7206_mode_pins(void)
+{
+        return MODE_PIN1 | MODE_PIN2;
+}
 /*
 * The Machine Vector
@@ -86,20 +91,6 @@ __initcall(se7206_devices_setup);
 static struct sh_machine_vector mv_se __initmv = {
        .mv_name                = "SolutionEngine",
        .mv_nr_irqs             = 256,
-        .mv_inb                 = se7206_inb,
-        .mv_inw                 = se7206_inw,
-        .mv_outb                = se7206_outb,
-        .mv_outw                = se7206_outw,
-        .mv_inb_p               = se7206_inb_p,
-        .mv_inw_p               = se7206_inw,
-        .mv_outb_p              = se7206_outb_p,
-        .mv_outw_p              = se7206_outw,
-        .mv_insb                = se7206_insb,
-        .mv_insw                = se7206_insw,
-        .mv_outsb               = se7206_outsb,
-        .mv_outsw               = se7206_outsw,
        .mv_init_irq            = init_se7206_IRQ,
+        .mv_mode_pins           = se7206_mode_pins,
 };
diff --git a/arch/sh/boards/mach-se/7343/irq.c b/arch/sh/boards/mach-se/7343/irq.c
index d4305c26e9f7..fd45ffc48340 100644
--- a/arch/sh/boards/mach-se/7343/irq.c
+++ b/arch/sh/boards/mach-se/7343/irq.c
@@ -18,23 +18,22 @@
 unsigned int se7343_fpga_irq[SE7343_FPGA_IRQ_NR] = { 0, };
-static void disable_se7343_irq(unsigned int irq)
+static void disable_se7343_irq(struct irq_data *data)
 {
-        unsigned int bit = (unsigned int)get_irq_chip_data(irq);
+        unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data);
        __raw_writew(__raw_readw(PA_CPLD_IMSK) | 1 << bit, PA_CPLD_IMSK);
 }
-static void enable_se7343_irq(unsigned int irq)
+static void enable_se7343_irq(struct irq_data *data)
 {
-        unsigned int bit = (unsigned int)get_irq_chip_data(irq);
+        unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data);
        __raw_writew(__raw_readw(PA_CPLD_IMSK) & ~(1 << bit), PA_CPLD_IMSK);
 }
 static struct irq_chip se7343_irq_chip __read_mostly = {
-        .name           = "SE7343-FPGA",
+        .name           = "SE7343-FPGA",
-        .mask           = disable_se7343_irq,
+        .irq_mask       = disable_se7343_irq,
-        .unmask         = enable_se7343_irq,
+        .irq_unmask     = enable_se7343_irq,
-        .mask_ack       = disable_se7343_irq,
 };
 static void se7343_irq_demux(unsigned int irq, struct irq_desc *desc)
@@ -68,19 +67,20 @@ void __init init_7343se_IRQ(void)
                        return;
                se7343_fpga_irq[i] = irq;
-                set_irq_chip_and_handler_name(se7343_fpga_irq[i],
+                irq_set_chip_and_handler_name(se7343_fpga_irq[i],
                                              &se7343_irq_chip,
-                                              handle_level_irq, "level");
+                                              handle_level_irq,
+                                              "level");
-                set_irq_chip_data(se7343_fpga_irq[i], (void *)i);
+                irq_set_chip_data(se7343_fpga_irq[i], (void *)i);
        }
-        set_irq_chained_handler(IRQ0_IRQ, se7343_irq_demux);
+        irq_set_chained_handler(IRQ0_IRQ, se7343_irq_demux);
-        set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
-        set_irq_chained_handler(IRQ1_IRQ, se7343_irq_demux);
+        irq_set_chained_handler(IRQ1_IRQ, se7343_irq_demux);
-        set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
-        set_irq_chained_handler(IRQ4_IRQ, se7343_irq_demux);
+        irq_set_chained_handler(IRQ4_IRQ, se7343_irq_demux);
-        set_irq_type(IRQ4_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ4_IRQ, IRQ_TYPE_LEVEL_LOW);
-        set_irq_chained_handler(IRQ5_IRQ, se7343_irq_demux);
+        irq_set_chained_handler(IRQ5_IRQ, se7343_irq_demux);
-        set_irq_type(IRQ5_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ5_IRQ, IRQ_TYPE_LEVEL_LOW);
 }
diff --git a/arch/sh/boards/mach-se/770x/Makefile b/arch/sh/boards/mach-se/770x/Makefile
index 8e624b06d5ea..43ea14feef51 100644
--- a/arch/sh/boards/mach-se/770x/Makefile
+++ b/arch/sh/boards/mach-se/770x/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the 770x SolutionEngine specific parts of the kernel
 #
-obj-y    := setup.o io.o irq.o
+obj-y    := setup.o irq.o
diff --git a/arch/sh/boards/mach-se/770x/io.c b/arch/sh/boards/mach-se/770x/io.c
deleted file mode 100644
index 28833c8786ea..000000000000
--- a/arch/sh/boards/mach-se/770x/io.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * I/O routine for Hitachi SolutionEngine.
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <asm/io.h>
-#include <mach-se/mach/se.h>
-/* MS7750 requires special versions of in*, out* routines, since
-   PC-like io ports are located at upper half byte of 16-bit word which
-   can be accessed only with 16-bit wide.  */
-static inline volatile __u16 *
-port2adr(unsigned int port)
-{
-        if (port & 0xff000000)
-                return ( volatile __u16 *) port;
-        if (port >= 0x2000)
-                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-        else if (port >= 0x1000)
-                return (volatile __u16 *) (PA_83902 + (port << 1));
-        else
-                return (volatile __u16 *) (PA_SUPERIO + (port << 1));
-}
-static inline int
-shifted_port(unsigned long port)
-{
-        /* For IDE registers, value is not shifted */
-        if ((0x1f0 <= port && port < 0x1f8) || port == 0x3f6)
-                return 0;
-        else
-                return 1;
-}
-unsigned char se_inb(unsigned long port)
-{
-        if (shifted_port(port))
-                return (*port2adr(port) >> 8);
-        else
-                return (*port2adr(port))&0xff;
-}
-unsigned char se_inb_p(unsigned long port)
-{
-        unsigned long v;
-        if (shifted_port(port))
-                v = (*port2adr(port) >> 8);
-        else
-                v = (*port2adr(port))&0xff;
-        ctrl_delay();
-        return v;
-}
-unsigned short se_inw(unsigned long port)
-{
-        if (port >= 0x2000)
-                return *port2adr(port);
-        else
-                maybebadio(port);
-        return 0;
-}
-unsigned int se_inl(unsigned long port)
-{
-        maybebadio(port);
-        return 0;
-}
-void se_outb(unsigned char value, unsigned long port)
-{
-        if (shifted_port(port))
-                *(port2adr(port)) = value << 8;
-        else
-                *(port2adr(port)) = value;
-}
-void se_outb_p(unsigned char value, unsigned long port)
-{
-        if (shifted_port(port))
-                *(port2adr(port)) = value << 8;
-        else
-                *(port2adr(port)) = value;
-        ctrl_delay();
-}
-void se_outw(unsigned short value, unsigned long port)
-{
-        if (port >= 0x2000)
-                *port2adr(port) = value;
-        else
-                maybebadio(port);
-}
-void se_outl(unsigned int value, unsigned long port)
-{
-        maybebadio(port);
-}
-void se_insb(unsigned long port, void *addr, unsigned long count)
-{
-        volatile __u16 *p = port2adr(port);
-        __u8 *ap = addr;
-        if (shifted_port(port)) {
-                while (count--)
-                        *ap++ = *p >> 8;
-        } else {
-                while (count--)
-                        *ap++ = *p;
-        }
-}
-void se_insw(unsigned long port, void *addr, unsigned long count)
-{
-        volatile __u16 *p = port2adr(port);
-        __u16 *ap = addr;
-        while (count--)
-                *ap++ = *p;
-}
-void se_insl(unsigned long port, void *addr, unsigned long count)
-{
-        maybebadio(port);
-}
-void se_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        volatile __u16 *p = port2adr(port);
-        const __u8 *ap = addr;
-        if (shifted_port(port)) {
-                while (count--)
-                        *p = *ap++ << 8;
-        } else {
-                while (count--)
-                        *p = *ap++;
-        }
-}
-void se_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        volatile __u16 *p = port2adr(port);
-        const __u16 *ap = addr;
-        while (count--)
-                *p = *ap++;
-}
-void se_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        maybebadio(port);
-}
diff --git a/arch/sh/boards/mach-se/770x/setup.c b/arch/sh/boards/mach-se/770x/setup.c
index 66d39d1b0901..31330c65c0ce 100644
--- a/arch/sh/boards/mach-se/770x/setup.c
+++ b/arch/sh/boards/mach-se/770x/setup.c
@@ -195,27 +195,5 @@ static struct sh_machine_vector mv_se __initmv = {
 #elif defined(CONFIG_CPU_SUBTYPE_SH7710) || defined(CONFIG_CPU_SUBTYPE_SH7712)
        .mv_nr_irqs             = 104,
 #endif
-        .mv_inb                 = se_inb,
-        .mv_inw                 = se_inw,
-        .mv_inl                 = se_inl,
-        .mv_outb                = se_outb,
-        .mv_outw                = se_outw,
-        .mv_outl                = se_outl,
-        .mv_inb_p               = se_inb_p,
-        .mv_inw_p               = se_inw,
-        .mv_inl_p               = se_inl,
-        .mv_outb_p              = se_outb_p,
-        .mv_outw_p              = se_outw,
-        .mv_outl_p              = se_outl,
-        .mv_insb                = se_insb,
-        .mv_insw                = se_insw,
-        .mv_insl                = se_insl,
-        .mv_outsb               = se_outsb,
-        .mv_outsw               = se_outsw,
-        .mv_outsl               = se_outsl,
        .mv_init_irq            = init_se_IRQ,
 };
diff --git a/arch/sh/boards/mach-se/7722/irq.c b/arch/sh/boards/mach-se/7722/irq.c
index 61605db04ee6..aac92f21ebd2 100644
--- a/arch/sh/boards/mach-se/7722/irq.c
+++ b/arch/sh/boards/mach-se/7722/irq.c
@@ -18,23 +18,22 @@
 unsigned int se7722_fpga_irq[SE7722_FPGA_IRQ_NR] = { 0, };
-static void disable_se7722_irq(unsigned int irq)
+static void disable_se7722_irq(struct irq_data *data)
 {
-        unsigned int bit = (unsigned int)get_irq_chip_data(irq);
+        unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data);
        __raw_writew(__raw_readw(IRQ01_MASK) | 1 << bit, IRQ01_MASK);
 }
-static void enable_se7722_irq(unsigned int irq)
+static void enable_se7722_irq(struct irq_data *data)
 {
-        unsigned int bit = (unsigned int)get_irq_chip_data(irq);
+        unsigned int bit = (unsigned int)irq_data_get_irq_chip_data(data);
        __raw_writew(__raw_readw(IRQ01_MASK) & ~(1 << bit), IRQ01_MASK);
 }
 static struct irq_chip se7722_irq_chip __read_mostly = {
-        .name           = "SE7722-FPGA",
+        .name           = "SE7722-FPGA",
-        .mask           = disable_se7722_irq,
+        .irq_mask       = disable_se7722_irq,
-        .unmask         = enable_se7722_irq,
+        .irq_unmask     = enable_se7722_irq,
-        .mask_ack       = disable_se7722_irq,
 };
 static void se7722_irq_demux(unsigned int irq, struct irq_desc *desc)
@@ -68,16 +67,17 @@ void __init init_se7722_IRQ(void)
                        return;
                se7722_fpga_irq[i] = irq;
-                set_irq_chip_and_handler_name(se7722_fpga_irq[i],
+                irq_set_chip_and_handler_name(se7722_fpga_irq[i],
                                              &se7722_irq_chip,
-                                              handle_level_irq, "level");
+                                              handle_level_irq,
+                                              "level");
-                set_irq_chip_data(se7722_fpga_irq[i], (void *)i);
+                irq_set_chip_data(se7722_fpga_irq[i], (void *)i);
        }
-        set_irq_chained_handler(IRQ0_IRQ, se7722_irq_demux);
+        irq_set_chained_handler(IRQ0_IRQ, se7722_irq_demux);
-        set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
-        set_irq_chained_handler(IRQ1_IRQ, se7722_irq_demux);
+        irq_set_chained_handler(IRQ1_IRQ, se7722_irq_demux);
-        set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
 }
diff --git a/arch/sh/boards/mach-se/7724/irq.c b/arch/sh/boards/mach-se/7724/irq.c
index 0942be2daef6..c6342ce7768d 100644
--- a/arch/sh/boards/mach-se/7724/irq.c
+++ b/arch/sh/boards/mach-se/7724/irq.c
@@ -68,25 +68,26 @@ static struct fpga_irq get_fpga_irq(unsigned int irq)
        return set;
 }
-static void disable_se7724_irq(unsigned int irq)
+static void disable_se7724_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        struct fpga_irq set = get_fpga_irq(fpga2irq(irq));
        unsigned int bit = irq - set.base;
        __raw_writew(__raw_readw(set.mraddr) | 0x0001 << bit, set.mraddr);
 }
-static void enable_se7724_irq(unsigned int irq)
+static void enable_se7724_irq(struct irq_data *data)
 {
+        unsigned int irq = data->irq;
        struct fpga_irq set = get_fpga_irq(fpga2irq(irq));
        unsigned int bit = irq - set.base;
        __raw_writew(__raw_readw(set.mraddr) & ~(0x0001 << bit), set.mraddr);
 }
 static struct irq_chip se7724_irq_chip __read_mostly = {
-        .name           = "SE7724-FPGA",
+        .name           = "SE7724-FPGA",
-        .mask           = disable_se7724_irq,
+        .irq_mask       = disable_se7724_irq,
-        .unmask         = enable_se7724_irq,
+        .irq_unmask     = enable_se7724_irq,
-        .mask_ack       = disable_se7724_irq,
 };
 static void se7724_irq_demux(unsigned int irq, struct irq_desc *desc)
@@ -139,17 +140,16 @@ void __init init_se7724_IRQ(void)
                        return;
                }
-                set_irq_chip_and_handler_name(irq,
+                irq_set_chip_and_handler_name(irq, &se7724_irq_chip,
-                                              &se7724_irq_chip,
                                              handle_level_irq, "level");
        }
-        set_irq_chained_handler(IRQ0_IRQ, se7724_irq_demux);
+        irq_set_chained_handler(IRQ0_IRQ, se7724_irq_demux);
-        set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ0_IRQ, IRQ_TYPE_LEVEL_LOW);
-        set_irq_chained_handler(IRQ1_IRQ, se7724_irq_demux);
+        irq_set_chained_handler(IRQ1_IRQ, se7724_irq_demux);
-        set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ1_IRQ, IRQ_TYPE_LEVEL_LOW);
-        set_irq_chained_handler(IRQ2_IRQ, se7724_irq_demux);
+        irq_set_chained_handler(IRQ2_IRQ, se7724_irq_demux);
-        set_irq_type(IRQ2_IRQ, IRQ_TYPE_LEVEL_LOW);
+        irq_set_irq_type(IRQ2_IRQ, IRQ_TYPE_LEVEL_LOW);
 }
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 552ebd9ba82b..12357671023e 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -14,7 +14,8 @@
 #include <linux/device.h>
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
-#include <linux/mfd/sh_mobile_sdhi.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/physmap.h>
 #include <linux/delay.h>
 #include <linux/smc91x.h>
@@ -144,16 +145,42 @@ static struct platform_device nor_flash_device = {
 };
 /* LCDC */
+const static struct fb_videomode lcdc_720p_modes[] = {
+        {
+                .name           = "LB070WV1",
+                .sync           = 0, /* hsync and vsync are active low */
+                .xres           = 1280,
+                .yres           = 720,
+                .left_margin    = 220,
+                .right_margin   = 110,
+                .hsync_len      = 40,
+                .upper_margin   = 20,
+                .lower_margin   = 5,
+                .vsync_len      = 5,
+        },
+};
+const static struct fb_videomode lcdc_vga_modes[] = {
+        {
+                .name           = "LB070WV1",
+                .sync           = 0, /* hsync and vsync are active low */
+                .xres           = 640,
+                .yres           = 480,
+                .left_margin    = 105,
+                .right_margin   = 50,
+                .hsync_len      = 96,
+                .upper_margin   = 33,
+                .lower_margin   = 10,
+                .vsync_len      = 2,
+        },
+};
 static struct sh_mobile_lcdc_info lcdc_info = {
        .clock_source = LCDC_CLK_EXTERNAL,
        .ch[0] = {
                .chan = LCDC_CHAN_MAINLCD,
                .bpp = 16,
                .clock_divider = 1,
-                .lcd_cfg = {
-                        .name = "LB070WV1",
-                        .sync = 0, /* hsync and vsync are active low */
-                },
                .lcd_size_cfg = { /* 7.0 inch */
                        .width = 152,
                        .height = 91,
@@ -257,38 +284,9 @@ static struct platform_device ceu1_device = {
 };
 /* FSI */
-/*
- * FSI-A use external clock which came from ak464x.
- * So, we should change parent of fsi
- */
-#define FCLKACR         0xa4150008
-static void fsimck_init(struct clk *clk)
-{
-        u32 status = __raw_readl(clk->enable_reg);
-        /* use external clock */
-        status &= ~0x000000ff;
-        status |= 0x00000080;
-        __raw_writel(status, clk->enable_reg);
-}
-static struct clk_ops fsimck_clk_ops = {
-        .init = fsimck_init,
-};
-static struct clk fsimcka_clk = {
-        .ops            = &fsimck_clk_ops,
-        .enable_reg     = (void __iomem *)FCLKACR,
-        .rate           = 0, /* unknown */
-};
 /* change J20, J21, J22 pin to 1-2 connection to use slave mode */
 static struct sh_fsi_platform_info fsi_info = {
-        .porta_flags = SH_FSI_BRS_INV |
+        .porta_flags = SH_FSI_BRS_INV,
-                       SH_FSI_OUT_SLAVE_MODE |
-                       SH_FSI_IN_SLAVE_MODE |
-                       SH_FSI_OFMT(PCM) |
-                       SH_FSI_IFMT(PCM),
 };
 static struct resource fsi_resources[] = {
@@ -317,6 +315,10 @@ static struct platform_device fsi_device = {
        },
 };
+static struct platform_device fsi_ak4642_device = {
+        .name           = "sh_fsi_a_ak4642",
+};
 /* KEYSC in SoC (Needs SW33-2 set to ON) */
 static struct sh_keysc_info keysc_info = {
        .mode = SH_KEYSC_MODE_1,
@@ -454,7 +456,7 @@ static struct resource sdhi0_cn7_resources[] = {
        [0] = {
                .name   = "SDHI0",
                .start  = 0x04ce0000,
-                .end    = 0x04ce01ff,
+                .end    = 0x04ce00ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -466,6 +468,7 @@ static struct resource sdhi0_cn7_resources[] = {
 static struct sh_mobile_sdhi_info sh7724_sdhi0_data = {
        .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
        .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
+        .tmio_caps      = MMC_CAP_SDIO_IRQ,
 };
 static struct platform_device sdhi0_cn7_device = {
@@ -485,7 +488,7 @@ static struct resource sdhi1_cn8_resources[] = {
        [0] = {
                .name   = "SDHI1",
                .start  = 0x04cf0000,
-                .end    = 0x04cf01ff,
+                .end    = 0x04cf00ff,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
@@ -497,6 +500,7 @@ static struct resource sdhi1_cn8_resources[] = {
 static struct sh_mobile_sdhi_info sh7724_sdhi1_data = {
        .dma_slave_tx   = SHDMA_SLAVE_SDHI1_TX,
        .dma_slave_rx   = SHDMA_SLAVE_SDHI1_RX,
+        .tmio_caps      = MMC_CAP_SDIO_IRQ,
 };
 static struct platform_device sdhi1_cn8_device = {
@@ -550,7 +554,6 @@ static struct sh_vou_pdata sh_vou_pdata = {
        .flags          = SH_VOU_HSYNC_LOW | SH_VOU_VSYNC_LOW,
        .board_info     = &ak8813,
        .i2c_adap       = 0,
-        .module_name    = "ak881x",
 };
 static struct resource sh_vou_resources[] = {
@@ -590,6 +593,7 @@ static struct platform_device *ms7724se_devices[] __initdata = {
        &sh7724_usb0_host_device,
        &sh7724_usb1_gadget_device,
        &fsi_device,
+        &fsi_ak4642_device,
        &sdhi0_cn7_device,
        &sdhi1_cn8_device,
        &irda_device,
@@ -827,37 +831,29 @@ static int __init devices_setup(void)
        gpio_request(GPIO_FN_KEYOUT0,     NULL);
        /* enable FSI */
-        gpio_request(GPIO_FN_FSIMCKB,    NULL);
        gpio_request(GPIO_FN_FSIMCKA,    NULL);
+        gpio_request(GPIO_FN_FSIIASD,    NULL);
        gpio_request(GPIO_FN_FSIOASD,    NULL);
        gpio_request(GPIO_FN_FSIIABCK,   NULL);
        gpio_request(GPIO_FN_FSIIALRCK,  NULL);
        gpio_request(GPIO_FN_FSIOABCK,   NULL);
        gpio_request(GPIO_FN_FSIOALRCK,  NULL);
        gpio_request(GPIO_FN_CLKAUDIOAO, NULL);
-        gpio_request(GPIO_FN_FSIIBSD,    NULL);
-        gpio_request(GPIO_FN_FSIOBSD,    NULL);
-        gpio_request(GPIO_FN_FSIIBBCK,   NULL);
-        gpio_request(GPIO_FN_FSIIBLRCK,  NULL);
-        gpio_request(GPIO_FN_FSIOBBCK,   NULL);
-        gpio_request(GPIO_FN_FSIOBLRCK,  NULL);
-        gpio_request(GPIO_FN_CLKAUDIOBO, NULL);
-        gpio_request(GPIO_FN_FSIIASD,    NULL);
        /* set SPU2 clock to 83.4 MHz */
        clk = clk_get(NULL, "spu_clk");
-        if (clk) {
+        if (!IS_ERR(clk)) {
                clk_set_rate(clk, clk_round_rate(clk, 83333333));
                clk_put(clk);
        }
        /* change parent of FSI A */
        clk = clk_get(NULL, "fsia_clk");
-        if (clk) {
+        if (!IS_ERR(clk)) {
-                clk_register(&fsimcka_clk);
+                /* 48kHz dummy clock was used to make sure 1/1 divide */
-                clk_set_parent(clk, &fsimcka_clk);
+                clk_set_rate(&sh7724_fsimcka_clk, 48000);
-                clk_set_rate(clk, 11000);
+                clk_set_parent(clk, &sh7724_fsimcka_clk);
-                clk_set_rate(&fsimcka_clk, 11000);
+                clk_set_rate(clk, 48000);
                clk_put(clk);
        }
@@ -909,24 +905,12 @@ static int __init devices_setup(void)
        if (sw & SW41_B) {
                /* 720p */
-                lcdc_info.ch[0].lcd_cfg.xres         = 1280;
+                lcdc_info.ch[0].lcd_cfg = lcdc_720p_modes;
-                lcdc_info.ch[0].lcd_cfg.yres         = 720;
+                lcdc_info.ch[0].num_cfg = ARRAY_SIZE(lcdc_720p_modes);
-                lcdc_info.ch[0].lcd_cfg.left_margin  = 220;
-                lcdc_info.ch[0].lcd_cfg.right_margin = 110;
-                lcdc_info.ch[0].lcd_cfg.hsync_len    = 40;
-                lcdc_info.ch[0].lcd_cfg.upper_margin = 20;
-                lcdc_info.ch[0].lcd_cfg.lower_margin = 5;
-                lcdc_info.ch[0].lcd_cfg.vsync_len    = 5;
        } else {
                /* VGA */
-                lcdc_info.ch[0].lcd_cfg.xres         = 640;
+                lcdc_info.ch[0].lcd_cfg = lcdc_vga_modes;
-                lcdc_info.ch[0].lcd_cfg.yres         = 480;
+                lcdc_info.ch[0].num_cfg = ARRAY_SIZE(lcdc_vga_modes);
-                lcdc_info.ch[0].lcd_cfg.left_margin  = 105;
-                lcdc_info.ch[0].lcd_cfg.right_margin = 50;
-                lcdc_info.ch[0].lcd_cfg.hsync_len    = 96;
-                lcdc_info.ch[0].lcd_cfg.upper_margin = 33;
-                lcdc_info.ch[0].lcd_cfg.lower_margin = 10;
-                lcdc_info.ch[0].lcd_cfg.vsync_len    = 2;
        }
        if (sw & SW41_A) {
diff --git a/arch/sh/boards/mach-se/7751/Makefile b/arch/sh/boards/mach-se/7751/Makefile
index e6f4341bfe6e..a338fd9d5039 100644
--- a/arch/sh/boards/mach-se/7751/Makefile
+++ b/arch/sh/boards/mach-se/7751/Makefile
@@ -2,4 +2,4 @@
 # Makefile for the 7751 SolutionEngine specific parts of the kernel
 #
-obj-y    := setup.o io.o irq.o
+obj-y    := setup.o irq.o
diff --git a/arch/sh/boards/mach-se/7751/io.c b/arch/sh/boards/mach-se/7751/io.c
deleted file mode 100644
index 6e75bd4459e5..000000000000
--- a/arch/sh/boards/mach-se/7751/io.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routine for Hitachi 7751 SolutionEngine.
- *
- * Initial version only to support LAN access; some
- * placeholder code from io_se.c left in with the
- * expectation of later SuperIO and PCMCIA access.
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-#include <mach-se/mach/se7751.h>
-#include <asm/addrspace.h>
-static inline volatile u16 *port2adr(unsigned int port)
-{
-        if (port >= 0x2000)
-                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-        maybebadio((unsigned long)port);
-        return (volatile __u16*)port;
-}
-/*
- * General outline: remap really low stuff [eventually] to SuperIO,
- * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
- * is mapped through the PCI IO window.  Stuff with high bits (PXSEG)
- * should be way beyond the window, and is used  w/o translation for
- * compatibility.
- */
-unsigned char sh7751se_inb(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned char *)port;
-        else
-                return (*port2adr(port)) & 0xff;
-}
-unsigned char sh7751se_inb_p(unsigned long port)
-{
-        unsigned char v;
-        if (PXSEG(port))
-                v = *(volatile unsigned char *)port;
-        else
-                v = (*port2adr(port)) & 0xff;
-        ctrl_delay();
-        return v;
-}
-unsigned short sh7751se_inw(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned short *)port;
-        else if (port >= 0x2000)
-                return *port2adr(port);
-        else
-                maybebadio(port);
-        return 0;
-}
-unsigned int sh7751se_inl(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned long *)port;
-        else if (port >= 0x2000)
-                return *port2adr(port);
-        else
-                maybebadio(port);
-        return 0;
-}
-void sh7751se_outb(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-        else
-                *(port2adr(port)) = value;
-}
-void sh7751se_outb_p(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-        else
-                *(port2adr(port)) = value;
-        ctrl_delay();
-}
-void sh7751se_outw(unsigned short value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned short *)port = value;
-        else if (port >= 0x2000)
-                *port2adr(port) = value;
-        else
-                maybebadio(port);
-}
-void sh7751se_outl(unsigned int value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned long *)port = value;
-        else
-                maybebadio(port);
-}
-void sh7751se_insl(unsigned long port, void *addr, unsigned long count)
-{
-        maybebadio(port);
-}
-void sh7751se_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        maybebadio(port);
-}
diff --git a/arch/sh/boards/mach-se/7751/setup.c b/arch/sh/boards/mach-se/7751/setup.c
index 50572512e3e8..4ed60c5e221f 100644
--- a/arch/sh/boards/mach-se/7751/setup.c
+++ b/arch/sh/boards/mach-se/7751/setup.c
@@ -48,7 +48,7 @@ static int __init se7751_devices_setup(void)
 {
        return platform_add_devices(se7751_devices, ARRAY_SIZE(se7751_devices));
 }
-__initcall(se7751_devices_setup);
+device_initcall(se7751_devices_setup);
 /*
 * The Machine Vector
@@ -56,23 +56,5 @@ __initcall(se7751_devices_setup);
 static struct sh_machine_vector mv_7751se __initmv = {
        .mv_name                = "7751 SolutionEngine",
        .mv_nr_irqs             = 72,
-        .mv_inb                 = sh7751se_inb,
-        .mv_inw                 = sh7751se_inw,
-        .mv_inl                 = sh7751se_inl,
-        .mv_outb                = sh7751se_outb,
-        .mv_outw                = sh7751se_outw,
-        .mv_outl                = sh7751se_outl,
-        .mv_inb_p               = sh7751se_inb_p,
-        .mv_inw_p               = sh7751se_inw,
-        .mv_inl_p               = sh7751se_inl,
-        .mv_outb_p              = sh7751se_outb_p,
-        .mv_outw_p              = sh7751se_outw,
-        .mv_outl_p              = sh7751se_outl,
-        .mv_insl                = sh7751se_insl,
-        .mv_outsl               = sh7751se_outsl,
        .mv_init_irq            = init_7751se_IRQ,
 };
diff --git a/arch/sh/boards/mach-se/board-se7619.c b/arch/sh/boards/mach-se/board-se7619.c
index 1d0ef7faa10d..82b6d4a5dc02 100644
--- a/arch/sh/boards/mach-se/board-se7619.c
+++ b/arch/sh/boards/mach-se/board-se7619.c
@@ -11,6 +11,11 @@
 #include <asm/io.h>
 #include <asm/machvec.h>
+static int se7619_mode_pins(void)
+{
+        return MODE_PIN2 | MODE_PIN0;
+}
 /*
 * The Machine Vector
 */
@@ -18,4 +23,5 @@
 static struct sh_machine_vector mv_se __initmv = {
        .mv_name                = "SolutionEngine",
        .mv_nr_irqs             = 108,
+        .mv_mode_pins           = se7619_mode_pins,
 };
diff --git a/arch/sh/boards/mach-sh03/rtc.c b/arch/sh/boards/mach-sh03/rtc.c
index 1b200990500c..f83ac7995d0f 100644
--- a/arch/sh/boards/mach-sh03/rtc.c
+++ b/arch/sh/boards/mach-sh03/rtc.c
@@ -108,7 +108,7 @@ static int set_rtc_mmss(unsigned long nowtime)
                __raw_writeb(real_minutes % 10, RTC_MIN1);
                __raw_writeb(real_minutes / 10, RTC_MIN10);
        } else {
-                printk(KERN_WARNING
+                printk_once(KERN_NOTICE
                       "set_rtc_mmss: can't update from %d to %d\n",
                       cmos_minutes, real_minutes);
                retval = -1;
diff --git a/arch/sh/boards/mach-sh03/setup.c b/arch/sh/boards/mach-sh03/setup.c
index af4a0c012a96..d4f79b2a6514 100644
--- a/arch/sh/boards/mach-sh03/setup.c
+++ b/arch/sh/boards/mach-sh03/setup.c
@@ -96,7 +96,7 @@ static int __init sh03_devices_setup(void)
        return platform_add_devices(sh03_devices, ARRAY_SIZE(sh03_devices));
 }
-__initcall(sh03_devices_setup);
+device_initcall(sh03_devices_setup);
 static struct sh_machine_vector mv_sh03 __initmv = {
        .mv_name                = "Interface (CTP/PCI-SH03)",
diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c
index f64a6918224c..f3d828f133e5 100644
--- a/arch/sh/boards/mach-sh7763rdp/setup.c
+++ b/arch/sh/boards/mach-sh7763rdp/setup.c
@@ -75,6 +75,10 @@ static struct resource sh_eth_resources[] = {
                .end    = 0xFEE00F7C - 1,
                .flags  = IORESOURCE_MEM,
        }, {
+                .start  = 0xFEE01800,   /* TSU */
+                .end    = 0xFEE01FFF,
+                .flags  = IORESOURCE_MEM,
+        }, {
                .start  = 57,   /* irq number */
                .flags  = IORESOURCE_IRQ,
        },
@@ -83,6 +87,8 @@ static struct resource sh_eth_resources[] = {
 static struct sh_eth_plat_data sh7763_eth_pdata = {
        .phy = 1,
        .edmac_endian = EDMAC_LITTLE_ENDIAN,
+        .register_type = SH_ETH_REG_GIGABIT,
+        .phy_interface = PHY_INTERFACE_MODE_MII,
 };
 static struct platform_device sh7763rdp_eth_device = {
diff --git a/arch/sh/boards/mach-snapgear/Makefile b/arch/sh/boards/mach-snapgear/Makefile
deleted file mode 100644
index d2d2f4b6a502..000000000000
--- a/arch/sh/boards/mach-snapgear/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# Makefile for the SnapGear specific parts of the kernel
-#
-obj-y    := setup.o io.o
diff --git a/arch/sh/boards/mach-snapgear/io.c b/arch/sh/boards/mach-snapgear/io.c
deleted file mode 100644
index 476650e42dbc..000000000000
--- a/arch/sh/boards/mach-snapgear/io.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2002  David McCullough <davidm@snapgear.com>
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routine for Hitachi 7751 SolutionEngine.
- *
- * Initial version only to support LAN access; some
- * placeholder code from io_se.c left in with the
- * expectation of later SuperIO and PCMCIA access.
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <asm/io.h>
-#include <asm/addrspace.h>
-#ifdef CONFIG_SH_SECUREEDGE5410
-unsigned short secureedge5410_ioport;
-#endif
-static inline volatile __u16 *port2adr(unsigned int port)
-{
-        maybebadio((unsigned long)port);
-        return (volatile __u16*)port;
-}
-/*
- * General outline: remap really low stuff [eventually] to SuperIO,
- * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
- * is mapped through the PCI IO window.  Stuff with high bits (PXSEG)
- * should be way beyond the window, and is used  w/o translation for
- * compatibility.
- */
-unsigned char snapgear_inb(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned char *)port;
-        else
-                return (*port2adr(port)) & 0xff;
-}
-unsigned char snapgear_inb_p(unsigned long port)
-{
-        unsigned char v;
-        if (PXSEG(port))
-                v = *(volatile unsigned char *)port;
-        else
-                v = (*port2adr(port))&0xff;
-        ctrl_delay();
-        return v;
-}
-unsigned short snapgear_inw(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned short *)port;
-        else if (port >= 0x2000)
-                return *port2adr(port);
-        else
-                maybebadio(port);
-        return 0;
-}
-unsigned int snapgear_inl(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned long *)port;
-        else if (port >= 0x2000)
-                return *port2adr(port);
-        else
-                maybebadio(port);
-        return 0;
-}
-void snapgear_outb(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-        else
-                *(port2adr(port)) = value;
-}
-void snapgear_outb_p(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-        else
-                *(port2adr(port)) = value;
-        ctrl_delay();
-}
-void snapgear_outw(unsigned short value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned short *)port = value;
-        else if (port >= 0x2000)
-                *port2adr(port) = value;
-        else
-                maybebadio(port);
-}
-void snapgear_outl(unsigned int value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned long *)port = value;
-        else
-                maybebadio(port);
-}
-void snapgear_insl(unsigned long port, void *addr, unsigned long count)
-{
-        maybebadio(port);
-}
-void snapgear_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        maybebadio(port);
-}
diff --git a/arch/sh/boards/mach-systemh/Makefile b/arch/sh/boards/mach-systemh/Makefile
deleted file mode 100644
index 2cc6a23d9d39..000000000000
--- a/arch/sh/boards/mach-systemh/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Makefile for the SystemH specific parts of the kernel
-#
-obj-y    := setup.o irq.o io.o
-# XXX: This wants to be consolidated in arch/sh/drivers/pci, and more
-# importantly, with the generic sh7751_pcic_init() code. For now, we'll
-# just abuse the hell out of kbuild, because we can..
-obj-$(CONFIG_PCI) += pci.o
-pci-y := ../../se/7751/pci.o
diff --git a/arch/sh/boards/mach-systemh/io.c b/arch/sh/boards/mach-systemh/io.c
deleted file mode 100644
index 15577ff1f715..000000000000
--- a/arch/sh/boards/mach-systemh/io.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * linux/arch/sh/boards/renesas/systemh/io.c
- *
- * Copyright (C) 2001  Ian da Silva, Jeremy Siegel
- * Based largely on io_se.c.
- *
- * I/O routine for Hitachi 7751 Systemh.
- */
-#include <linux/kernel.h>
-#include <linux/types.h>
-#include <linux/pci.h>
-#include <mach/systemh7751.h>
-#include <asm/addrspace.h>
-#include <asm/io.h>
-#define ETHER_IOMAP(adr) (0xB3000000 + (adr)) /*map to 16bits access area
-                                                of smc lan chip*/
-static inline volatile __u16 *
-port2adr(unsigned int port)
-{
-        if (port >= 0x2000)
-                return (volatile __u16 *) (PA_MRSHPC + (port - 0x2000));
-        maybebadio((unsigned long)port);
-        return (volatile __u16*)port;
-}
-/*
- * General outline: remap really low stuff [eventually] to SuperIO,
- * stuff in PCI IO space (at or above window at pci.h:PCIBIOS_MIN_IO)
- * is mapped through the PCI IO window.  Stuff with high bits (PXSEG)
- * should be way beyond the window, and is used  w/o translation for
- * compatibility.
- */
-unsigned char sh7751systemh_inb(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned char *)port;
-        else if (port <= 0x3F1)
-                return *(volatile unsigned char *)ETHER_IOMAP(port);
-        else
-                return (*port2adr(port))&0xff;
-}
-unsigned char sh7751systemh_inb_p(unsigned long port)
-{
-        unsigned char v;
-        if (PXSEG(port))
-                v = *(volatile unsigned char *)port;
-        else if (port <= 0x3F1)
-                v = *(volatile unsigned char *)ETHER_IOMAP(port);
-        else
-                v = (*port2adr(port))&0xff;
-        ctrl_delay();
-        return v;
-}
-unsigned short sh7751systemh_inw(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned short *)port;
-        else if (port >= 0x2000)
-                return *port2adr(port);
-        else if (port <= 0x3F1)
-                return *(volatile unsigned int *)ETHER_IOMAP(port);
-        else
-                maybebadio(port);
-        return 0;
-}
-unsigned int sh7751systemh_inl(unsigned long port)
-{
-        if (PXSEG(port))
-                return *(volatile unsigned long *)port;
-        else if (port >= 0x2000)
-                return *port2adr(port);
-        else if (port <= 0x3F1)
-                return *(volatile unsigned int *)ETHER_IOMAP(port);
-        else
-                maybebadio(port);
-        return 0;
-}
-void sh7751systemh_outb(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-        else if (port <= 0x3F1)
-                *(volatile unsigned char *)ETHER_IOMAP(port) = value;
-        else
-                *(port2adr(port)) = value;
-}
-void sh7751systemh_outb_p(unsigned char value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned char *)port = value;
-        else if (port <= 0x3F1)
-                *(volatile unsigned char *)ETHER_IOMAP(port) = value;
-        else
-                *(port2adr(port)) = value;
-        ctrl_delay();
-}
-void sh7751systemh_outw(unsigned short value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned short *)port = value;
-        else if (port >= 0x2000)
-                *port2adr(port) = value;
-        else if (port <= 0x3F1)
-                *(volatile unsigned short *)ETHER_IOMAP(port) = value;
-        else
-                maybebadio(port);
-}
-void sh7751systemh_outl(unsigned int value, unsigned long port)
-{
-        if (PXSEG(port))
-                *(volatile unsigned long *)port = value;
-        else
-                maybebadio(port);
-}
-void sh7751systemh_insb(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned char *p = addr;
-        while (count--) *p++ = sh7751systemh_inb(port);
-}
-void sh7751systemh_insw(unsigned long port, void *addr, unsigned long count)
-{
-        unsigned short *p = addr;
-        while (count--) *p++ = sh7751systemh_inw(port);
-}
-void sh7751systemh_insl(unsigned long port, void *addr, unsigned long count)
-{
-        maybebadio(port);
-}
-void sh7751systemh_outsb(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned char *p = (unsigned char*)addr;
-        while (count--) sh7751systemh_outb(*p++, port);
-}
-void sh7751systemh_outsw(unsigned long port, const void *addr, unsigned long count)
-{
-        unsigned short *p = (unsigned short*)addr;
-        while (count--) sh7751systemh_outw(*p++, port);
-}
-void sh7751systemh_outsl(unsigned long port, const void *addr, unsigned long count)
-{
-        maybebadio(port);
-}
diff --git a/arch/sh/boards/mach-systemh/irq.c b/arch/sh/boards/mach-systemh/irq.c
deleted file mode 100644
index 523aea5dc94e..000000000000
--- a/arch/sh/boards/mach-systemh/irq.c
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * linux/arch/sh/boards/renesas/systemh/irq.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- *
- * Hitachi SystemH Support.
- *
- * Modified for 7751 SystemH by
- * Jonathan Short.
- */
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/interrupt.h>
-#include <linux/io.h>
-#include <mach/systemh7751.h>
-#include <asm/smc37c93x.h>
-/* address of external interrupt mask register
- * address must be set prior to use these (maybe in init_XXX_irq())
- * XXX : is it better to use .config than specifying it in code? */
-static unsigned long *systemh_irq_mask_register = (unsigned long *)0xB3F10004;
-static unsigned long *systemh_irq_request_register = (unsigned long *)0xB3F10000;
-/* forward declaration */
-static void enable_systemh_irq(unsigned int irq);
-static void disable_systemh_irq(unsigned int irq);
-static void mask_and_ack_systemh(unsigned int);
-static struct irq_chip systemh_irq_type = {
-        .name = " SystemH Register",
-        .unmask = enable_systemh_irq,
-        .mask = disable_systemh_irq,
-        .ack = mask_and_ack_systemh,
-};
-static void disable_systemh_irq(unsigned int irq)
-{
-        if (systemh_irq_mask_register) {
-                unsigned long val, mask = 0x01 << 1;
-                /* Clear the "irq"th bit in the mask and set it in the request */
-                val = __raw_readl((unsigned long)systemh_irq_mask_register);
-                val &= ~mask;
-                __raw_writel(val, (unsigned long)systemh_irq_mask_register);
-                val = __raw_readl((unsigned long)systemh_irq_request_register);
-                val |= mask;
-                __raw_writel(val, (unsigned long)systemh_irq_request_register);
-        }
-}
-static void enable_systemh_irq(unsigned int irq)
-{
-        if (systemh_irq_mask_register) {
-                unsigned long val, mask = 0x01 << 1;
-                /* Set "irq"th bit in the mask register */
-                val = __raw_readl((unsigned long)systemh_irq_mask_register);
-                val |= mask;
-                __raw_writel(val, (unsigned long)systemh_irq_mask_register);
-        }
-}
-static void mask_and_ack_systemh(unsigned int irq)
-{
-        disable_systemh_irq(irq);
-}
-void make_systemh_irq(unsigned int irq)
-{
-        disable_irq_nosync(irq);
-        set_irq_chip_and_handler(irq, &systemh_irq_type, handle_level_irq);
-        disable_systemh_irq(irq);
-}
diff --git a/arch/sh/boards/mach-systemh/setup.c b/arch/sh/boards/mach-systemh/setup.c
deleted file mode 100644
index 219fd800a43f..000000000000
--- a/arch/sh/boards/mach-systemh/setup.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * linux/arch/sh/boards/renesas/systemh/setup.c
- *
- * Copyright (C) 2000  Kazumoto Kojima
- * Copyright (C) 2003  Paul Mundt
- *
- * Hitachi SystemH Support.
- *
- * Modified for 7751 SystemH by Jonathan Short.
- *
- * Rewritten for 2.6 by 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 <asm/machvec.h>
-#include <mach/systemh7751.h>
-extern void make_systemh_irq(unsigned int irq);
-/*
- * Initialize IRQ setting
- */
-static void __init sh7751systemh_init_irq(void)
-{
-        make_systemh_irq(0xb);  /* Ethernet interrupt */
-}
-static struct sh_machine_vector mv_7751systemh __initmv = {
-        .mv_name                = "7751 SystemH",
-        .mv_nr_irqs             = 72,
-        .mv_inb                 = sh7751systemh_inb,
-        .mv_inw                 = sh7751systemh_inw,
-        .mv_inl                 = sh7751systemh_inl,
-        .mv_outb                = sh7751systemh_outb,
-        .mv_outw                = sh7751systemh_outw,
-        .mv_outl                = sh7751systemh_outl,
-        .mv_inb_p               = sh7751systemh_inb_p,
-        .mv_inw_p               = sh7751systemh_inw,
-        .mv_inl_p               = sh7751systemh_inl,
-        .mv_outb_p              = sh7751systemh_outb_p,
-        .mv_outw_p              = sh7751systemh_outw,
-        .mv_outl_p              = sh7751systemh_outl,
-        .mv_insb                = sh7751systemh_insb,
-        .mv_insw                = sh7751systemh_insw,
-        .mv_insl                = sh7751systemh_insl,
-        .mv_outsb               = sh7751systemh_outsb,
-        .mv_outsw               = sh7751systemh_outsw,
-        .mv_outsl               = sh7751systemh_outsl,
-        .mv_init_irq            = sh7751systemh_init_irq,
-};
diff --git a/arch/sh/boards/mach-x3proto/Makefile b/arch/sh/boards/mach-x3proto/Makefile
index 983e4551fecf..708c21c919ff 100644
--- a/arch/sh/boards/mach-x3proto/Makefile
+++ b/arch/sh/boards/mach-x3proto/Makefile
@@ -1 +1,3 @@
 obj-y += setup.o ilsel.o
+obj-$(CONFIG_GENERIC_GPIO)      += gpio.o
diff --git a/arch/sh/boards/mach-x3proto/gpio.c b/arch/sh/boards/mach-x3proto/gpio.c
new file mode 100644
index 000000000000..f33b2b57019c
--- /dev/null
+++ b/arch/sh/boards/mach-x3proto/gpio.c
@@ -0,0 +1,136 @@
+/*
+ * arch/sh/boards/mach-x3proto/gpio.c
+ *
+ * Renesas SH-X3 Prototype Baseboard GPIO Support.
+ *
+ * Copyright (C) 2010  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.
+ */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/gpio.h>
+#include <linux/irq.h>
+#include <linux/kernel.h>
+#include <linux/spinlock.h>
+#include <linux/io.h>
+#include <mach/ilsel.h>
+#include <mach/hardware.h>
+#define KEYCTLR 0xb81c0000
+#define KEYOUTR 0xb81c0002
+#define KEYDETR 0xb81c0004
+static DEFINE_SPINLOCK(x3proto_gpio_lock);
+static unsigned int x3proto_gpio_irq_map[NR_BASEBOARD_GPIOS] = { 0, };
+static int x3proto_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
+{
+        unsigned long flags;
+        unsigned int data;
+        spin_lock_irqsave(&x3proto_gpio_lock, flags);
+        data = __raw_readw(KEYCTLR);
+        data |= (1 << gpio);
+        __raw_writew(data, KEYCTLR);
+        spin_unlock_irqrestore(&x3proto_gpio_lock, flags);
+        return 0;
+}
+static int x3proto_gpio_get(struct gpio_chip *chip, unsigned gpio)
+{
+        return !!(__raw_readw(KEYDETR) & (1 << gpio));
+}
+static int x3proto_gpio_to_irq(struct gpio_chip *chip, unsigned gpio)
+{
+        return x3proto_gpio_irq_map[gpio];
+}
+static void x3proto_gpio_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+        struct irq_data *data = irq_get_irq_data(irq);
+        struct irq_chip *chip = irq_data_get_irq_chip(data);
+        unsigned long mask;
+        int pin;
+        chip->irq_mask_ack(data);
+        mask = __raw_readw(KEYDETR);
+        for_each_set_bit(pin, &mask, NR_BASEBOARD_GPIOS)
+                generic_handle_irq(x3proto_gpio_to_irq(NULL, pin));
+        chip->irq_unmask(data);
+}
+struct gpio_chip x3proto_gpio_chip = {
+        .label                  = "x3proto-gpio",
+        .direction_input        = x3proto_gpio_direction_input,
+        .get                    = x3proto_gpio_get,
+        .to_irq                 = x3proto_gpio_to_irq,
+        .base                   = -1,
+        .ngpio                  = NR_BASEBOARD_GPIOS,
+};
+int __init x3proto_gpio_setup(void)
+{
+        int ilsel;
+        int ret, i;
+        ilsel = ilsel_enable(ILSEL_KEY);
+        if (unlikely(ilsel < 0))
+                return ilsel;
+        ret = gpiochip_add(&x3proto_gpio_chip);
+        if (unlikely(ret))
+                goto err_gpio;
+        for (i = 0; i < NR_BASEBOARD_GPIOS; i++) {
+                unsigned long flags;
+                int irq = create_irq();
+                if (unlikely(irq < 0)) {
+                        ret = -EINVAL;
+                        goto err_irq;
+                }
+                spin_lock_irqsave(&x3proto_gpio_lock, flags);
+                x3proto_gpio_irq_map[i] = irq;
+                irq_set_chip_and_handler_name(irq, &dummy_irq_chip,
+                                              handle_simple_irq, "gpio");
+                spin_unlock_irqrestore(&x3proto_gpio_lock, flags);
+        }
+        pr_info("registering '%s' support, handling GPIOs %u -> %u, "
+                "bound to IRQ %u\n",
+                x3proto_gpio_chip.label, x3proto_gpio_chip.base,
+                x3proto_gpio_chip.base + x3proto_gpio_chip.ngpio,
+                ilsel);
+        irq_set_chained_handler(ilsel, x3proto_gpio_irq_handler);
+        irq_set_irq_wake(ilsel, 1);
+        return 0;
+err_irq:
+        for (; i >= 0; --i)
+                if (x3proto_gpio_irq_map[i])
+                        destroy_irq(x3proto_gpio_irq_map[i]);
+        ret = gpiochip_remove(&x3proto_gpio_chip);
+        if (unlikely(ret))
+                pr_err("Failed deregistering GPIO\n");
+err_gpio:
+        synchronize_irq(ilsel);
+        ilsel_disable(ILSEL_KEY);
+        return ret;
+}
diff --git a/arch/sh/boards/mach-x3proto/ilsel.c b/arch/sh/boards/mach-x3proto/ilsel.c
index 5c9842704c60..95e346139515 100644
--- a/arch/sh/boards/mach-x3proto/ilsel.c
+++ b/arch/sh/boards/mach-x3proto/ilsel.c
@@ -1,20 +1,22 @@
 /*
- * arch/sh/boards/renesas/x3proto/ilsel.c
+ * arch/sh/boards/mach-x3proto/ilsel.c
 *
 * Helper routines for SH-X3 proto board ILSEL.
 *
- * Copyright (C) 2007 Paul Mundt
+ * Copyright (C) 2007 - 2010  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.
 */
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/bitmap.h>
 #include <linux/io.h>
-#include <asm/ilsel.h>
+#include <mach/ilsel.h>
 /*
 * ILSEL is split across:
@@ -64,6 +66,8 @@ static void __ilsel_enable(ilsel_source_t set, unsigned int bit)
        unsigned int tmp, shift;
        unsigned long addr;
+        pr_notice("enabling ILSEL set %d\n", set);
        addr = mk_ilsel_addr(bit);
        shift = mk_ilsel_shift(bit);
@@ -92,8 +96,10 @@ int ilsel_enable(ilsel_source_t set)
 {
        unsigned int bit;
-        /* Aliased sources must use ilsel_enable_fixed() */
+        if (unlikely(set > ILSEL_KEY)) {
-        BUG_ON(set > ILSEL_KEY);
+                pr_err("Aliased sources must use ilsel_enable_fixed()\n");
+                return -EINVAL;
+        }
        do {
                bit = find_first_zero_bit(&ilsel_level_map, ILSEL_LEVELS);
@@ -140,6 +146,8 @@ void ilsel_disable(unsigned int irq)
        unsigned long addr;
        unsigned int tmp;
+        pr_notice("disabling ILSEL set %d\n", irq);
        addr = mk_ilsel_addr(irq);
        tmp = __raw_readw(addr);
diff --git a/arch/sh/boards/mach-x3proto/setup.c b/arch/sh/boards/mach-x3proto/setup.c
index 102bf56befb4..d682e2b6a856 100644
--- a/arch/sh/boards/mach-x3proto/setup.c
+++ b/arch/sh/boards/mach-x3proto/setup.c
@@ -1,9 +1,9 @@
 /*
- * arch/sh/boards/renesas/x3proto/setup.c
+ * arch/sh/boards/mach-x3proto/setup.c
 *
 * Renesas SH-X3 Prototype Board Support.
 *
- * Copyright (C) 2007 - 2008 Paul Mundt
+ * Copyright (C) 2007 - 2010  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
@@ -16,9 +16,13 @@
 #include <linux/smc91x.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
+#include <linux/input.h>
 #include <linux/usb/r8a66597.h>
 #include <linux/usb/m66592.h>
-#include <asm/ilsel.h>
+#include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <mach/ilsel.h>
+#include <mach/hardware.h>
 #include <asm/smp-ops.h>
 static struct resource heartbeat_resources[] = {
@@ -122,15 +126,128 @@ static struct platform_device m66592_usb_peripheral_device = {
        .resource       = m66592_usb_peripheral_resources,
 };
+static struct gpio_keys_button baseboard_buttons[NR_BASEBOARD_GPIOS] = {
+        {
+                .desc           = "key44",
+                .code           = KEY_POWER,
+                .active_low     = 1,
+                .wakeup         = 1,
+        }, {
+                .desc           = "key43",
+                .code           = KEY_SUSPEND,
+                .active_low     = 1,
+                .wakeup         = 1,
+        }, {
+                .desc           = "key42",
+                .code           = KEY_KATAKANAHIRAGANA,
+                .active_low     = 1,
+        }, {
+                .desc           = "key41",
+                .code           = KEY_SWITCHVIDEOMODE,
+                .active_low     = 1,
+        }, {
+                .desc           = "key34",
+                .code           = KEY_F12,
+                .active_low     = 1,
+        }, {
+                .desc           = "key33",
+                .code           = KEY_F11,
+                .active_low     = 1,
+        }, {
+                .desc           = "key32",
+                .code           = KEY_F10,
+                .active_low     = 1,
+        }, {
+                .desc           = "key31",
+                .code           = KEY_F9,
+                .active_low     = 1,
+        }, {
+                .desc           = "key24",
+                .code           = KEY_F8,
+                .active_low     = 1,
+        }, {
+                .desc           = "key23",
+                .code           = KEY_F7,
+                .active_low     = 1,
+        }, {
+                .desc           = "key22",
+                .code           = KEY_F6,
+                .active_low     = 1,
+        }, {
+                .desc           = "key21",
+                .code           = KEY_F5,
+                .active_low     = 1,
+        }, {
+                .desc           = "key14",
+                .code           = KEY_F4,
+                .active_low     = 1,
+        }, {
+                .desc           = "key13",
+                .code           = KEY_F3,
+                .active_low     = 1,
+        }, {
+                .desc           = "key12",
+                .code           = KEY_F2,
+                .active_low     = 1,
+        }, {
+                .desc           = "key11",
+                .code           = KEY_F1,
+                .active_low     = 1,
+        },
+};
+static struct gpio_keys_platform_data baseboard_buttons_data = {
+        .buttons        = baseboard_buttons,
+        .nbuttons       = ARRAY_SIZE(baseboard_buttons),
+};
+static struct platform_device baseboard_buttons_device = {
+        .name           = "gpio-keys",
+        .id             = -1,
+        .dev            = {
+                .platform_data  = &baseboard_buttons_data,
+        },
+};
 static struct platform_device *x3proto_devices[] __initdata = {
        &heartbeat_device,
        &smc91x_device,
        &r8a66597_usb_host_device,
        &m66592_usb_peripheral_device,
+        &baseboard_buttons_device,
 };
+static void __init x3proto_init_irq(void)
+{
+        plat_irq_setup_pins(IRQ_MODE_IRL3210);
+        /* Set ICR0.LVLMODE */
+        __raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000);
+}
 static int __init x3proto_devices_setup(void)
 {
+        int ret, i;
+        /*
+         * IRLs are only needed for ILSEL mappings, so flip over the INTC
+         * pins at a later point to enable the GPIOs to settle.
+         */
+        x3proto_init_irq();
+        /*
+         * Now that ILSELs are available, set up the baseboard GPIOs.
+         */
+        ret = x3proto_gpio_setup();
+        if (unlikely(ret))
+                return ret;
+        /*
+         * Propagate dynamic GPIOs for the baseboard button device.
+         */
+        for (i = 0; i < ARRAY_SIZE(baseboard_buttons); i++)
+                baseboard_buttons[i].gpio = x3proto_gpio_chip.base + i;
        r8a66597_usb_host_resources[1].start =
                r8a66597_usb_host_resources[1].end = ilsel_enable(ILSEL_USBH_I);
@@ -145,14 +262,6 @@ static int __init x3proto_devices_setup(void)
 }
 device_initcall(x3proto_devices_setup);
-static void __init x3proto_init_irq(void)
-{
-        plat_irq_setup_pins(IRQ_MODE_IRL3210);
-        /* Set ICR0.LVLMODE */
-        __raw_writel(__raw_readl(0xfe410000) | (1 << 21), 0xfe410000);
-}
 static void __init x3proto_setup(char **cmdline_p)
 {
        register_smp_ops(&shx3_smp_ops);
@@ -161,5 +270,4 @@ static void __init x3proto_setup(char **cmdline_p)
 static struct sh_machine_vector mv_x3proto __initmv = {
        .mv_name                = "x3proto",
        .mv_setup               = x3proto_setup,
-        .mv_init_irq            = x3proto_init_irq,
 };