ARM: shmobile: koelsch: Remove legacy C board code
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Wed, 17 Sep 2014 14:18:27 +0000 (17:18 +0300)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:33:55 +0000 (17:33 +0900)
All features supported by the Koelsch legacy C board code are now
supported by the multiplatform code, it's thus time to say bye to the
legacy code. Nobody should miss it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 7d6a399cf759a3f1d925a85ff37d6a1b6197ec82)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Conflicts:
arch/arm/mach-shmobile/board-koelsch.c

arch/arm/configs/koelsch_defconfig [deleted file]
arch/arm/mach-shmobile/Kconfig
arch/arm/mach-shmobile/Makefile
arch/arm/mach-shmobile/board-koelsch.c [deleted file]

diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig
deleted file mode 100644 (file)
index b33d19b..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-CONFIG_SYSVIPC=y
-CONFIG_NO_HZ=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_EMBEDDED=y
-CONFIG_PERF_EVENTS=y
-CONFIG_SLAB=y
-CONFIG_ARCH_SHMOBILE_LEGACY=y
-CONFIG_ARCH_R8A7791=y
-CONFIG_MACH_KOELSCH=y
-# CONFIG_SWP_EMULATE is not set
-CONFIG_CPU_BPREDICT_DISABLE=y
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_ARM_ERRATA_754322=y
-CONFIG_PCI=y
-CONFIG_PCI_RCAR_GEN2=y
-CONFIG_PCI_RCAR_GEN2_PCIE=y
-CONFIG_SMP=y
-CONFIG_SCHED_MC=y
-CONFIG_NR_CPUS=8
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_ARM_APPENDED_DTB=y
-CONFIG_KEXEC=y
-CONFIG_AUTO_ZRELADDR=y
-CONFIG_VFP=y
-CONFIG_NEON=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_DEVTMPFS=y
-CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_SD=y
-CONFIG_ATA=y
-CONFIG_SATA_RCAR=y
-CONFIG_MTD=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_SPI_NOR=y
-CONFIG_EEPROM_AT24=y
-CONFIG_NETDEVICES=y
-# CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_CADENCE is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CIRRUS is not set
-# CONFIG_NET_VENDOR_FARADAY is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-CONFIG_SH_ETH=y
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_VIA is not set
-# CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_KEYBOARD_GPIO=y
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=20
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-CONFIG_I2C=y
-CONFIG_I2C_MUX=y
-CONFIG_I2C_SH_MOBILE=y
-CONFIG_I2C_RCAR=y
-CONFIG_SPI=y
-CONFIG_SPI_RSPI=y
-CONFIG_SPI_SH_MSIOF=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIO_RCAR=y
-# CONFIG_HWMON is not set
-CONFIG_THERMAL=y
-CONFIG_RCAR_THERMAL=y
-CONFIG_REGULATOR=y
-CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_DA9210=y
-CONFIG_REGULATOR_GPIO=y
-CONFIG_MEDIA_SUPPORT=y
-CONFIG_MEDIA_CAMERA_SUPPORT=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
-CONFIG_SOC_CAMERA=y
-CONFIG_SOC_CAMERA_PLATFORM=y
-CONFIG_VIDEO_RCAR_VIN=y
-# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
-CONFIG_VIDEO_ADV7180=y
-# CONFIG_HID is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_MMC=y
-CONFIG_MMC_SDHI=y
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=y
-CONFIG_LEDS_GPIO=y
-# CONFIG_IOMMU_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-CONFIG_TMPFS=y
-CONFIG_CONFIGFS_FS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_NFS_FS=y
-CONFIG_ROOT_NFS=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-# CONFIG_ARM_UNWIND is not set
index 1b7df71..4c95229 100644 (file)
@@ -231,12 +231,6 @@ config MACH_LAGER
        select MICREL_PHY if SH_ETH
        select SND_SOC_AK4642 if SND_SIMPLE_CARD
 
-config MACH_KOELSCH
-       bool "Koelsch board"
-       depends on ARCH_R8A7791
-       select USE_OF
-       select MICREL_PHY if SH_ETH
-
 config MACH_KZM9G
        bool "KZM-A9-GT board"
        depends on ARCH_SH73A0
index dcb38d5..c49c491 100644 (file)
@@ -69,7 +69,6 @@ obj-$(CONFIG_MACH_BOCKW_REFERENCE)    += board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)      += board-marzen.o
 obj-$(CONFIG_MACH_LAGER)       += board-lager.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA)     += board-armadillo800eva.o
-obj-$(CONFIG_MACH_KOELSCH)     += board-koelsch.o
 obj-$(CONFIG_MACH_KZM9G)       += board-kzm9g.o
 obj-$(CONFIG_MACH_KZM9G_REFERENCE)     += board-kzm9g-reference.o
 endif
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
deleted file mode 100644 (file)
index af97882..0000000
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * Koelsch board support
- *
- * Copyright (C) 2013  Renesas Electronics Corporation
- * 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
- * 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.
- */
-
-#include <linux/dma-mapping.h>
-#include <linux/gpio.h>
-#include <linux/gpio_keys.h>
-#include <linux/input.h>
-#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>
-#include <linux/pinctrl/machine.h>
-#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>
-#include <linux/spi/spi.h>
-
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#include "common.h"
-#include "irqs.h"
-#include "r8a7791.h"
-#include "rcar-gen2.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 = {
-                               .pixelclock = 65000000,
-                               .hactive = 1024,
-                               .hfront_porch = 20,
-                               .hback_porch = 160,
-                               .hsync_len = 136,
-                               .vactive = 768,
-                               .vfront_porch = 3,
-                               .vback_porch = 29,
-                               .vsync_len = 6,
-                       },
-               },
-       },
-};
-
-static const struct rcar_du_platform_data koelsch_du_pdata __initconst = {
-       .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);
-}
-
-/* Ether */
-static const struct sh_eth_plat_data ether_pdata __initconst = {
-       .phy                    = 0x1,
-       .phy_irq                = irq_pin(0),
-       .edmac_endian           = EDMAC_LITTLE_ENDIAN,
-       .phy_interface          = PHY_INTERFACE_MODE_RMII,
-       .ether_link_active_low  = 1,
-};
-
-static const struct resource ether_resources[] __initconst = {
-       DEFINE_RES_MEM(0xee700000, 0x400),
-       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[] = {
-       {
-               .name           = "led8",
-               .gpio           = RCAR_GP_PIN(2, 21),
-               .default_state  = LEDS_GPIO_DEFSTATE_ON,
-       }, {
-               .name           = "led7",
-               .gpio           = RCAR_GP_PIN(2, 20),
-               .default_state  = LEDS_GPIO_DEFSTATE_ON,
-       }, {
-               .name           = "led6",
-               .gpio           = RCAR_GP_PIN(2, 19),
-               .default_state  = LEDS_GPIO_DEFSTATE_ON,
-       },
-};
-
-static const struct gpio_led_platform_data koelsch_leds_pdata __initconst = {
-       .leds           = koelsch_leds,
-       .num_leds       = ARRAY_SIZE(koelsch_leds),
-};
-
-/* GPIO KEY */
-#define GPIO_KEY(c, g, d, ...) \
-       { .code = c, .gpio = g, .desc = d, .active_low = 1, \
-         .wakeup = 1, .debounce_interval = 20 }
-
-static struct gpio_keys_button gpio_buttons[] = {
-       GPIO_KEY(KEY_4,         RCAR_GP_PIN(5, 3),      "SW2-pin4"),
-       GPIO_KEY(KEY_3,         RCAR_GP_PIN(5, 2),      "SW2-pin3"),
-       GPIO_KEY(KEY_2,         RCAR_GP_PIN(5, 1),      "SW2-pin2"),
-       GPIO_KEY(KEY_1,         RCAR_GP_PIN(5, 0),      "SW2-pin1"),
-       GPIO_KEY(KEY_G,         RCAR_GP_PIN(7, 6),      "SW36"),
-       GPIO_KEY(KEY_F,         RCAR_GP_PIN(7, 5),      "SW35"),
-       GPIO_KEY(KEY_E,         RCAR_GP_PIN(7, 4),      "SW34"),
-       GPIO_KEY(KEY_D,         RCAR_GP_PIN(7, 3),      "SW33"),
-       GPIO_KEY(KEY_C,         RCAR_GP_PIN(7, 2),      "SW32"),
-       GPIO_KEY(KEY_B,         RCAR_GP_PIN(7, 1),      "SW31"),
-       GPIO_KEY(KEY_A,         RCAR_GP_PIN(7, 0),      "SW30"),
-};
-
-static const struct gpio_keys_platform_data koelsch_keys_pdata __initconst = {
-       .buttons        = gpio_buttons,
-       .nbuttons       = ARRAY_SIZE(gpio_buttons),
-};
-
-/* QSPI */
-static const struct resource qspi_resources[] __initconst = {
-       DEFINE_RES_MEM(0xe6b10000, 0x1000),
-       DEFINE_RES_IRQ_NAMED(gic_spi(184), "mux"),
-};
-
-static const struct rspi_plat_data qspi_pdata __initconst = {
-       .num_chipselect = 1,
-};
-
-/* SPI Flash memory (Spansion S25FL512SAGMFIG11 64 MiB) */
-static struct mtd_partition spi_flash_part[] = {
-       {
-               .name           = "loader",
-               .offset         = 0x00000000,
-               .size           = 512 * 1024,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "bootenv",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = 512 * 1024,
-               .mask_flags     = MTD_WRITEABLE,
-       },
-       {
-               .name           = "data",
-               .offset         = MTDPART_OFS_APPEND,
-               .size           = MTDPART_SIZ_FULL,
-       },
-};
-
-static const struct flash_platform_data spi_flash_data = {
-       .name           = "m25p80",
-       .parts          = spi_flash_part,
-       .nr_parts       = ARRAY_SIZE(spi_flash_part),
-       .type           = "s25fl512s",
-};
-
-static const struct spi_board_info spi_info[] __initconst = {
-       {
-               .modalias       = "m25p80",
-               .platform_data  = &spi_flash_data,
-               .mode           = SPI_MODE_0 | SPI_TX_QUAD | SPI_RX_QUAD,
-               .max_speed_hz   = 30000000,
-               .bus_num        = 0,
-               .chip_select    = 0,
-       },
-};
-
-/* SATA0 */
-static const struct resource sata0_resources[] __initconst = {
-       DEFINE_RES_MEM(0xee300000, 0x2000),
-       DEFINE_RES_IRQ(gic_spi(105)),
-};
-
-static const struct platform_device_info sata0_info __initconst = {
-       .parent         = &platform_bus,
-       .name           = "sata-r8a7791",
-       .id             = 0,
-       .res            = sata0_resources,
-       .num_res        = ARRAY_SIZE(sata0_resources),
-       .dma_mask       = DMA_BIT_MASK(32),
-};
-
-/* I2C */
-static const struct resource i2c_resources[] __initconst = {
-       /* I2C0 */
-       DEFINE_RES_MEM(0xE6508000, 0x40),
-       DEFINE_RES_IRQ(gic_spi(287)),
-       /* I2C1 */
-       DEFINE_RES_MEM(0xE6518000, 0x40),
-       DEFINE_RES_IRQ(gic_spi(288)),
-       /* I2C2 */
-       DEFINE_RES_MEM(0xE6530000, 0x40),
-       DEFINE_RES_IRQ(gic_spi(286)),
-       /* I2C3 */
-       DEFINE_RES_MEM(0xE6540000, 0x40),
-       DEFINE_RES_IRQ(gic_spi(290)),
-       /* I2C4 */
-       DEFINE_RES_MEM(0xE6520000, 0x40),
-       DEFINE_RES_IRQ(gic_spi(19)),
-       /* I2C5 */
-       DEFINE_RES_MEM(0xE6528000, 0x40),
-       DEFINE_RES_IRQ(gic_spi(20)),
-};
-
-static void __init koelsch_add_i2c(unsigned idx)
-{
-       unsigned res_idx = idx * 2;
-
-       BUG_ON(res_idx >= ARRAY_SIZE(i2c_resources));
-
-       platform_device_register_simple("i2c-rcar_gen2", 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_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_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_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",
-                                 "du_rgb666", "du"),
-       PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
-                                 "du_sync", "du"),
-       PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7791", "pfc-r8a7791",
-                                 "du_clk_out_0", "du"),
-       /* Ether */
-       PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791",
-                                 "eth_link", "eth"),
-       PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791",
-                                 "eth_mdio", "eth"),
-       PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791",
-                                 "eth_rmii", "eth"),
-       PIN_MAP_MUX_GROUP_DEFAULT("r8a7791-ether", "pfc-r8a7791",
-                                 "intc_irq0", "intc"),
-       /* QSPI */
-       PIN_MAP_MUX_GROUP_DEFAULT("qspi.0", "pfc-r8a7791",
-                                 "qspi_ctrl", "qspi"),
-       PIN_MAP_MUX_GROUP_DEFAULT("qspi.0", "pfc-r8a7791",
-                                 "qspi_data4", "qspi"),
-       /* SCIF0 (CN19: DEBUG SERIAL0) */
-       PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7791",
-                                 "scif0_data_d", "scif0"),
-       /* SCIF1 (CN20: DEBUG SERIAL1) */
-       PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7791",
-                                 "scif1_data_d", "scif1"),
-       /* I2C1 */
-       PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.1", "pfc-r8a7791",
-                                 "i2c1_e", "i2c1"),
-       /* I2C2 */
-       PIN_MAP_MUX_GROUP_DEFAULT("i2c-rcar_gen2.2", "pfc-r8a7791",
-                                 "i2c2", "i2c2"),
-       /* 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)
-{
-       r8a7791_clock_init();
-       pinctrl_register_mappings(koelsch_pinctrl_map,
-                                 ARRAY_SIZE(koelsch_pinctrl_map));
-       r8a7791_pinmux_init();
-       r8a7791_add_standard_devices();
-       platform_device_register_full(&ether_info);
-       platform_device_register_data(&platform_bus, "leds-gpio", -1,
-                                     &koelsch_leds_pdata,
-                                     sizeof(koelsch_leds_pdata));
-       platform_device_register_data(&platform_bus, "gpio-keys", -1,
-                                     &koelsch_keys_pdata,
-                                     sizeof(koelsch_keys_pdata));
-       platform_device_register_resndata(&platform_bus, "qspi", 0,
-                                         qspi_resources,
-                                         ARRAY_SIZE(qspi_resources),
-                                         &qspi_pdata, sizeof(qspi_pdata));
-       spi_register_board_info(spi_info, ARRAY_SIZE(spi_info));
-
-       koelsch_add_du_device();
-
-       platform_device_register_full(&sata0_info);
-
-       koelsch_add_i2c(1);
-       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));
-
-}
-
-/*
- * Ether LEDs on the Koelsch board are named LINK and ACTIVE which corresponds
- * to non-default 01 setting of the Micrel KSZ8041 PHY control register 1 bits
- * 14-15. We have to set them back to 01 from the default 00 value each time
- * the PHY is reset. It's also important because the PHY's LED0 signal is
- * connected to SoC's ETH_LINK signal and in the PHY's default mode it will
- * bounce on and off after each packet, which we apparently want to avoid.
- */
-static int koelsch_ksz8041_fixup(struct phy_device *phydev)
-{
-       u16 phyctrl1 = phy_read(phydev, 0x1e);
-
-       phyctrl1 &= ~0xc000;
-       phyctrl1 |= 0x4000;
-       return phy_write(phydev, 0x1e, phyctrl1);
-}
-
-static void __init koelsch_init(void)
-{
-       koelsch_add_standard_devices();
-
-       irq_set_irq_type(irq_pin(0), IRQ_TYPE_LEVEL_LOW);
-
-       if (IS_ENABLED(CONFIG_PHYLIB))
-               phy_register_fixup_for_id("r8a7791-ether-ff:01",
-                                         koelsch_ksz8041_fixup);
-}
-
-static const char * const koelsch_boards_compat_dt[] __initconst = {
-       "renesas,koelsch",
-       NULL,
-};
-
-DT_MACHINE_START(KOELSCH_DT, "koelsch")
-       .smp            = smp_ops(r8a7791_smp_ops),
-       .init_early     = shmobile_init_delay,
-       .init_time      = rcar_gen2_timer_init,
-       .init_machine   = koelsch_init,
-       .init_late      = shmobile_init_late,
-       .reserve        = rcar_gen2_reserve,
-       .dt_compat      = koelsch_boards_compat_dt,
-MACHINE_END