Merge tag 'renesas-cleanup3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/renesas

From Simon Horman:
Third round of Renesas ARM based SoC cleanups for v3.12

* Remove global GPIO_NR definition from sh73a0 SoC
* Remove unnecessary nfsroot settings from bootargs of
  kzm9d and armadillo800eva
* Rename irq initialisation functions of r8a7779 SoC
  to make them consistent with other SoCs
* Simplify irq initialisation of r8a7740 SoC
* Add missing __initdata annotations to bockw board, and
  r8a7790 and r8a7779 SoCs
* Refactor time initialisation and remove shmobile_init_time.
  - This affects the following boards: kzm9g, marzen, ape6evm,
    armadillo800eva and bockw
  - This affects the following SoCs: r8a7790, r8a7779, r7a7740, r7a73a4
* Cleanup device registration code of r8a7778 SoC

* tag 'renesas-cleanup3-for-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (45 commits)
  ARM: shmobile: sh73a0: Remove global GPIO_NR definition
  ARM: shmobile: kzm9d: remove nfsroot settings from bootargs
  ARM: shmobile: armadillo800eva: remove nfsroot settings from bootargs
  ARM: shmobile: r8a7779: move r8a7779_init_irq_xxx() to setup
  ARM: shmobile: r8a7740: move r8a7740_init_irq_of() to setup
  ARM: shmobile: bockw: add missing __initdata
  ARM: shmobile: r8a7790: add missing __initdata
  ARM: shmobile: r8a7779: add missing __initdata
  ARM: shmobile: Remove unused shmobile_init_time()
  ARM: shmobile: Use clocksource_of_init() on r8a7790
  ARM: shmobile: Use default ->init_time() on KZM9G DT ref
  ARM: shmobile: Use default ->init_time() on Marzen DT ref
  ARM: shmobile: Use default ->init_time() on APE6EVM DT ref
  ARM: shmobile: Use default ->init_time() on APE6EVM
  ARM: shmobile: Use default ->init_time() on Armadillo DT ref
  ARM: shmobile: Use default ->init_time() on Bockw DT ref
  ARM: shmobile: Use default ->init_time() on Bockw
  ARM: shmobile: Use default ->init_time() on r8a7779
  ARM: shmobile: Use default ->init_time() on r8a7778
  ARM: shmobile: Use default ->init_time() on r8a7740
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>

31 files changed, 424 insertions, 328 deletions

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index e4ad4089f6ff..fed06b06056d 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -76,6 +76,17 @@ config MACH_APE6EVM
         depends on ARCH_R8A73A4
         select USE_OF
 
+config MACH_APE6EVM_REFERENCE
+        bool "APE6EVM board - Reference Device Tree Implementation"
+        depends on ARCH_R8A73A4
+        select USE_OF
+        ---help---
+           Use reference implementation of APE6EVM board support
+           which makes a greater use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
+
 config MACH_MACKEREL
         bool "mackerel board"
         depends on ARCH_SH7372
@@ -113,11 +124,26 @@ config MACH_BOCKW
         select RENESAS_INTC_IRQPIN
         select USE_OF
 
+config MACH_BOCKW_REFERENCE
+        bool "BOCK-W  - Reference Device Tree Implementation"
+        depends on ARCH_R8A7778
+        select ARCH_REQUIRE_GPIOLIB
+        select RENESAS_INTC_IRQPIN
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select USE_OF
+        ---help---
+           Use reference implementation of BockW board support
+           which makes use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
+
 config MACH_MARZEN
         bool "MARZEN board"
         depends on ARCH_R8A7779
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select USE_OF
 
 config MACH_MARZEN_REFERENCE
         bool "MARZEN board - Reference Device Tree Implementation"
@@ -137,6 +163,17 @@ config MACH_LAGER
         depends on ARCH_R8A7790
         select USE_OF
 
+config MACH_LAGER_REFERENCE
+        bool "Lager board - Reference Device Tree Implementation"
+        depends on ARCH_R8A7790
+        select USE_OF
+        ---help---
+           Use reference implementation of Lager board support
+           which makes use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
+
 config MACH_KZM9D
         bool "KZM9D board"
         depends on ARCH_EMEV2
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index e3f8592fab88..969c3a9dde5b 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -9,9 +9,9 @@ obj-y				:= timer.o console.o clock.o
 obj-$(CONFIG_ARCH_SH7372)       += setup-sh7372.o clock-sh7372.o intc-sh7372.o
 obj-$(CONFIG_ARCH_SH73A0)       += setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
 obj-$(CONFIG_ARCH_R8A73A4)      += setup-r8a73a4.o clock-r8a73a4.o
-obj-$(CONFIG_ARCH_R8A7740)      += setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7740)      += setup-r8a7740.o clock-r8a7740.o
 obj-$(CONFIG_ARCH_R8A7778)      += setup-r8a7778.o clock-r8a7778.o
-obj-$(CONFIG_ARCH_R8A7779)      += setup-r8a7779.o clock-r8a7779.o intc-r8a7779.o
+obj-$(CONFIG_ARCH_R8A7779)      += setup-r8a7779.o clock-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)      += setup-r8a7790.o clock-r8a7790.o
 obj-$(CONFIG_ARCH_EMEV2)        += setup-emev2.o clock-emev2.o
 
@@ -34,11 +34,14 @@ obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o
 
 # Board objects
 obj-$(CONFIG_MACH_APE6EVM)      += board-ape6evm.o
+obj-$(CONFIG_MACH_APE6EVM_REFERENCE)    += board-ape6evm-reference.o
 obj-$(CONFIG_MACH_MACKEREL)     += board-mackerel.o
 obj-$(CONFIG_MACH_BOCKW)        += board-bockw.o
+obj-$(CONFIG_MACH_BOCKW_REFERENCE)      += board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)       += board-marzen.o
 obj-$(CONFIG_MACH_MARZEN_REFERENCE)     += board-marzen-reference.o
 obj-$(CONFIG_MACH_LAGER)        += board-lager.o
+obj-$(CONFIG_MACH_LAGER_REFERENCE)      += board-lager-reference.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA)      += board-armadillo800eva.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)    += board-armadillo800eva-reference.o
 obj-$(CONFIG_MACH_KZM9D)        += board-kzm9d.o
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index b8c1a21fcaf3..6a504fe7d86c 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -1,14 +1,17 @@
 # per-board load address for uImage
 loadaddr-y      :=
 loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000
+loadaddr-$(CONFIG_MACH_APE6EVM_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
+loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
 loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
 loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000
+loadaddr-$(CONFIG_MACH_LAGER_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000
 loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
 loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
new file mode 100644
index 000000000000..a23fa714f7ac
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -0,0 +1,63 @@
+/*
+ * APE6EVM board support
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/gpio.h>
+#include <linux/kernel.h>
+#include <linux/of_platform.h>
+#include <linux/pinctrl/machine.h>
+#include <linux/platform_device.h>
+#include <linux/sh_clk.h>
+#include <mach/common.h>
+#include <mach/r8a73a4.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+static void __init ape6evm_add_standard_devices(void)
+{
+
+        struct clk *parent;
+        struct clk *mp;
+
+        r8a73a4_clock_init();
+
+        /* MP clock parent = extal2 */
+        parent      = clk_get(NULL, "extal2");
+        mp          = clk_get(NULL, "mp");
+        BUG_ON(IS_ERR(parent) || IS_ERR(mp));
+
+        clk_set_parent(mp, parent);
+        clk_put(parent);
+        clk_put(mp);
+
+        r8a73a4_add_dt_devices();
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+        platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0);
+}
+
+static const char *ape6evm_boards_compat_dt[] __initdata = {
+        "renesas,ape6evm-reference",
+        NULL,
+};
+
+DT_MACHINE_START(APE6EVM_DT, "ape6evm")
+        .init_early     = r8a73a4_init_delay,
+        .init_machine   = ape6evm_add_standard_devices,
+        .dt_compat      = ape6evm_boards_compat_dt,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index af6dd39d3758..57e66eb2fd5a 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -102,7 +102,6 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
 
 DT_MACHINE_START(APE6EVM_DT, "ape6evm")
         .init_early     = r8a73a4_init_delay,
-        .init_time      = shmobile_timer_init,
         .init_machine   = ape6evm_add_standard_devices,
         .dt_compat      = ape6evm_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index 03b85fec2ddb..5c8cc3c9e9d0 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -206,7 +206,6 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva-reference")
         .init_early     = r8a7740_init_delay,
         .init_irq       = r8a7740_init_irq_of,
         .init_machine   = eva_init,
-        .init_time      = shmobile_timer_init,
         .init_late      = shmobile_init_late,
         .dt_compat      = eva_boards_compat_dt,
         .restart        = eva_restart,
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 5eb884d4324f..4d65263aafad 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -1312,7 +1312,7 @@ static const char *eva_boards_compat_dt[] __initdata = {
 DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva")
         .map_io         = r8a7740_map_io,
         .init_early     = eva_add_early_devices,
-        .init_irq       = r8a7740_init_irq,
+        .init_irq       = r8a7740_init_irq_of,
         .init_machine   = eva_init,
         .init_late      = shmobile_init_late,
         .init_time      = eva_earlytimer_init,
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
new file mode 100644
index 000000000000..1a7c893e1a52
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -0,0 +1,61 @@
+/*
+ * Bock-W board support
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/of_platform.h>
+#include <linux/pinctrl/machine.h>
+#include <mach/common.h>
+#include <mach/r8a7778.h>
+#include <asm/mach/arch.h>
+
+/*
+ *      see board-bock.c for checking detail of dip-switch
+ */
+
+static const struct pinctrl_map bockw_pinctrl_map[] = {
+        /* SCIF0 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
+                                  "scif0_data_a", "scif0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
+                                  "scif0_ctrl", "scif0"),
+};
+
+static void __init bockw_init(void)
+{
+        r8a7778_clock_init();
+
+        pinctrl_register_mappings(bockw_pinctrl_map,
+                                  ARRAY_SIZE(bockw_pinctrl_map));
+        r8a7778_pinmux_init();
+        r8a7778_add_dt_devices();
+
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *bockw_boards_compat_dt[] __initdata = {
+        "renesas,bockw-reference",
+        NULL,
+};
+
+DT_MACHINE_START(BOCKW_DT, "bockw")
+        .init_early     = r8a7778_init_delay,
+        .init_irq       = r8a7778_init_irq_dt,
+        .init_machine   = bockw_init,
+        .dt_compat      = bockw_boards_compat_dt,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 3354a85c90f7..255e97e5be83 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -20,8 +20,11 @@
 
 #include <linux/mfd/tmio.h>
 #include <linux/mmc/host.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/mmc/sh_mmcif.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pinctrl/machine.h>
+#include <linux/platform_data/usb-rcar-phy.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
@@ -64,28 +67,38 @@ static struct regulator_consumer_supply dummy_supplies[] = {
         REGULATOR_SUPPLY("vdd33a", "smsc911x"),
 };
 
-static struct smsc911x_platform_config smsc911x_data = {
+static struct smsc911x_platform_config smsc911x_data __initdata = {
         .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
         .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
         .flags          = SMSC911X_USE_32BIT,
         .phy_interface  = PHY_INTERFACE_MODE_MII,
 };
 
-static struct resource smsc911x_resources[] = {
+static struct resource smsc911x_resources[] __initdata = {
         DEFINE_RES_MEM(0x18300000, 0x1000),
         DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */
 };
 
 /* USB */
+static struct resource usb_phy_resources[] __initdata = {
+        DEFINE_RES_MEM(0xffe70800, 0x100),
+        DEFINE_RES_MEM(0xffe76000, 0x100),
+};
+
 static struct rcar_phy_platform_data usb_phy_platform_data __initdata;
 
 /* SDHI */
-static struct sh_mobile_sdhi_info sdhi0_info = {
+static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
         .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
         .tmio_ocr_mask  = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
         .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
 };
 
+static struct resource sdhi0_resources[] __initdata = {
+        DEFINE_RES_MEM(0xFFE4C000, 0x100),
+        DEFINE_RES_IRQ(gic_iid(0x77)),
+};
+
 static struct sh_eth_plat_data ether_platform_data __initdata = {
         .phy            = 0x01,
         .edmac_endian   = EDMAC_LITTLE_ENDIAN,
@@ -135,7 +148,12 @@ static struct spi_board_info spi_board_info[] __initdata = {
 };
 
 /* MMC */
-static struct sh_mmcif_plat_data sh_mmcif_plat = {
+static struct resource mmc_resources[] __initdata = {
+        DEFINE_RES_MEM(0xffe4e000, 0x100),
+        DEFINE_RES_IRQ(gic_iid(0x5d)),
+};
+
+static struct sh_mmcif_plat_data sh_mmcif_plat __initdata = {
         .sup_pclk       = 0,
         .ocr            = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
         .caps           = MMC_CAP_4_BIT_DATA |
@@ -187,11 +205,7 @@ static void __init bockw_init(void)
         r8a7778_clock_init();
         r8a7778_init_irq_extpin(1);
         r8a7778_add_standard_devices();
-        r8a7778_add_usb_phy_device(&usb_phy_platform_data);
         r8a7778_add_ether_device(&ether_platform_data);
-        r8a7778_add_i2c_device(0);
-        r8a7778_add_hspi_device(0);
-        r8a7778_add_mmc_device(&sh_mmcif_plat);
 
         i2c_register_board_info(0, i2c0_devices,
                                 ARRAY_SIZE(i2c0_devices));
@@ -201,6 +215,19 @@ static void __init bockw_init(void)
                                   ARRAY_SIZE(bockw_pinctrl_map));
         r8a7778_pinmux_init();
 
+        platform_device_register_resndata(
+                &platform_bus, "sh_mmcif", -1,
+                mmc_resources, ARRAY_SIZE(mmc_resources),
+                &sh_mmcif_plat, sizeof(struct sh_mmcif_plat_data));
+
+        platform_device_register_resndata(
+                &platform_bus, "rcar_usb_phy", -1,
+                usb_phy_resources,
+                ARRAY_SIZE(usb_phy_resources),
+                &usb_phy_platform_data,
+                sizeof(struct rcar_phy_platform_data));
+
+
         /* for SMSC */
         base = ioremap_nocache(FPGA, SZ_1M);
         if (base) {
@@ -236,7 +263,10 @@ static void __init bockw_init(void)
                 iowrite32(ioread32(base + PUPR4) | (3 << 26), base + PUPR4);
                 iounmap(base);
 
-                r8a7778_sdhi_init(0, &sdhi0_info);
+                platform_device_register_resndata(
+                        &platform_bus, "sh_mobile_sdhi", 0,
+                        sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
+                        &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
         }
 }
 
@@ -249,7 +279,6 @@ DT_MACHINE_START(BOCKW_DT, "bockw")
         .init_early     = r8a7778_init_delay,
         .init_irq       = r8a7778_init_irq_dt,
         .init_machine   = bockw_init,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = bockw_boards_compat_dt,
         .init_late      = r8a7778_init_late,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index 41092bb01ee5..4cf6babc4e02 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -99,6 +99,5 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
         .init_early     = sh73a0_init_delay,
         .nr_irqs        = NR_IRQS_LEGACY,
         .init_machine   = kzm_init,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = kzm9g_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 1068120d339f..f1994968d303 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -54,14 +54,14 @@
 /*
  * external GPIO
  */
-#define GPIO_PCF8575_BASE       (GPIO_NR)
-#define GPIO_PCF8575_PORT10     (GPIO_NR + 8)
-#define GPIO_PCF8575_PORT11     (GPIO_NR + 9)
-#define GPIO_PCF8575_PORT12     (GPIO_NR + 10)
-#define GPIO_PCF8575_PORT13     (GPIO_NR + 11)
-#define GPIO_PCF8575_PORT14     (GPIO_NR + 12)
-#define GPIO_PCF8575_PORT15     (GPIO_NR + 13)
-#define GPIO_PCF8575_PORT16     (GPIO_NR + 14)
+#define GPIO_PCF8575_BASE       (310)
+#define GPIO_PCF8575_PORT10     (GPIO_PCF8575_BASE + 8)
+#define GPIO_PCF8575_PORT11     (GPIO_PCF8575_BASE + 9)
+#define GPIO_PCF8575_PORT12     (GPIO_PCF8575_BASE + 10)
+#define GPIO_PCF8575_PORT13     (GPIO_PCF8575_BASE + 11)
+#define GPIO_PCF8575_PORT14     (GPIO_PCF8575_BASE + 12)
+#define GPIO_PCF8575_PORT15     (GPIO_PCF8575_BASE + 13)
+#define GPIO_PCF8575_PORT16     (GPIO_PCF8575_BASE + 14)
 
 /* Dummy supplies, where voltage doesn't matter */
 static struct regulator_consumer_supply dummy_supplies[] = {
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
new file mode 100644
index 000000000000..9c316a1b2e32
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -0,0 +1,45 @@
+/*
+ * Lager board support - Reference DT implementation
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Simon Horman
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+#include <mach/r8a7790.h>
+#include <asm/mach/arch.h>
+
+static void __init lager_add_standard_devices(void)
+{
+        /* clocks are setup late during boot in the case of DT */
+        r8a7790_clock_init();
+
+        r8a7790_add_dt_devices();
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *lager_boards_compat_dt[] __initdata = {
+        "renesas,lager-reference",
+        NULL,
+};
+
+DT_MACHINE_START(LAGER_DT, "lager")
+        .init_early     = r8a7790_init_delay,
+        .init_machine   = lager_add_standard_devices,
+        .init_time      = r8a7790_timer_init,
+        .dt_compat      = lager_boards_compat_dt,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 480d882e42c7..a20b7ee652ea 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -70,6 +70,5 @@ DT_MACHINE_START(MARZEN, "marzen")
         .nr_irqs        = NR_IRQS_LEGACY,
         .init_irq       = r8a7779_init_irq_dt,
         .init_machine   = marzen_init,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = marzen_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index 7474a60f98ae..3551b5480b47 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -257,13 +257,18 @@ static void __init marzen_init(void)
         platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
-MACHINE_START(MARZEN, "marzen")
+static const char *marzen_boards_compat_dt[] __initdata = {
+        "renesas,marzen",
+        NULL,
+};
+
+DT_MACHINE_START(MARZEN, "marzen")
         .smp            = smp_ops(r8a7779_smp_ops),
         .map_io         = r8a7779_map_io,
         .init_early     = r8a7779_add_early_devices,
-        .nr_irqs        = NR_IRQS_LEGACY,
-        .init_irq       = r8a7779_init_irq,
+        .init_irq       = r8a7779_init_irq_dt,
         .init_machine   = marzen_init,
         .init_late      = r8a7779_init_late,
+        .dt_compat      = marzen_boards_compat_dt,
         .init_time      = r8a7779_earlytimer_init,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index e818f029d8e3..18a76f91f4cb 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -2,7 +2,6 @@
 #define __ARCH_MACH_COMMON_H
 
 extern void shmobile_earlytimer_init(void);
-extern void shmobile_timer_init(void);
 extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz,
                          unsigned int mult, unsigned int div);
 struct twd_local_timer;
diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/include/mach/r8a73a4.h
index 144a85e29245..f3a9b702da56 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a73a4.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a73a4.h
@@ -2,6 +2,7 @@
 #define __ASM_R8A73A4_H__
 
 void r8a73a4_add_standard_devices(void);
+void r8a73a4_add_dt_devices(void);
 void r8a73a4_clock_init(void);
 void r8a73a4_pinmux_init(void);
 void r8a73a4_init_delay(void);
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/include/mach/r8a7740.h
index 56f375005fcd..d07932f872b6 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7740.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7740.h
@@ -48,7 +48,6 @@ enum {
 
 extern void r8a7740_meram_workaround(void);
 extern void r8a7740_init_delay(void);
-extern void r8a7740_init_irq(void);
 extern void r8a7740_init_irq_of(void);
 extern void r8a7740_map_io(void);
 extern void r8a7740_add_early_devices(void);
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
index 9b561bf4229f..41fd6da27574 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@ -18,18 +18,12 @@
 #ifndef __ASM_R8A7778_H__
 #define __ASM_R8A7778_H__
 
-#include <linux/mmc/sh_mmcif.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/sh_eth.h>
-#include <linux/platform_data/usb-rcar-phy.h>
 
 extern void r8a7778_add_standard_devices(void);
 extern void r8a7778_add_standard_devices_dt(void);
 extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);
-extern void r8a7778_add_usb_phy_device(struct rcar_phy_platform_data *pdata);
-extern void r8a7778_add_i2c_device(int id);
-extern void r8a7778_add_hspi_device(int id);
-extern void r8a7778_add_mmc_device(struct sh_mmcif_plat_data *info);
+extern void r8a7778_add_dt_devices(void);
 
 extern void r8a7778_init_late(void);
 extern void r8a7778_init_delay(void);
@@ -37,6 +31,5 @@ extern void r8a7778_init_irq_dt(void);
 extern void r8a7778_clock_init(void);
 extern void r8a7778_init_irq_extpin(int irlm);
 extern void r8a7778_pinmux_init(void);
-extern void r8a7778_sdhi_init(int id, struct sh_mobile_sdhi_info *info);
 
 #endif /* __ASM_R8A7778_H__ */
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h
index f10727f77b11..f08d6ecf5d1d 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7779.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h
@@ -24,7 +24,6 @@ static inline struct r8a7779_pm_ch *to_r8a7779_ch(struct generic_pm_domain *d)
 }
 
 extern void r8a7779_init_delay(void);
-extern void r8a7779_init_irq(void);
 extern void r8a7779_init_irq_extpin(int irlm);
 extern void r8a7779_init_irq_dt(void);
 extern void r8a7779_map_io(void);
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/include/mach/r8a7790.h
index 7aaef409a059..788d55952091 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7790.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7790.h
@@ -2,6 +2,7 @@
 #define __ASM_R8A7790_H__
 
 void r8a7790_add_standard_devices(void);
+void r8a7790_add_dt_devices(void);
 void r8a7790_clock_init(void);
 void r8a7790_pinmux_init(void);
 void r8a7790_init_delay(void);
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h
index 680dc5f1655a..359b582dc270 100644
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -1,8 +1,6 @@
 #ifndef __ASM_SH73A0_H__
 #define __ASM_SH73A0_H__
 
-#define GPIO_NR                 310
-
 /* DMA slave IDs */
 enum {
         SHDMA_SLAVE_INVALID,
diff --git a/arch/arm/mach-shmobile/intc-r8a7740.c b/arch/arm/mach-shmobile/intc-r8a7740.c
deleted file mode 100644
index 8871f7717dc8..000000000000
--- a/arch/arm/mach-shmobile/intc-r8a7740.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * R8A7740 processor support
- *
- * Copyright (C) 2011  Renesas Solutions Corp.
- * Copyright (C) 2011  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/irqchip.h>
-#include <linux/irqchip/arm-gic.h>
-
-static void __init r8a7740_init_irq_common(void)
-{
-        void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
-        void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);
-        void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);
-
-        /* route signals to GIC */
-        iowrite32(0x0, pfc_inta_ctrl);
-
-        /*
-         * To mask the shared interrupt to SPI 149 we must ensure to set
-         * PRIO *and* MASK. Else we run into IRQ floods when registering
-         * the intc_irqpin devices
-         */
-        iowrite32(0x0, intc_prio_base + 0x0);
-        iowrite32(0x0, intc_prio_base + 0x4);
-        iowrite32(0x0, intc_prio_base + 0x8);
-        iowrite32(0x0, intc_prio_base + 0xc);
-        iowrite8(0xff, intc_msk_base + 0x0);
-        iowrite8(0xff, intc_msk_base + 0x4);
-        iowrite8(0xff, intc_msk_base + 0x8);
-        iowrite8(0xff, intc_msk_base + 0xc);
-
-        iounmap(intc_prio_base);
-        iounmap(intc_msk_base);
-        iounmap(pfc_inta_ctrl);
-}
-
-void __init r8a7740_init_irq_of(void)
-{
-        irqchip_init();
-        r8a7740_init_irq_common();
-}
-
-void __init r8a7740_init_irq(void)
-{
-        void __iomem *gic_dist_base = ioremap_nocache(0xc2800000, 0x1000);
-        void __iomem *gic_cpu_base = ioremap_nocache(0xc2000000, 0x1000);
-
-        /* initialize the Generic Interrupt Controller PL390 r0p0 */
-        gic_init(0, 29, gic_dist_base, gic_cpu_base);
-        r8a7740_init_irq_common();
-}
diff --git a/arch/arm/mach-shmobile/intc-r8a7779.c b/arch/arm/mach-shmobile/intc-r8a7779.c
deleted file mode 100644
index 5f9e5dc0238b..000000000000
--- a/arch/arm/mach-shmobile/intc-r8a7779.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * r8a7779 processor support - INTC hardware block
- *
- * Copyright (C) 2011  Renesas Solutions Corp.
- * Copyright (C) 2011  Magnus Damm
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <linux/irqchip/arm-gic.h>
-#include <linux/platform_data/irq-renesas-intc-irqpin.h>
-#include <linux/irqchip.h>
-#include <mach/common.h>
-#include <mach/irqs.h>
-#include <mach/r8a7779.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#define INT2SMSKCR0 IOMEM(0xfe7822a0)
-#define INT2SMSKCR1 IOMEM(0xfe7822a4)
-#define INT2SMSKCR2 IOMEM(0xfe7822a8)
-#define INT2SMSKCR3 IOMEM(0xfe7822ac)
-#define INT2SMSKCR4 IOMEM(0xfe7822b0)
-
-#define INT2NTSR0 IOMEM(0xfe700060)
-#define INT2NTSR1 IOMEM(0xfe700064)
-
-static struct renesas_intc_irqpin_config irqpin0_platform_data = {
-        .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
-        .sense_bitfield_width = 2,
-};
-
-static struct resource irqpin0_resources[] = {
-        DEFINE_RES_MEM(0xfe78001c, 4), /* ICR1 */
-        DEFINE_RES_MEM(0xfe780010, 4), /* INTPRI */
-        DEFINE_RES_MEM(0xfe780024, 4), /* INTREQ */
-        DEFINE_RES_MEM(0xfe780044, 4), /* INTMSK0 */
-        DEFINE_RES_MEM(0xfe780064, 4), /* INTMSKCLR0 */
-        DEFINE_RES_IRQ(gic_spi(27)), /* IRQ0 */
-        DEFINE_RES_IRQ(gic_spi(28)), /* IRQ1 */
-        DEFINE_RES_IRQ(gic_spi(29)), /* IRQ2 */
-        DEFINE_RES_IRQ(gic_spi(30)), /* IRQ3 */
-};
-
-static struct platform_device irqpin0_device = {
-        .name           = "renesas_intc_irqpin",
-        .id             = 0,
-        .resource       = irqpin0_resources,
-        .num_resources  = ARRAY_SIZE(irqpin0_resources),
-        .dev            = {
-                .platform_data  = &irqpin0_platform_data,
-        },
-};
-
-void __init r8a7779_init_irq_extpin(int irlm)
-{
-        void __iomem *icr0 = ioremap_nocache(0xfe780000, PAGE_SIZE);
-        unsigned long tmp;
-
-        if (icr0) {
-                tmp = ioread32(icr0);
-                if (irlm)
-                        tmp |= 1 << 23; /* IRQ0 -> IRQ3 as individual pins */
-                else
-                        tmp &= ~(1 << 23); /* IRL mode - not supported */
-                tmp |= (1 << 21); /* LVLMODE = 1 */
-                iowrite32(tmp, icr0);
-                iounmap(icr0);
-
-                if (irlm)
-                        platform_device_register(&irqpin0_device);
-        } else
-                pr_warn("r8a7779: unable to setup external irq pin mode\n");
-}
-
-static int r8a7779_set_wake(struct irq_data *data, unsigned int on)
-{
-        return 0; /* always allow wakeup */
-}
-
-static void __init r8a7779_init_irq_common(void)
-{
-        gic_arch_extn.irq_set_wake = r8a7779_set_wake;
-
-        /* route all interrupts to ARM */
-        __raw_writel(0xffffffff, INT2NTSR0);
-        __raw_writel(0x3fffffff, INT2NTSR1);
-
-        /* unmask all known interrupts in INTCS2 */
-        __raw_writel(0xfffffff0, INT2SMSKCR0);
-        __raw_writel(0xfff7ffff, INT2SMSKCR1);
-        __raw_writel(0xfffbffdf, INT2SMSKCR2);
-        __raw_writel(0xbffffffc, INT2SMSKCR3);
-        __raw_writel(0x003fee3f, INT2SMSKCR4);
-}
-
-void __init r8a7779_init_irq(void)
-{
-        void __iomem *gic_dist_base = IOMEM(0xf0001000);
-        void __iomem *gic_cpu_base = IOMEM(0xf0000100);
-
-        /* use GIC to handle interrupts */
-        gic_init(0, 29, gic_dist_base, gic_cpu_base);
-
-        r8a7779_init_irq_common();
-}
-
-#ifdef CONFIG_OF
-void __init r8a7779_init_irq_dt(void)
-{
-        irqchip_init();
-        r8a7779_init_irq_common();
-}
-#endif
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 11c0f6305e6b..89491700afb7 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -188,7 +188,7 @@ static struct resource cmt10_resources[] = {
                                           &cmt##idx##_platform_data,    \
                                           sizeof(struct sh_timer_config))
 
-void __init r8a73a4_add_standard_devices(void)
+void __init r8a73a4_add_dt_devices(void)
 {
         r8a73a4_register_scif(SCIFA0);
         r8a73a4_register_scif(SCIFA1);
@@ -196,10 +196,15 @@ void __init r8a73a4_add_standard_devices(void)
         r8a73a4_register_scif(SCIFB1);
         r8a73a4_register_scif(SCIFB2);
         r8a73a4_register_scif(SCIFB3);
+        r8a7790_register_cmt(10);
+}
+
+void __init r8a73a4_add_standard_devices(void)
+{
+        r8a73a4_add_dt_devices();
         r8a73a4_register_irqc(0);
         r8a73a4_register_irqc(1);
         r8a73a4_register_thermal();
-        r8a7790_register_cmt(10);
 }
 
 void __init r8a73a4_init_delay(void)
@@ -218,7 +223,6 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
 
 DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
         .init_early     = r8a73a4_init_delay,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = r8a73a4_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 84c5bb6d9725..b7d4b2c3bc29 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -22,6 +22,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/arm-gic.h>
 #include <linux/platform_data/irq-renesas-intc-irqpin.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
@@ -1019,6 +1021,36 @@ void __init r8a7740_init_delay(void)
         shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
 };
 
+void __init r8a7740_init_irq_of(void)
+{
+        void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
+        void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);
+        void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);
+
+        irqchip_init();
+
+        /* route signals to GIC */
+        iowrite32(0x0, pfc_inta_ctrl);
+
+        /*
+         * To mask the shared interrupt to SPI 149 we must ensure to set
+         * PRIO *and* MASK. Else we run into IRQ floods when registering
+         * the intc_irqpin devices
+         */
+        iowrite32(0x0, intc_prio_base + 0x0);
+        iowrite32(0x0, intc_prio_base + 0x4);
+        iowrite32(0x0, intc_prio_base + 0x8);
+        iowrite32(0x0, intc_prio_base + 0xc);
+        iowrite8(0xff, intc_msk_base + 0x0);
+        iowrite8(0xff, intc_msk_base + 0x4);
+        iowrite8(0xff, intc_msk_base + 0x8);
+        iowrite8(0xff, intc_msk_base + 0xc);
+
+        iounmap(intc_prio_base);
+        iounmap(intc_msk_base);
+        iounmap(pfc_inta_ctrl);
+}
+
 static void __init r8a7740_generic_init(void)
 {
         r8a7740_clock_init(0);
@@ -1035,7 +1067,6 @@ DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
         .init_early     = r8a7740_init_delay,
         .init_irq       = r8a7740_init_irq_of,
         .init_machine   = r8a7740_generic_init,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = r8a7740_boards_compat_dt,
 MACHINE_END
 
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index a3a2e37b03f3..604cf36b5616 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -95,20 +95,6 @@ static struct sh_timer_config sh_tmu1_platform_data __initdata = {
                 &sh_tmu##idx##_platform_data,           \
                 sizeof(sh_tmu##idx##_platform_data))
 
-/* USB PHY */
-static struct resource usb_phy_resources[] __initdata = {
-        DEFINE_RES_MEM(0xffe70800, 0x100),
-        DEFINE_RES_MEM(0xffe76000, 0x100),
-};
-
-void __init r8a7778_add_usb_phy_device(struct rcar_phy_platform_data *pdata)
-{
-        platform_device_register_resndata(&platform_bus, "rcar_usb_phy", -1,
-                                          usb_phy_resources,
-                                          ARRAY_SIZE(usb_phy_resources),
-                                          pdata, sizeof(*pdata));
-}
-
 /* USB */
 static struct usb_phy *phy;
 
@@ -248,30 +234,6 @@ void __init r8a7778_pinmux_init(void)
         r8a7778_register_gpio(4);
 };
 
-/* SDHI */
-static struct resource sdhi_resources[] __initdata = {
-        /* SDHI0 */
-        DEFINE_RES_MEM(0xFFE4C000, 0x100),
-        DEFINE_RES_IRQ(gic_iid(0x77)),
-        /* SDHI1 */
-        DEFINE_RES_MEM(0xFFE4D000, 0x100),
-        DEFINE_RES_IRQ(gic_iid(0x78)),
-        /* SDHI2 */
-        DEFINE_RES_MEM(0xFFE4F000, 0x100),
-        DEFINE_RES_IRQ(gic_iid(0x76)),
-};
-
-void __init r8a7778_sdhi_init(int id,
-                              struct sh_mobile_sdhi_info *info)
-{
-        BUG_ON(id < 0 || id > 2);
-
-        platform_device_register_resndata(
-                &platform_bus, "sh_mobile_sdhi", id,
-                sdhi_resources + (2 * id), 2,
-                info, sizeof(*info));
-}
-
 /* I2C */
 static struct resource i2c_resources[] __initdata = {
         /* I2C0 */
@@ -288,7 +250,7 @@ static struct resource i2c_resources[] __initdata = {
         DEFINE_RES_IRQ(gic_iid(0x6d)),
 };
 
-void __init r8a7778_add_i2c_device(int id)
+static void __init r8a7778_register_i2c(int id)
 {
         BUG_ON(id < 0 || id > 3);
 
@@ -310,7 +272,7 @@ static struct resource hspi_resources[] __initdata = {
         DEFINE_RES_IRQ(gic_iid(0x75)),
 };
 
-void __init r8a7778_add_hspi_device(int id)
+void __init r8a7778_register_hspi(int id)
 {
         BUG_ON(id < 0 || id > 2);
 
@@ -319,21 +281,7 @@ void __init r8a7778_add_hspi_device(int id)
                 hspi_resources + (2 * id), 2);
 }
 
-/* MMC */
-static struct resource mmc_resources[] __initdata = {
-        DEFINE_RES_MEM(0xffe4e000, 0x100),
-        DEFINE_RES_IRQ(gic_iid(0x5d)),
-};
-
-void __init r8a7778_add_mmc_device(struct sh_mmcif_plat_data *info)
-{
-        platform_device_register_resndata(
-                &platform_bus, "sh_mmcif", -1,
-                mmc_resources, ARRAY_SIZE(mmc_resources),
-                info, sizeof(*info));
-}
-
-void __init r8a7778_add_standard_devices(void)
+void __init r8a7778_add_dt_devices(void)
 {
         int i;
 
@@ -357,6 +305,18 @@ void __init r8a7778_add_standard_devices(void)
         r8a7778_register_tmu(1);
 }
 
+void __init r8a7778_add_standard_devices(void)
+{
+        r8a7778_add_dt_devices();
+        r8a7778_register_i2c(0);
+        r8a7778_register_i2c(1);
+        r8a7778_register_i2c(2);
+        r8a7778_register_i2c(3);
+        r8a7778_register_hspi(0);
+        r8a7778_register_hspi(1);
+        r8a7778_register_hspi(2);
+}
+
 void __init r8a7778_init_late(void)
 {
         phy = usb_get_phy(USB_PHY_TYPE_USB2);
@@ -446,7 +406,6 @@ static const char *r8a7778_compat_dt[] __initdata = {
 DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
         .init_early     = r8a7778_init_delay,
         .init_irq       = r8a7778_init_irq_dt,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = r8a7778_compat_dt,
         .init_late      = r8a7778_init_late,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index ddee4aa8e669..6a9933395434 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -22,8 +22,11 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/arm-gic.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/gpio-rcar.h>
+#include <linux/platform_data/irq-renesas-intc-irqpin.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/input.h>
@@ -67,6 +70,60 @@ void __init r8a7779_map_io(void)
         iotable_init(r8a7779_io_desc, ARRAY_SIZE(r8a7779_io_desc));
 }
 
+/* IRQ */
+#define INT2SMSKCR0 IOMEM(0xfe7822a0)
+#define INT2SMSKCR1 IOMEM(0xfe7822a4)
+#define INT2SMSKCR2 IOMEM(0xfe7822a8)
+#define INT2SMSKCR3 IOMEM(0xfe7822ac)
+#define INT2SMSKCR4 IOMEM(0xfe7822b0)
+
+#define INT2NTSR0 IOMEM(0xfe700060)
+#define INT2NTSR1 IOMEM(0xfe700064)
+
+static struct renesas_intc_irqpin_config irqpin0_platform_data __initdata = {
+        .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
+        .sense_bitfield_width = 2,
+};
+
+static struct resource irqpin0_resources[] __initdata = {
+        DEFINE_RES_MEM(0xfe78001c, 4), /* ICR1 */
+        DEFINE_RES_MEM(0xfe780010, 4), /* INTPRI */
+        DEFINE_RES_MEM(0xfe780024, 4), /* INTREQ */
+        DEFINE_RES_MEM(0xfe780044, 4), /* INTMSK0 */
+        DEFINE_RES_MEM(0xfe780064, 4), /* INTMSKCLR0 */
+        DEFINE_RES_IRQ(gic_spi(27)), /* IRQ0 */
+        DEFINE_RES_IRQ(gic_spi(28)), /* IRQ1 */
+        DEFINE_RES_IRQ(gic_spi(29)), /* IRQ2 */
+        DEFINE_RES_IRQ(gic_spi(30)), /* IRQ3 */
+};
+
+void __init r8a7779_init_irq_extpin(int irlm)
+{
+        void __iomem *icr0 = ioremap_nocache(0xfe780000, PAGE_SIZE);
+        u32 tmp;
+
+        if (!icr0) {
+                pr_warn("r8a7779: unable to setup external irq pin mode\n");
+                return;
+        }
+
+        tmp = ioread32(icr0);
+        if (irlm)
+                tmp |= 1 << 23; /* IRQ0 -> IRQ3 as individual pins */
+        else
+                tmp &= ~(1 << 23); /* IRL mode - not supported */
+        tmp |= (1 << 21); /* LVLMODE = 1 */
+        iowrite32(tmp, icr0);
+        iounmap(icr0);
+
+        if (irlm)
+                platform_device_register_resndata(
+                        &platform_bus, "renesas_intc_irqpin", -1,
+                        irqpin0_resources, ARRAY_SIZE(irqpin0_resources),
+                        &irqpin0_platform_data, sizeof(irqpin0_platform_data));
+}
+
+/* PFC/GPIO */
 static struct resource r8a7779_pfc_resources[] = {
         DEFINE_RES_MEM(0xfffc0000, 0x023c),
 };
@@ -537,7 +594,7 @@ static struct platform_device ohci1_device = {
 };
 
 /* Ether */
-static struct resource ether_resources[] = {
+static struct resource ether_resources[] __initdata = {
         {
                 .start  = 0xfde00000,
                 .end    = 0xfde003ff,
@@ -641,6 +698,29 @@ void __init r8a7779_init_late(void)
 }
 
 #ifdef CONFIG_USE_OF
+static int r8a7779_set_wake(struct irq_data *data, unsigned int on)
+{
+        return 0; /* always allow wakeup */
+}
+
+void __init r8a7779_init_irq_dt(void)
+{
+        gic_arch_extn.irq_set_wake = r8a7779_set_wake;
+
+        irqchip_init();
+
+        /* route all interrupts to ARM */
+        __raw_writel(0xffffffff, INT2NTSR0);
+        __raw_writel(0x3fffffff, INT2NTSR1);
+
+        /* unmask all known interrupts in INTCS2 */
+        __raw_writel(0xfffffff0, INT2SMSKCR0);
+        __raw_writel(0xfff7ffff, INT2SMSKCR1);
+        __raw_writel(0xfffbffdf, INT2SMSKCR2);
+        __raw_writel(0xbffffffc, INT2SMSKCR3);
+        __raw_writel(0x003fee3f, INT2SMSKCR4);
+}
+
 void __init r8a7779_init_delay(void)
 {
         shmobile_setup_delay(1000, 2, 4); /* Cortex-A9 @ 1000MHz */
@@ -667,7 +747,6 @@ DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
         .nr_irqs        = NR_IRQS_LEGACY,
         .init_irq       = r8a7779_init_irq_dt,
         .init_machine   = r8a7779_add_standard_devices_dt,
-        .init_time      = shmobile_timer_init,
         .init_late      = r8a7779_init_late,
         .dt_compat      = r8a7779_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 4c96dad21195..d0f5c9f9349a 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/clocksource.h>
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
@@ -160,13 +161,13 @@ static struct resource thermal_resources[] __initdata = {
                                         thermal_resources,              \
                                         ARRAY_SIZE(thermal_resources))
 
-static struct sh_timer_config cmt00_platform_data = {
+static struct sh_timer_config cmt00_platform_data __initdata = {
         .name = "CMT00",
         .timer_bit = 0,
         .clockevent_rating = 80,
 };
 
-static struct resource cmt00_resources[] = {
+static struct resource cmt00_resources[] __initdata = {
         DEFINE_RES_MEM(0xffca0510, 0x0c),
         DEFINE_RES_MEM(0xffca0500, 0x04),
         DEFINE_RES_IRQ(gic_spi(142)), /* CMT0_0 */
@@ -179,7 +180,7 @@ static struct resource cmt00_resources[] = {
                                           &cmt##idx##_platform_data,    \
                                           sizeof(struct sh_timer_config))
 
-void __init r8a7790_add_standard_devices(void)
+void __init r8a7790_add_dt_devices(void)
 {
         r8a7790_register_scif(SCIFA0);
         r8a7790_register_scif(SCIFA1);
@@ -191,9 +192,14 @@ void __init r8a7790_add_standard_devices(void)
         r8a7790_register_scif(SCIF1);
         r8a7790_register_scif(HSCIF0);
         r8a7790_register_scif(HSCIF1);
+        r8a7790_register_cmt(00);
+}
+
+void __init r8a7790_add_standard_devices(void)
+{
+        r8a7790_add_dt_devices();
         r8a7790_register_irqc(0);
         r8a7790_register_thermal();
-        r8a7790_register_cmt(00);
 }
 
 #define MODEMR 0xe6160060
@@ -258,7 +264,7 @@ void __init r8a7790_timer_init(void)
         iounmap(base);
 #endif /* CONFIG_ARM_ARCH_TIMER */
 
-        shmobile_timer_init();
+        clocksource_of_init();
 }
 
 void __init r8a7790_init_delay(void)
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 9bdf810f2a87..42170af64cc0 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -99,6 +99,9 @@ static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
 
 static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
 {
+
+        /* setup r8a7779 specific SCU base */
+        shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);
         scu_enable(shmobile_scu_base);
 
         /* Map the reset vector (in headsmp-scu.S, headsmp.S) */
@@ -117,14 +120,6 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
         r8a7779_platform_cpu_kill(3);
 }
 
-static void __init r8a7779_smp_init_cpus(void)
-{
-        /* setup r8a7779 specific SCU base */
-        shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);
-
-        shmobile_smp_init_cpus(scu_get_core_count(shmobile_scu_base));
-}
-
 #ifdef CONFIG_HOTPLUG_CPU
 static int r8a7779_scu_psr_core_disabled(int cpu)
 {
@@ -175,7 +170,6 @@ static int r8a7779_cpu_disable(unsigned int cpu)
 #endif /* CONFIG_HOTPLUG_CPU */
 
 struct smp_operations r8a7779_smp_ops  __initdata = {
-        .smp_init_cpus          = r8a7779_smp_init_cpus,
         .smp_prepare_cpus       = r8a7779_smp_prepare_cpus,
         .smp_boot_secondary     = r8a7779_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index d5fc3ed4e315..d2b89f7e5daf 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -62,6 +62,8 @@ static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
 
 static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
 {
+        /* setup sh73a0 specific SCU base */
+        shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
         scu_enable(shmobile_scu_base);
 
         /* Map the reset vector (in headsmp-scu.S, headsmp.S) */
@@ -74,14 +76,6 @@ static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
         scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
 }
 
-static void __init sh73a0_smp_init_cpus(void)
-{
-        /* setup sh73a0 specific SCU base */
-        shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
-
-        shmobile_smp_init_cpus(scu_get_core_count(shmobile_scu_base));
-}
-
 #ifdef CONFIG_HOTPLUG_CPU
 static int sh73a0_cpu_kill(unsigned int cpu)
 {
@@ -120,7 +114,6 @@ static int sh73a0_cpu_disable(unsigned int cpu)
 #endif /* CONFIG_HOTPLUG_CPU */
 
 struct smp_operations sh73a0_smp_ops __initdata = {
-        .smp_init_cpus          = sh73a0_smp_init_cpus,
         .smp_prepare_cpus       = sh73a0_smp_prepare_cpus,
         .smp_boot_secondary     = sh73a0_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index f321dbeb2379..62d7052d6f21 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -59,7 +59,3 @@ void __init shmobile_earlytimer_init(void)
         late_time_init = shmobile_late_time_init;
 }
 
-void __init shmobile_timer_init(void)
-{
-        clocksource_of_init();
-}