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

Merge "Third Round of Renesas ARM Based SoC Boards Updates for v3.15" from
Simon Horman:

* r7s72100 SoC (RZ/A1H) based Genmai board
  - Set proper DMA masks for Ether device

* r8a7791 (R-Car M2) based Koelsch board
  - Remove Koelsch DT reference legacy clock bits
  - Set proper DMA masks for Ether device
  - Add DU device to koelsch-reference
  - Refactor clock lookup hack in koelsch-reference
  - Add SDHI devices

* r8a7790 (R-Car H2) based Lager board
  - Remove Lager DT reference legacy clock bits
  - Set proper DMA masks for Ether device
  - Add internal USB PCI support
  - Add QSPI pinmux
  - Sdd SDHI0/2 support

* emev2 (Emma Mobile EV2) based kzm9d board
  - Remove KZM9D board code

* r8a7778 (R-Car M1) based bock-w board
  - Set proper DMA masks for Ether device

* r8a7740 (R-Mobile A1) based Armadillo 800 EVA board
  - Set proper DMA masks for Ether device

* tag 'renesas-boards3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: Remove Lager DT reference legacy clock bits
  ARM: shmobile: Remove Koelsch DT reference legacy clock bits
  ARM: shmobile: Remove KZM9D board code
  ARM: shmobile: Genmai: set proper DMA masks for Ether device
  ARM: shmobile: Koelsch: set proper DMA masks for Ether device
  ARM: shmobile: Lager: set proper DMA masks for Ether device
  ARM: shmobile: BOCK-W: set proper DMA masks for Ether device
  ARM: shmobile: Armadillo 800 EVA: set proper DMA masks for Ether device
  ARM: shmobile: koelsch-reference: Add DU device
  ARM: shmobile: koelsch-reference: Refactor clock lookup hack
  ARM: shmobile: lager-reference: Add DU device
  ARM: shmobile: lager-reference: Refactor clock lookup hack
  ARM: shmobile: lager: Add internal USB PCI support
  ARM: shmobile: lager legacy: Add QSPI pinmux
  ARM: shmobile: lager: add SDHI0/2 support
  ARM: shmobile: Add SDHI devices for legacy Koelsch

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

10 files changed, 506 insertions, 113 deletions

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index deb6dc884bf0..2f5c6f319a71 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -47,12 +47,6 @@ config MACH_KOELSCH
         depends on ARCH_R8A7791
         select MICREL_PHY if SH_ETH
 
-config MACH_KZM9D
-        bool "KZM9D board"
-        depends on ARCH_EMEV2
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        select SMSC_PHY if SMSC911X
-
 config MACH_LAGER
         bool "Lager board"
         depends on ARCH_R8A7790
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index fe7d4ff706e4..1402d602f5a4 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -58,7 +58,6 @@ obj-$(CONFIG_ARCH_R8A7779)	+= pm-r8a7779.o
 ifdef CONFIG_ARCH_SHMOBILE_MULTI
 obj-$(CONFIG_MACH_GENMAI)       += board-genmai-reference.o
 obj-$(CONFIG_MACH_KOELSCH)      += board-koelsch-reference.o
-obj-$(CONFIG_MACH_KZM9D)        += board-kzm9d-reference.o
 obj-$(CONFIG_MACH_LAGER)        += board-lager-reference.o
 else
 obj-$(CONFIG_MACH_APE6EVM)      += board-ape6evm.o
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 93533e2710a8..4da3da7be3fa 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -383,6 +383,8 @@ static struct platform_device sh_eth_device = {
         .id = -1,
         .dev = {
                 .platform_data = &sh_eth_platdata,
+                .dma_mask = &sh_eth_device.dev.coherent_dma_mask,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
         .resource = sh_eth_resources,
         .num_resources = ARRAY_SIZE(sh_eth_resources),
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 684a529e400d..aaed215e96b9 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -1,9 +1,9 @@
 /*
  * Bock-W board support
  *
- * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013-2014  Renesas Solutions Corp.
  * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- * Copyright (C) 2013  Cogent Embedded, Inc.
+ * Copyright (C) 2013-2014  Cogent Embedded, Inc.
  *
  * 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
@@ -235,6 +235,17 @@ static struct sh_eth_plat_data ether_platform_data __initdata = {
         .no_ether_link  = 1,
 };
 
+static struct platform_device_info ether_info __initdata = {
+        .parent         = &platform_bus,
+        .name           = "r8a777x-ether",
+        .id             = -1,
+        .res            = ether_resources,
+        .num_res        = ARRAY_SIZE(ether_resources),
+        .data           = &ether_platform_data,
+        .size_data      = sizeof(ether_platform_data),
+        .dma_mask       = DMA_BIT_MASK(32),
+};
+
 /* I2C */
 static struct i2c_board_info i2c0_devices[] = {
         {
@@ -592,11 +603,7 @@ static void __init bockw_init(void)
         r8a7778_init_irq_extpin(1);
         r8a7778_add_standard_devices();
 
-        platform_device_register_resndata(&platform_bus, "r8a777x-ether", -1,
-                                          ether_resources,
-                                          ARRAY_SIZE(ether_resources),
-                                          &ether_platform_data,
-                                          sizeof(ether_platform_data));
+        platform_device_register_full(&ether_info);
 
         platform_device_register_full(&vin0_info);
         /* VIN1 has a pin conflict with Ether */
diff --git a/arch/arm/mach-shmobile/board-genmai.c b/arch/arm/mach-shmobile/board-genmai.c
index e240980cc227..6c328d63b819 100644
--- a/arch/arm/mach-shmobile/board-genmai.c
+++ b/arch/arm/mach-shmobile/board-genmai.c
@@ -1,8 +1,9 @@
 /*
  * Genmai board support
  *
- * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013-2014  Renesas Solutions Corp.
  * Copyright (C) 2013  Magnus Damm
+ * Copyright (C) 2014  Cogent Embedded, Inc.
  *
  * 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
@@ -43,6 +44,17 @@ static const struct resource ether_resources[] __initconst = {
         DEFINE_RES_IRQ(gic_iid(359)),
 };
 
+static const struct platform_device_info ether_info __initconst = {
+        .parent         = &platform_bus,
+        .name           = "r7s72100-ether",
+        .id             = -1,
+        .res            = ether_resources,
+        .num_res        = ARRAY_SIZE(ether_resources),
+        .data           = &ether_pdata,
+        .size_data      = sizeof(ether_pdata),
+        .dma_mask       = DMA_BIT_MASK(32),
+};
+
 /* RSPI */
 #define RSPI_RESOURCE(idx, baseaddr, irq)                               \
 static const struct resource rspi##idx##_resources[] __initconst = {    \
@@ -82,10 +94,7 @@ static void __init genmai_add_standard_devices(void)
         r7s72100_clock_init();
         r7s72100_add_dt_devices();
 
-        platform_device_register_resndata(&platform_bus, "r7s72100-ether", -1,
-                                          ether_resources,
-                                          ARRAY_SIZE(ether_resources),
-                                          &ether_pdata, sizeof(ether_pdata));
+        platform_device_register_full(&ether_info);
 
         r7s72100_register_rspi(0);
         r7s72100_register_rspi(1);
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index feb8d97ea2f7..a3fd30242bd8 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -21,46 +21,114 @@
 
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/dma-mapping.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
+#include <linux/platform_data/rcar-du.h>
 #include <mach/common.h>
+#include <mach/irqs.h>
 #include <mach/rcar-gen2.h>
 #include <mach/r8a7791.h>
 #include <asm/mach/arch.h>
 
+/* DU */
+static struct rcar_du_encoder_data koelsch_du_encoders[] = {
+        {
+                .type = RCAR_DU_ENCODER_NONE,
+                .output = RCAR_DU_OUTPUT_LVDS0,
+                .connector.lvds.panel = {
+                        .width_mm = 210,
+                        .height_mm = 158,
+                        .mode = {
+                                .clock = 65000,
+                                .hdisplay = 1024,
+                                .hsync_start = 1048,
+                                .hsync_end = 1184,
+                                .htotal = 1344,
+                                .vdisplay = 768,
+                                .vsync_start = 771,
+                                .vsync_end = 777,
+                                .vtotal = 806,
+                                .flags = 0,
+                        },
+                },
+        },
+};
+
+static struct rcar_du_platform_data koelsch_du_pdata = {
+        .encoders = koelsch_du_encoders,
+        .num_encoders = ARRAY_SIZE(koelsch_du_encoders),
+};
+
+static const struct resource du_resources[] __initconst = {
+        DEFINE_RES_MEM(0xfeb00000, 0x40000),
+        DEFINE_RES_MEM_NAMED(0xfeb90000, 0x1c, "lvds.0"),
+        DEFINE_RES_IRQ(gic_spi(256)),
+        DEFINE_RES_IRQ(gic_spi(268)),
+};
+
+static void __init koelsch_add_du_device(void)
+{
+        struct platform_device_info info = {
+                .name = "rcar-du-r8a7791",
+                .id = -1,
+                .res = du_resources,
+                .num_res = ARRAY_SIZE(du_resources),
+                .data = &koelsch_du_pdata,
+                .size_data = sizeof(koelsch_du_pdata),
+                .dma_mask = DMA_BIT_MASK(32),
+        };
+
+        platform_device_register_full(&info);
+}
+
 static void __init koelsch_add_standard_devices(void)
 {
-#ifdef CONFIG_COMMON_CLK
         /*
-         * This is a really crude hack to provide clkdev support to the SCIF
-         * and CMT devices until they get moved to DT.
+         * This is a really crude hack to provide clkdev support to the CMT and
+         * DU devices until they get moved to DT.
          */
-        static const char * const scif_names[] = {
-                "scifa0", "scifa1", "scifb0", "scifb1", "scifb2", "scifa2",
-                "scif0", "scif1", "scif2", "scif3", "scif4", "scif5", "scifa3",
-                "scifa4", "scifa5",
+        static const struct clk_name {
+                const char *clk;
+                const char *con_id;
+                const char *dev_id;
+        } clk_names[] = {
+                { "cmt0", NULL, "sh_cmt.0" },
+                { "scifa0", NULL, "sh-sci.0" },
+                { "scifa1", NULL, "sh-sci.1" },
+                { "scifb0", NULL, "sh-sci.2" },
+                { "scifb1", NULL, "sh-sci.3" },
+                { "scifb2", NULL, "sh-sci.4" },
+                { "scifa2", NULL, "sh-sci.5" },
+                { "scif0", NULL, "sh-sci.6" },
+                { "scif1", NULL, "sh-sci.7" },
+                { "scif2", NULL, "sh-sci.8" },
+                { "scif3", NULL, "sh-sci.9" },
+                { "scif4", NULL, "sh-sci.10" },
+                { "scif5", NULL, "sh-sci.11" },
+                { "scifa3", NULL, "sh-sci.12" },
+                { "scifa4", NULL, "sh-sci.13" },
+                { "scifa5", NULL, "sh-sci.14" },
+                { "du0", "du.0", "rcar-du-r8a7791" },
+                { "du1", "du.1", "rcar-du-r8a7791" },
+                { "lvds0", "lvds.0", "rcar-du-r8a7791" },
         };
         struct clk *clk;
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(scif_names); ++i) {
-                clk = clk_get(NULL, scif_names[i]);
+        for (i = 0; i < ARRAY_SIZE(clk_names); ++i) {
+                clk = clk_get(NULL, clk_names[i].clk);
                 if (!IS_ERR(clk)) {
-                        clk_register_clkdev(clk, NULL, "sh-sci.%u", i);
+                        clk_register_clkdev(clk, clk_names[i].con_id,
+                                            clk_names[i].dev_id);
                         clk_put(clk);
                 }
         }
 
-        clk = clk_get(NULL, "cmt0");
-        if (!IS_ERR(clk)) {
-                clk_register_clkdev(clk, NULL, "sh_cmt.0");
-                clk_put(clk);
-        }
-#else
-        r8a7791_clock_init();
-#endif
         r8a7791_add_dt_devices();
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+
+        koelsch_add_du_device();
 }
 
 static const char * const koelsch_boards_compat_dt[] __initconst = {
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
index d42637db596a..5a034ff405d0 100644
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ b/arch/arm/mach-shmobile/board-koelsch.c
@@ -2,8 +2,9 @@
  * Koelsch board support
  *
  * Copyright (C) 2013  Renesas Electronics Corporation
- * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013-2014  Renesas Solutions Corp.
  * Copyright (C) 2013  Magnus Damm
+ * Copyright (C) 2014  Cogent Embedded, Inc.
  *
  * 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
@@ -26,6 +27,9 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/leds.h>
+#include <linux/mfd/tmio.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/phy.h>
@@ -33,6 +37,10 @@
 #include <linux/platform_data/gpio-rcar.h>
 #include <linux/platform_data/rcar-du.h>
 #include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/gpio-regulator.h>
+#include <linux/regulator/machine.h>
 #include <linux/sh_eth.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/rspi.h>
@@ -109,6 +117,17 @@ static const struct resource ether_resources[] __initconst = {
         DEFINE_RES_IRQ(gic_spi(162)),
 };
 
+static const struct platform_device_info ether_info __initconst = {
+        .parent         = &platform_bus,
+        .name           = "r8a7791-ether",
+        .id             = -1,
+        .res            = ether_resources,
+        .num_res        = ARRAY_SIZE(ether_resources),
+        .data           = &ether_pdata,
+        .size_data      = sizeof(ether_pdata),
+        .dma_mask       = DMA_BIT_MASK(32),
+};
+
 /* LEDS */
 static struct gpio_led koelsch_leds[] = {
         {
@@ -251,6 +270,103 @@ static void __init koelsch_add_i2c(unsigned idx)
                                         i2c_resources + res_idx, 2);
 }
 
+#define SDHI_REGULATOR(idx, vdd_pin, vccq_pin)                          \
+static struct regulator_consumer_supply vcc_sdhi##idx##_consumer =      \
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi." #idx);               \
+                                                                        \
+static struct regulator_init_data vcc_sdhi##idx##_init_data = {         \
+        .constraints = {                                                \
+                .valid_ops_mask = REGULATOR_CHANGE_STATUS,              \
+        },                                                              \
+        .consumer_supplies      = &vcc_sdhi##idx##_consumer,            \
+        .num_consumer_supplies  = 1,                                    \
+};                                                                      \
+                                                                        \
+static const struct fixed_voltage_config vcc_sdhi##idx##_info __initconst = {\
+        .supply_name    = "SDHI" #idx "Vcc",                            \
+        .microvolts     = 3300000,                                      \
+        .gpio           = vdd_pin,                                      \
+        .enable_high    = 1,                                            \
+        .init_data      = &vcc_sdhi##idx##_init_data,                   \
+};                                                                      \
+                                                                        \
+static struct regulator_consumer_supply vccq_sdhi##idx##_consumer =     \
+        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi." #idx);              \
+                                                                        \
+static struct regulator_init_data vccq_sdhi##idx##_init_data = {        \
+        .constraints = {                                                \
+                .input_uV       = 3300000,                              \
+                .min_uV         = 1800000,                              \
+                .max_uV         = 3300000,                              \
+                .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE |            \
+                                  REGULATOR_CHANGE_STATUS,              \
+        },                                                              \
+        .consumer_supplies      = &vccq_sdhi##idx##_consumer,           \
+        .num_consumer_supplies  = 1,                                    \
+};                                                                      \
+                                                                        \
+static struct gpio vccq_sdhi##idx##_gpio =                              \
+        { vccq_pin, GPIOF_OUT_INIT_HIGH, "vccq-sdhi" #idx };            \
+                                                                        \
+static struct gpio_regulator_state vccq_sdhi##idx##_states[] = {        \
+        { .value = 1800000, .gpios = 0 },                               \
+        { .value = 3300000, .gpios = 1 },                               \
+};                                                                      \
+                                                                        \
+static const struct gpio_regulator_config vccq_sdhi##idx##_info __initconst = {\
+        .supply_name    = "vqmmc",                                      \
+        .gpios          = &vccq_sdhi##idx##_gpio,                       \
+        .nr_gpios       = 1,                                            \
+        .states         = vccq_sdhi##idx##_states,                      \
+        .nr_states      = ARRAY_SIZE(vccq_sdhi##idx##_states),          \
+        .type           = REGULATOR_VOLTAGE,                            \
+        .init_data      = &vccq_sdhi##idx##_init_data,                  \
+};
+
+SDHI_REGULATOR(0, RCAR_GP_PIN(7, 17), RCAR_GP_PIN(2, 12));
+SDHI_REGULATOR(1, RCAR_GP_PIN(7, 18), RCAR_GP_PIN(2, 13));
+SDHI_REGULATOR(2, RCAR_GP_PIN(7, 19), RCAR_GP_PIN(2, 26));
+
+/* SDHI0 */
+static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+                          MMC_CAP_POWER_OFF_CARD,
+        .tmio_caps2     = MMC_CAP2_NO_MULTI_READ,
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
+};
+
+static struct resource sdhi0_resources[] __initdata = {
+        DEFINE_RES_MEM(0xee100000, 0x200),
+        DEFINE_RES_IRQ(gic_spi(165)),
+};
+
+/* SDHI1 */
+static struct sh_mobile_sdhi_info sdhi1_info __initdata = {
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+                          MMC_CAP_POWER_OFF_CARD,
+        .tmio_caps2     = MMC_CAP2_NO_MULTI_READ,
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
+};
+
+static struct resource sdhi1_resources[] __initdata = {
+        DEFINE_RES_MEM(0xee140000, 0x100),
+        DEFINE_RES_IRQ(gic_spi(167)),
+};
+
+/* SDHI2 */
+static struct sh_mobile_sdhi_info sdhi2_info __initdata = {
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+                          MMC_CAP_POWER_OFF_CARD,
+        .tmio_caps2     = MMC_CAP2_NO_MULTI_READ,
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT |
+                          TMIO_MMC_WRPROTECT_DISABLE,
+};
+
+static struct resource sdhi2_resources[] __initdata = {
+        DEFINE_RES_MEM(0xee160000, 0x100),
+        DEFINE_RES_IRQ(gic_spi(168)),
+};
+
 static const struct pinctrl_map koelsch_pinctrl_map[] = {
         /* DU */
         PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
@@ -288,6 +404,31 @@ static const struct pinctrl_map koelsch_pinctrl_map[] = {
         /* I2C4 */
         PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.4", "pfc-r8a7791",
                                   "i2c4_c", "i2c4"),
+        /* SDHI0 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7791",
+                                  "sdhi0_data4", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7791",
+                                  "sdhi0_ctrl", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7791",
+                                  "sdhi0_cd", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7791",
+                                  "sdhi0_wp", "sdhi0"),
+        /* SDHI2 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a7791",
+                                  "sdhi1_data4", "sdhi1"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a7791",
+                                  "sdhi1_ctrl", "sdhi1"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a7791",
+                                  "sdhi1_cd", "sdhi1"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a7791",
+                                  "sdhi1_wp", "sdhi1"),
+        /* SDHI2 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7791",
+                                  "sdhi2_data4", "sdhi2"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7791",
+                                  "sdhi2_ctrl", "sdhi2"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7791",
+                                  "sdhi2_cd", "sdhi2"),
 };
 
 static void __init koelsch_add_standard_devices(void)
@@ -297,10 +438,7 @@ static void __init koelsch_add_standard_devices(void)
                                   ARRAY_SIZE(koelsch_pinctrl_map));
         r8a7791_pinmux_init();
         r8a7791_add_standard_devices();
-        platform_device_register_resndata(&platform_bus, "r8a7791-ether", -1,
-                                          ether_resources,
-                                          ARRAY_SIZE(ether_resources),
-                                          &ether_pdata, sizeof(ether_pdata));
+        platform_device_register_full(&ether_info);
         platform_device_register_data(&platform_bus, "leds-gpio", -1,
                                       &koelsch_leds_pdata,
                                       sizeof(koelsch_leds_pdata));
@@ -321,6 +459,32 @@ static void __init koelsch_add_standard_devices(void)
         koelsch_add_i2c(2);
         koelsch_add_i2c(4);
         koelsch_add_i2c(5);
+
+        platform_device_register_data(&platform_bus, "reg-fixed-voltage", 0,
+                                      &vcc_sdhi0_info, sizeof(struct fixed_voltage_config));
+        platform_device_register_data(&platform_bus, "reg-fixed-voltage", 1,
+                                      &vcc_sdhi1_info, sizeof(struct fixed_voltage_config));
+        platform_device_register_data(&platform_bus, "reg-fixed-voltage", 2,
+                                      &vcc_sdhi2_info, sizeof(struct fixed_voltage_config));
+        platform_device_register_data(&platform_bus, "gpio-regulator", 0,
+                                      &vccq_sdhi0_info, sizeof(struct gpio_regulator_config));
+        platform_device_register_data(&platform_bus, "gpio-regulator", 1,
+                                      &vccq_sdhi1_info, sizeof(struct gpio_regulator_config));
+        platform_device_register_data(&platform_bus, "gpio-regulator", 2,
+                                      &vccq_sdhi2_info, sizeof(struct gpio_regulator_config));
+
+        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0,
+                                          sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
+                                          &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
+
+        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 1,
+                                          sdhi1_resources, ARRAY_SIZE(sdhi1_resources),
+                                          &sdhi1_info, sizeof(struct sh_mobile_sdhi_info));
+
+        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 2,
+                                          sdhi2_resources, ARRAY_SIZE(sdhi2_resources),
+                                          &sdhi2_info, sizeof(struct sh_mobile_sdhi_info));
+
 }
 
 /*
diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
deleted file mode 100644
index 853003c8988a..000000000000
--- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * kzm9d board support - Reference DT implementation
- *
- * 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/init.h>
-#include <linux/of_platform.h>
-#include <linux/clk-provider.h>
-#include <mach/emev2.h>
-#include <mach/common.h>
-#include <asm/mach/arch.h>
-
-static void __init kzm9d_add_standard_devices(void)
-{
-        of_clk_init(NULL);
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
-static const char *kzm9d_boards_compat_dt[] __initdata = {
-        "renesas,kzm9d",
-        "renesas,kzm9d-reference",
-        NULL,
-};
-
-DT_MACHINE_START(KZM9D_DT, "kzm9d")
-        .smp            = smp_ops(emev2_smp_ops),
-        .map_io         = emev2_map_io,
-        .init_early     = emev2_init_delay,
-        .init_machine   = kzm9d_add_standard_devices,
-        .init_late      = shmobile_init_late,
-        .dt_compat      = kzm9d_boards_compat_dt,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index dc8d76b9a9f1..440aac36d693 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -20,47 +20,116 @@
 
 #include <linux/clk.h>
 #include <linux/clkdev.h>
+#include <linux/dma-mapping.h>
 #include <linux/init.h>
 #include <linux/of_platform.h>
+#include <linux/platform_data/rcar-du.h>
 #include <mach/common.h>
+#include <mach/irqs.h>
 #include <mach/rcar-gen2.h>
 #include <mach/r8a7790.h>
 #include <asm/mach/arch.h>
 
+/* DU */
+static struct rcar_du_encoder_data lager_du_encoders[] = {
+        {
+                .type = RCAR_DU_ENCODER_VGA,
+                .output = RCAR_DU_OUTPUT_DPAD0,
+        }, {
+                .type = RCAR_DU_ENCODER_NONE,
+                .output = RCAR_DU_OUTPUT_LVDS1,
+                .connector.lvds.panel = {
+                        .width_mm = 210,
+                        .height_mm = 158,
+                        .mode = {
+                                .clock = 65000,
+                                .hdisplay = 1024,
+                                .hsync_start = 1048,
+                                .hsync_end = 1184,
+                                .htotal = 1344,
+                                .vdisplay = 768,
+                                .vsync_start = 771,
+                                .vsync_end = 777,
+                                .vtotal = 806,
+                                .flags = 0,
+                        },
+                },
+        },
+};
+
+static struct rcar_du_platform_data lager_du_pdata = {
+        .encoders = lager_du_encoders,
+        .num_encoders = ARRAY_SIZE(lager_du_encoders),
+};
+
+static const struct resource du_resources[] __initconst = {
+        DEFINE_RES_MEM(0xfeb00000, 0x70000),
+        DEFINE_RES_MEM_NAMED(0xfeb90000, 0x1c, "lvds.0"),
+        DEFINE_RES_MEM_NAMED(0xfeb94000, 0x1c, "lvds.1"),
+        DEFINE_RES_IRQ(gic_spi(256)),
+        DEFINE_RES_IRQ(gic_spi(268)),
+        DEFINE_RES_IRQ(gic_spi(269)),
+};
+
+static void __init lager_add_du_device(void)
+{
+        struct platform_device_info info = {
+                .name = "rcar-du-r8a7790",
+                .id = -1,
+                .res = du_resources,
+                .num_res = ARRAY_SIZE(du_resources),
+                .data = &lager_du_pdata,
+                .size_data = sizeof(lager_du_pdata),
+                .dma_mask = DMA_BIT_MASK(32),
+        };
+
+        platform_device_register_full(&info);
+}
+
 static void __init lager_add_standard_devices(void)
 {
-#ifdef CONFIG_COMMON_CLK
         /*
-         * This is a really crude hack to provide clkdev support to the SCIF
-         * and CMT devices until they get moved to DT.
+         * This is a really crude hack to provide clkdev support to platform
+         * devices until they get moved to DT.
          */
-        static const char * const scif_names[] = {
-                "scifa0", "scifa1", "scifb0", "scifb1",
-                "scifb2", "scifa2", "scif0", "scif1",
-                "hscif0", "hscif1",
+        static const struct clk_name {
+                const char *clk;
+                const char *con_id;
+                const char *dev_id;
+        } clk_names[] = {
+                { "cmt0", NULL, "sh_cmt.0" },
+                { "scifa0", NULL, "sh-sci.0" },
+                { "scifa1", NULL, "sh-sci.1" },
+                { "scifb0", NULL, "sh-sci.2" },
+                { "scifb1", NULL, "sh-sci.3" },
+                { "scifb2", NULL, "sh-sci.4" },
+                { "scifa2", NULL, "sh-sci.5" },
+                { "scif0", NULL, "sh-sci.6" },
+                { "scif1", NULL, "sh-sci.7" },
+                { "hscif0", NULL, "sh-sci.8" },
+                { "hscif1", NULL, "sh-sci.9" },
+                { "du0", "du.0", "rcar-du-r8a7790" },
+                { "du1", "du.1", "rcar-du-r8a7790" },
+                { "du2", "du.2", "rcar-du-r8a7790" },
+                { "lvds0", "lvds.0", "rcar-du-r8a7790" },
+                { "lvds1", "lvds.1", "rcar-du-r8a7790" },
         };
         struct clk *clk;
         unsigned int i;
 
-        for (i = 0; i < ARRAY_SIZE(scif_names); ++i) {
-                clk = clk_get(NULL, scif_names[i]);
+        for (i = 0; i < ARRAY_SIZE(clk_names); ++i) {
+                clk = clk_get(NULL, clk_names[i].clk);
                 if (!IS_ERR(clk)) {
-                        clk_register_clkdev(clk, NULL, "sh-sci.%u", i);
+                        clk_register_clkdev(clk, clk_names[i].con_id,
+                                            clk_names[i].dev_id);
                         clk_put(clk);
                 }
         }
 
-        clk = clk_get(NULL, "cmt0");
-        if (!IS_ERR(clk)) {
-                clk_register_clkdev(clk, NULL, "sh_cmt.0");
-                clk_put(clk);
-        }
-#else
-        r8a7790_clock_init();
-#endif
-
         r8a7790_add_dt_devices();
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+
+        lager_add_du_device();
 }
 
 static const char *lager_boards_compat_dt[] __initdata = {
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 317574864e7b..f0104bfe544e 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -1,8 +1,9 @@
 /*
  * Lager board support
  *
- * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013-2014  Renesas Solutions Corp.
  * Copyright (C) 2013  Magnus Damm
+ * Copyright (C) 2014  Cogent Embedded, Inc.
  *
  * 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
@@ -26,8 +27,10 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/leds.h>
+#include <linux/mfd/tmio.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_data/camera-rcar.h>
 #include <linux/platform_data/gpio-rcar.h>
@@ -68,6 +71,19 @@
  * # amixer set "LINEOUT Mixer DACL" on
  */
 
+/*
+ * SDHI0 (CN8)
+ *
+ * JP3:  pin1
+ * SW20: pin1
+
+ * GP5_24:      1:  VDD  3.3V (defult)
+ *              0:  VDD  0.0V
+ * GP5_29:      1:  VccQ 3.3V (defult)
+ *              0:  VccQ 1.8V
+ *
+ */
+
 /* DU */
 static struct rcar_du_encoder_data lager_du_encoders[] = {
         {
@@ -260,6 +276,17 @@ static const struct resource ether_resources[] __initconst = {
         DEFINE_RES_IRQ(gic_spi(162)),
 };
 
+static const struct platform_device_info ether_info __initconst = {
+        .parent         = &platform_bus,
+        .name           = "r8a7790-ether",
+        .id             = -1,
+        .res            = ether_resources,
+        .num_res        = ARRAY_SIZE(ether_resources),
+        .data           = &ether_pdata,
+        .size_data      = sizeof(ether_pdata),
+        .dma_mask       = DMA_BIT_MASK(32),
+};
+
 /* SPI Flash memory (Spansion S25FL512SAGMFIG11 64Mb) */
 static struct mtd_partition spi_flash_part[] = {
         /* Reserved for user loader program, read-only */
@@ -595,6 +622,76 @@ static void __init lager_add_rsnd_device(void)
         platform_device_register_full(&cardinfo);
 }
 
+/* SDHI0 */
+static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+                          MMC_CAP_POWER_OFF_CARD,
+        .tmio_caps2     = MMC_CAP2_NO_MULTI_READ,
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT |
+                          TMIO_MMC_WRPROTECT_DISABLE,
+};
+
+static struct resource sdhi0_resources[] __initdata = {
+        DEFINE_RES_MEM(0xee100000, 0x200),
+        DEFINE_RES_IRQ(gic_spi(165)),
+};
+
+/* SDHI2 */
+static struct sh_mobile_sdhi_info sdhi2_info __initdata = {
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+                          MMC_CAP_POWER_OFF_CARD,
+        .tmio_caps2     = MMC_CAP2_NO_MULTI_READ,
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT |
+                          TMIO_MMC_WRPROTECT_DISABLE,
+};
+
+static struct resource sdhi2_resources[] __initdata = {
+        DEFINE_RES_MEM(0xee140000, 0x100),
+        DEFINE_RES_IRQ(gic_spi(167)),
+};
+
+/* Internal PCI1 */
+static const struct resource pci1_resources[] __initconst = {
+        DEFINE_RES_MEM(0xee0b0000, 0x10000),    /* CFG */
+        DEFINE_RES_MEM(0xee0a0000, 0x10000),    /* MEM */
+        DEFINE_RES_IRQ(gic_spi(112)),
+};
+
+static const struct platform_device_info pci1_info __initconst = {
+        .parent         = &platform_bus,
+        .name           = "pci-rcar-gen2",
+        .id             = 1,
+        .res            = pci1_resources,
+        .num_res        = ARRAY_SIZE(pci1_resources),
+        .dma_mask       = DMA_BIT_MASK(32),
+};
+
+static void __init lager_add_usb1_device(void)
+{
+        platform_device_register_full(&pci1_info);
+}
+
+/* Internal PCI2 */
+static const struct resource pci2_resources[] __initconst = {
+        DEFINE_RES_MEM(0xee0d0000, 0x10000),    /* CFG */
+        DEFINE_RES_MEM(0xee0c0000, 0x10000),    /* MEM */
+        DEFINE_RES_IRQ(gic_spi(113)),
+};
+
+static const struct platform_device_info pci2_info __initconst = {
+        .parent         = &platform_bus,
+        .name           = "pci-rcar-gen2",
+        .id             = 2,
+        .res            = pci2_resources,
+        .num_res        = ARRAY_SIZE(pci2_resources),
+        .dma_mask       = DMA_BIT_MASK(32),
+};
+
+static void __init lager_add_usb2_device(void)
+{
+        platform_device_register_full(&pci2_info);
+}
+
 static const struct pinctrl_map lager_pinctrl_map[] = {
         /* DU (CN10: ARGB0, CN13: LVDS) */
         PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",
@@ -606,12 +703,31 @@ static const struct pinctrl_map lager_pinctrl_map[] = {
         /* I2C2 */
         PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar.2", "pfc-r8a7790",
                                   "i2c2", "i2c2"),
+        /* QSPI */
+        PIN_MAP_MUX_GROUP_DEFAULT("qspi.0", "pfc-r8a7790",
+                                  "qspi_ctrl", "qspi"),
+        PIN_MAP_MUX_GROUP_DEFAULT("qspi.0", "pfc-r8a7790",
+                                  "qspi_data4", "qspi"),
         /* SCIF0 (CN19: DEBUG SERIAL0) */
         PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7790",
                                   "scif0_data", "scif0"),
         /* SCIF1 (CN20: DEBUG SERIAL1) */
         PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7790",
                                   "scif1_data", "scif1"),
+        /* SDHI0 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7790",
+                                  "sdhi0_data4", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7790",
+                                  "sdhi0_ctrl", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7790",
+                                  "sdhi0_cd", "sdhi0"),
+        /* SDHI2 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7790",
+                                  "sdhi2_data4", "sdhi2"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7790",
+                                  "sdhi2_ctrl", "sdhi2"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7790",
+                                  "sdhi2_cd", "sdhi2"),
         /* SSI (CN17: sound) */
         PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7790",
                                   "ssi0129_ctrl", "ssi"),
@@ -654,6 +770,12 @@ static const struct pinctrl_map lager_pinctrl_map[] = {
         /* USB0 */
         PIN_MAP_MUX_GROUP_DEFAULT("renesas_usbhs", "pfc-r8a7790",
                                   "usb0_ovc_vbus", "usb0"),
+        /* USB1 */
+        PIN_MAP_MUX_GROUP_DEFAULT("pci-rcar-gen2.1", "pfc-r8a7790",
+                                  "usb1", "usb1"),
+        /* USB2 */
+        PIN_MAP_MUX_GROUP_DEFAULT("pci-rcar-gen2.2", "pfc-r8a7790",
+                                  "usb2", "usb2"),
 };
 
 static void __init lager_add_standard_devices(void)
@@ -681,10 +803,7 @@ static void __init lager_add_standard_devices(void)
                                           mmcif1_resources, ARRAY_SIZE(mmcif1_resources),
                                           &mmcif1_pdata, sizeof(mmcif1_pdata));
 
-        platform_device_register_resndata(&platform_bus, "r8a7790-ether", -1,
-                                          ether_resources,
-                                          ARRAY_SIZE(ether_resources),
-                                          &ether_pdata, sizeof(ether_pdata));
+        platform_device_register_full(&ether_info);
 
         lager_add_du_device();
 
@@ -714,8 +833,17 @@ static void __init lager_add_standard_devices(void)
                                           &usbhs_phy_pdata,
                                           sizeof(usbhs_phy_pdata));
         lager_register_usbhs();
+        lager_add_usb1_device();
+        lager_add_usb2_device();
 
         lager_add_rsnd_device();
+
+        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0,
+                                          sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
+                                          &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
+        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 2,
+                                          sdhi2_resources, ARRAY_SIZE(sdhi2_resources),
+                                          &sdhi2_info, sizeof(struct sh_mobile_sdhi_info));
 }
 
 /*