commit BSP v1.8.0

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>

1 files changed, 1456 insertions, 0 deletions

diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0001-kernel-Silk-board-support.patch b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0001-kernel-Silk-board-support.patch
new file mode 100644
index 0000000..12fb76c
--- /dev/null
+++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0001-kernel-Silk-board-support.patch
@@ -0,0 +1,1456 @@
+From f04a201ce9bfc04ca4b8b017116ca1cf9a313c9a Mon Sep 17 00:00:00 2001
+From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
+Date: Sat, 6 Dec 2014 03:29:15 +0300
+Subject: [linux-kernel][PATCH] arm: rmobile: Add SILK board support
+
+SILK is an entry level development board based on R-Car E2 SoC (R8A7794)
+
+Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
+
+---
+ arch/arm/boot/dts/Makefile                    |   1 +
+ arch/arm/boot/dts/r8a7794-silk.dts            | 360 ++++++++++
+ arch/arm/configs/shmobile_defconfig           |   1 +
+ arch/arm/mach-shmobile/Kconfig                |   6 +
+ arch/arm/mach-shmobile/Makefile               |   1 +
+ arch/arm/mach-shmobile/Makefile.boot          |   1 +
+ arch/arm/mach-shmobile/board-silk-reference.c | 995 ++++++++++++++++++++++++++
+ 7 files changed, 1365 insertions(+)
+ create mode 100644 arch/arm/boot/dts/r8a7794-silk.dts
+ create mode 100644 arch/arm/mach-shmobile/board-silk-reference.c
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index 2a7b49b..f2b99db 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -178,6 +178,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb \
+ 	r8a7791-koelsch.dtb \
+ 	r8a7790-lager.dtb \
+ 	r8a7794-alt.dtb \
++	r8a7794-silk.dtb \
+ 	r8a7793-gose.dtb \
+ 	r8a7779-marzen.dtb
+ dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
+diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
+new file mode 100644
+index 0000000..cb69f6b
+--- /dev/null
++++ b/arch/arm/boot/dts/r8a7794-silk.dts
+@@ -0,0 +1,360 @@
++/*
++ * Device Tree Source for the Silk board
++ *
++ * Copyright (C) 2014 Renesas Electronics Corporation
++ * Copyright (C) 2014 Cogent Embedded, Inc.
++ *
++ * This file is licensed under the terms of the GNU General Public License
++ * version 2.  This program is licensed "as is" without any warranty of any
++ * kind, whether express or implied.
++ */
++
++/*
++ * SSI-AK4643
++ *
++ * SW1: 1: AK4643
++ *      3: ADV7511
++ *
++ * this command is required when playback.
++ *
++ * # amixer set "LINEOUT Mixer DACL" on
++ * # amixer set "Digital" 200
++ * # amixer set "DVC Out" 50
++ */
++
++/dts-v1/;
++#include "r8a7794.dtsi"
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/input.h>
++
++/ {
++	model = "Silk";
++	compatible = "renesas,silk", "renesas,r8a7794";
++
++	aliases {
++		serial10 = &scif2;
++	};
++
++	chosen {
++		bootargs = "console=ttySC10,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp vmalloc=384M";
++	};
++
++	memory@40000000 {
++		device_type = "memory";
++		reg = <0 0x40000000 0 0x40000000>;
++	};
++
++	lbsc {
++		#address-cells = <1>;
++		#size-cells = <1>;
++	};
++
++	gpio-keys {
++		compatible = "gpio-keys";
++
++		key-1 {
++			gpios = <&gpio3 9 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_1>;
++			label = "SW12";
++			gpio-key,wakeup;
++			debounce-interval = <20>;
++		};
++		key-2 {
++			gpios = <&gpio3 10 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_2>;
++			label = "SW12";
++			gpio-key,wakeup;
++			debounce-interval = <20>;
++		};
++		key-3 {
++			gpios = <&gpio3 11 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_3>;
++			label = "SW12";
++			gpio-key,wakeup;
++			debounce-interval = <20>;
++		};
++		key-4 {
++			gpios = <&gpio3 12 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_4>;
++			label = "SW12";
++			gpio-key,wakeup;
++			debounce-interval = <20>;
++		};
++		key-a {
++			gpios = <&gpio5 10 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_A>;
++			label = "SW3";
++			gpio-key,wakeup;
++			debounce-interval = <20>;
++		};
++		key-b {
++			gpios = <&gpio5 11 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_B>;
++			label = "SW4";
++			gpio-key,wakeup;
++			debounce-interval = <20>;
++		};
++		key-c {
++			gpios = <&gpio5 12 GPIO_ACTIVE_LOW>;
++			linux,code = <KEY_C>;
++			label = "SW6";
++			gpio-key,wakeup;
++			debounce-interval = <20>;
++		};
++	};
++
++	vcc_sdhi0: regulator@0 {
++		compatible = "regulator-fixed";
++
++		regulator-name = "SDHI0 Vcc";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++
++		gpio = <&gpio2 26 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++	};
++
++	vccq_sdhi0: regulator@1 {
++		compatible = "regulator-gpio";
++
++		regulator-name = "SDHI0 VccQ";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <3300000>;
++
++		gpios = <&gpio2 29 GPIO_ACTIVE_HIGH>;
++		gpios-states = <1>;
++		states = <3300000 1
++			  1800000 0>;
++	};
++
++	vcc_sdhi1: regulator@2 {
++		compatible = "regulator-fixed";
++
++		regulator-name = "SDHI1 Vcc";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++
++		gpio = <&gpio4 26 GPIO_ACTIVE_HIGH>;
++		enable-active-high;
++	};
++
++	vccq_sdhi1: regulator@3 {
++		compatible = "regulator-gpio";
++
++		regulator-name = "SDHI1 VccQ";
++		regulator-min-microvolt = <1800000>;
++		regulator-max-microvolt = <3300000>;
++
++		gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;
++		gpios-states = <1>;
++		states = <3300000 1
++			  1800000 0>;
++	};
++
++	fixedregulator3v3: fixedregulator@0 {
++		compatible = "regulator-fixed";
++		regulator-name = "fixed-3.3V";
++		regulator-min-microvolt = <3300000>;
++		regulator-max-microvolt = <3300000>;
++		regulator-boot-on;
++		regulator-always-on;
++	};
++
++	hdmi_transmitter: adv7511 {
++		compatible = "adi,adv7511";
++		gpios = <&gpio5 23 GPIO_ACTIVE_LOW>;
++
++		adi,input-style = <0x02>;
++		adi,input-id = <0x00>;
++		adi,input-color-depth = <0x03>;
++		adi,sync-pulse = <0x03>;
++		adi,bit-justification = <0x01>;
++		adi,up-conversion = <0x00>;
++		adi,timing-generation-sequence = <0x00>;
++		adi,vsync-polarity = <0x02>;
++		adi,hsync-polarity = <0x02>;
++		adi,clock-delay = <0x03>;
++	};
++};
++
++&extal_clk {
++	clock-frequency = <20000000>;
++};
++
++&i2c1 {
++	pinctrl-0 = <&i2c1_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++	clock-frequency = <400000>;
++
++	snd_codec: ak4643 {
++		#sound-dai-cells = <0>;
++		compatible = "asahi-kasei,ak4643";
++		reg = <0x12>;
++	};
++};
++
++&i2c8 {
++	status = "okay";
++	clock-frequency = <100000>;
++};
++
++&pfc {
++	pinctrl-0 = <&du_pins &usb0_pins &usb1_pins &sound_pins &sound_clk_pins
++		     &vin0_pins>;
++	pinctrl-names = "default";
++
++	du_pins: du {
++		renesas,groups = "du0_rgb888", "du0_sync", "du0_clk_out",
++				 "du1_rgb666", "du1_sync", "du1_clk_out";
++		renesas,function = "du";
++	};
++
++	i2c1_pins: i2c1 {
++		renesas,groups = "i2c1";
++		renesas,function = "i2c1";
++	};
++
++	scif2_pins: serial2 {
++		renesas,groups = "scif2_data";
++		renesas,function = "scif2";
++	};
++
++	ether_pins: ether {
++		renesas,groups = "eth_link", "eth_mdio", "eth_rmii";
++		renesas,function = "eth";
++	};
++
++	qspi_pins: spi0 {
++		renesas,groups = "qspi_ctrl", "qspi_data4";
++		renesas,function = "qspi";
++	};
++
++	sdhi0_pins: sd0 {
++		renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
++		renesas,function = "sdhi0";
++	};
++
++	sdhi1_pins: sd1 {
++		renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
++		renesas,function = "sdhi1";
++	};
++
++	mmc0_pins: mmc0 {
++		renesas,groups = "mmc_data8", "mmc_ctrl";
++		renesas,function = "mmc";
++	};
++
++	usb0_pins: usb0 {
++		renesas,groups = "usb0";
++		renesas,function = "usb0";
++	};
++
++	usb1_pins: usb1 {
++		renesas,groups = "usb1";
++		renesas,function = "usb1";
++	};
++
++	vin0_pins: vin0 {
++		renesas,groups = "vin0_data8", "vin0_sync", "vin0_field",
++				 "vin0_clkenb", "vin0_clk";
++		renesas,function = "vin0";
++	};
++
++	sound_pins: sound {
++		renesas,groups = "ssi0129_ctrl", "ssi0_data", "ssi1_data";
++		renesas,function = "ssi";
++	};
++	sound_clk_pins: sound_clk {
++		renesas,groups = "audio_clk_c";
++		renesas,function = "audio_clk";
++	};
++};
++
++&ether {
++	phy-handle = <&phy1>;
++	renesas,ether-link-active-low;
++	status = "ok";
++
++	phy1: ethernet-phy@1 {
++		reg = <1>;
++		interrupt-parent = <&irqc0>;
++		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
++		micrel,led-mode = <1>;
++	};
++};
++
++&scif2 {
++	pinctrl-0 = <&scif2_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++};
++
++&qspi {
++	pinctrl-0 = <&qspi_pins>;
++	pinctrl-names = "default";
++
++	status = "okay";
++
++	flash: flash@0 {
++		#address-cells = <1>;
++		#size-cells = <1>;
++		compatible = "spansion,s25fl512s";
++		reg = <0>;
++		spi-max-frequency = <30000000>;
++		spi-tx-bus-width = <4>;
++		spi-rx-bus-width = <4>;
++		m25p,fast-read;
++		spi-cpol;
++		spi-cpha;
++
++		partition@0 {
++			label = "loader";
++			reg = <0x00000000 0x00040000>;
++			read-only;
++		};
++		partition@40000 {
++			label = "user";
++			reg = <0x00040000 0x00400000>;
++			read-only;
++		};
++		partition@440000 {
++			label = "flash";
++			reg = <0x00440000 0x03bc0000>;
++		};
++	};
++};
++
++&sdhi0 {
++	pinctrl-0 = <&sdhi0_pins>;
++	pinctrl-names = "default";
++
++	vmmc-supply = <&vcc_sdhi0>;
++	vqmmc-supply = <&vccq_sdhi0>;
++	cd-gpios = <&gpio6 6 GPIO_ACTIVE_LOW>;
++	wp-gpios = <&gpio6 7 GPIO_ACTIVE_HIGH>;
++	status = "okay";
++};
++
++&sdhi1 {
++	pinctrl-0 = <&sdhi1_pins>;
++	pinctrl-names = "default";
++
++	vmmc-supply = <&vcc_sdhi1>;
++	vqmmc-supply = <&vccq_sdhi1>;
++	cd-gpios = <&gpio6 14 GPIO_ACTIVE_LOW>;
++	wp-gpios = <&gpio6 15 GPIO_ACTIVE_HIGH>;
++	status = "okay";
++};
++
++&mmcif0 {
++	pinctrl-0 = <&mmc0_pins>;
++	pinctrl-names = "default";
++
++	vmmc-supply = <&fixedregulator3v3>;
++	bus-width = <8>;
++	non-removable;
++	status = "okay";
++};
+diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
+index efdc321..11237db 100644
+--- a/arch/arm/configs/shmobile_defconfig
++++ b/arch/arm/configs/shmobile_defconfig
+@@ -24,6 +24,7 @@ CONFIG_MACH_KOELSCH=y
+ CONFIG_MACH_LAGER=y
+ CONFIG_MACH_GOSE=y
+ CONFIG_MACH_ALT=y
++CONFIG_MACH_SILK=y
+ CONFIG_MACH_MARZEN=y
+ CONFIG_SHMOBILE_TIMER_HZ=100
+ CONFIG_ARM_LPAE=y
+diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
+index bb1b599..e2e00a9 100644
+--- a/arch/arm/mach-shmobile/Kconfig
++++ b/arch/arm/mach-shmobile/Kconfig
+@@ -82,6 +82,12 @@ config MACH_ALT
+ 	select MICREL_PHY if SH_ETH
+ 	select SND_SOC_AK4642 if SND_SIMPLE_CARD
+ 
++config MACH_SILK
++	bool "Silk board"
++	depends on ARCH_R8A7794
++	select MICREL_PHY if SH_ETH
++	select SND_SOC_AK4642 if SND_SIMPLE_CARD
++
+ config MACH_MARZEN
+ 	bool "MARZEN board"
+ 	depends on ARCH_R8A7779
+diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
+index 8d997e2..139f31c 100644
+--- a/arch/arm/mach-shmobile/Makefile
++++ b/arch/arm/mach-shmobile/Makefile
+@@ -76,6 +76,7 @@ obj-$(CONFIG_MACH_KOELSCH)	+= board-koelsch-reference.o
+ obj-$(CONFIG_MACH_LAGER)	+= board-lager-reference.o
+ obj-$(CONFIG_MACH_GOSE)		+= board-gose-reference.o
+ obj-$(CONFIG_MACH_ALT)		+= board-alt-reference.o
++obj-$(CONFIG_MACH_SILK)		+= board-silk-reference.o
+ obj-$(CONFIG_MACH_MARZEN)	+= board-marzen-reference.o
+ else
+ obj-$(CONFIG_MACH_APE6EVM)	+= board-ape6evm.o
+diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
+index 58c2623..25105b2 100644
+--- a/arch/arm/mach-shmobile/Makefile.boot
++++ b/arch/arm/mach-shmobile/Makefile.boot
+@@ -15,6 +15,7 @@ loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000
+ loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
+ loadaddr-$(CONFIG_MACH_GOSE) += 0x40008000
+ loadaddr-$(CONFIG_MACH_ALT) += 0x40008000
++loadaddr-$(CONFIG_MACH_SILK) += 0x40008000
+ 
+ __ZRELADDR	:= $(sort $(loadaddr-y))
+    zreladdr-y   += $(__ZRELADDR)
+diff --git a/arch/arm/mach-shmobile/board-silk-reference.c b/arch/arm/mach-shmobile/board-silk-reference.c
+new file mode 100644
+index 0000000..090a4df
+--- /dev/null
++++ b/arch/arm/mach-shmobile/board-silk-reference.c
+@@ -0,0 +1,995 @@
++/*
++ * Silk board support - Reference DT implementation
++ *
++ * Copyright (C) 2014 Renesas Electronics Corporation
++ * 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.
++ *
++ * 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/dma-mapping.h>
++#include <linux/gpio.h>
++#include <linux/i2c.h>
++#include <linux/kernel.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/of_gpio.h>
++#include <linux/of_platform.h>
++#include <linux/platform_data/camera-rcar.h>
++#include <linux/platform_data/rcar-du.h>
++#include <linux/platform_data/usb-rcar-gen2-phy.h>
++#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
++#include <linux/platform_data/vsp1.h>
++#endif
++#include <linux/serial_sci.h>
++#include <linux/sh_dma.h>
++#include <linux/spi/flash.h>
++#include <linux/spi/sh_msiof.h>
++#include <linux/spi/spi.h>
++#include <linux/usb/phy.h>
++#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC)
++#include <linux/usb/renesas_usbhs.h>
++#endif
++#include <media/soc_camera.h>
++#include <asm/mach/arch.h>
++#include <sound/rcar_snd.h>
++#include <sound/simple_card.h>
++
++#include "clock.h"
++#include "common.h"
++#include "dma-register.h"
++#include "irqs.h"
++#include "r8a7794.h"
++#include "rcar-gen2.h"
++
++/* DU */
++static struct rcar_du_encoder_data silk_du_encoders[] = {
++	{
++		.type = RCAR_DU_ENCODER_HDMI,
++		.output = RCAR_DU_OUTPUT_DPAD0,
++	},
++	{
++		.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,
++			},
++		},
++	},
++	{
++		.type = RCAR_DU_ENCODER_VGA,
++		.output = RCAR_DU_OUTPUT_DPAD1,
++	},
++};
++
++static struct rcar_du_crtc_data silk_du_crtcs[] = {
++	{
++		.exclk = 148500000,
++		.init_conn_type = DRM_MODE_CONNECTOR_HDMIA,
++	},
++	{
++		.exclk = 74250000,
++		.init_conn_type = DRM_MODE_CONNECTOR_VGA,
++	},
++};
++
++static int silk_lvds_backlight_on(void)
++{
++	return 0;
++}
++
++static int silk_lvds_backlight_off(void)
++{
++	return 0;
++}
++
++static struct rcar_du_platform_data silk_du_pdata = {
++	.encoders = silk_du_encoders,
++	.num_encoders = ARRAY_SIZE(silk_du_encoders),
++	.crtcs = silk_du_crtcs,
++	.num_crtcs = ARRAY_SIZE(silk_du_crtcs),
++#ifdef CONFIG_DRM_FBDEV_CRTC
++	.fbdev_crtc = 0,
++#endif
++	.backlight_on = silk_lvds_backlight_on,
++	.backlight_off = silk_lvds_backlight_off,
++	.i2c_ch = 1,
++};
++
++static const struct resource du_resources[] __initconst = {
++	DEFINE_RES_MEM(0xfeb00000, 0x40000),
++	DEFINE_RES_IRQ(gic_spi(256)),
++	DEFINE_RES_IRQ(gic_spi(268)),
++};
++
++static void __init silk_add_du_device(void)
++{
++	struct platform_device_info info = {
++		.name = "rcar-du-r8a7794",
++		.id = -1,
++		.res = du_resources,
++		.num_res = ARRAY_SIZE(du_resources),
++		.data = &silk_du_pdata,
++		.size_data = sizeof(silk_du_pdata),
++		.dma_mask = DMA_BIT_MASK(32),
++	};
++
++	platform_device_register_full(&info);
++}
++
++/* Sound */
++static struct rsnd_ssi_platform_info rsnd_ssi[] = {
++	RSND_SSI(AUDIOPP_DMAC_SLAVE_CMD0_TO_SSI0, gic_spi(370), 0),
++	RSND_SSI(AUDIOPP_DMAC_SLAVE_SSI1_TO_SCU2, gic_spi(371), RSND_SSI_CLK_PIN_SHARE),
++};
++
++static struct rsnd_src_platform_info rsnd_src[3] = {
++	RSND_SRC_UNUSED,
++	RSND_SRC(0, AUDIO_DMAC_SLAVE_SCU1_TX, gic_spi(353)),
++	RSND_SRC(0, AUDIO_DMAC_SLAVE_CMD1_TO_MEM, gic_spi(354)),
++};
++
++static struct rsnd_dvc_platform_info rsnd_dvc[2] = {
++};
++
++static struct rsnd_dai_platform_info rsnd_dai = {
++	.playback = { .ssi = &rsnd_ssi[0], .src = &rsnd_src[1], .dvc = &rsnd_dvc[0], },
++	.capture  = { .ssi = &rsnd_ssi[1], .src = &rsnd_src[2], .dvc = &rsnd_dvc[1], },
++};
++
++static struct rcar_snd_info rsnd_info = {
++	.flags		= RSND_GEN2,
++	.ssi_info	= rsnd_ssi,
++	.ssi_info_nr	= ARRAY_SIZE(rsnd_ssi),
++	.src_info	= rsnd_src,
++	.src_info_nr	= ARRAY_SIZE(rsnd_src),
++	.dvc_info	= rsnd_dvc,
++	.dvc_info_nr	= ARRAY_SIZE(rsnd_dvc),
++	.dai_info	= &rsnd_dai,
++	.dai_info_nr	= 1,
++};
++
++static struct asoc_simple_card_info rsnd_card_info = {
++	.name		= "SSI01-AK4643",
++	.codec		= "ak4642-codec.1-0012",
++	.platform	= "rcar_sound",
++	.daifmt		= SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
++	.cpu_dai = {
++		.name	= "rcar_sound",
++	},
++	.codec_dai = {
++		.name	= "ak4642-hifi",
++		.sysclk	= 12288000,
++	},
++};
++
++static void __init silk_add_rsnd_device(void)
++{
++	struct resource rsnd_resources[] = {
++		[RSND_GEN2_SCU]  = DEFINE_RES_MEM(0xec500000, 0x1000),
++		[RSND_GEN2_ADG]  = DEFINE_RES_MEM(0xec5a0000, 0x100),
++		[RSND_GEN2_SSIU] = DEFINE_RES_MEM(0xec540000, 0x1000),
++		[RSND_GEN2_SSI]  = DEFINE_RES_MEM(0xec541000, 0x1280),
++	};
++
++	struct platform_device_info cardinfo = {
++		.parent         = &platform_bus,
++		.name           = "asoc-simple-card",
++		.id             = -1,
++		.data           = &rsnd_card_info,
++		.size_data      = sizeof(struct asoc_simple_card_info),
++		.dma_mask       = DMA_BIT_MASK(32),
++	};
++
++	platform_device_register_resndata(
++		&platform_bus, "rcar_sound", -1,
++		rsnd_resources, ARRAY_SIZE(rsnd_resources),
++		&rsnd_info, sizeof(rsnd_info));
++
++	platform_device_register_full(&cardinfo);
++}
++
++
++/*
++ * This is a really crude hack to provide clkdev support to platform
++ * devices until they get moved to DT.
++ */
++static const struct clk_name clk_names[] __initconst = {
++	{ "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" },
++	{ "scif2", NULL, "sh-sci.10" },
++	{ "scif3", NULL, "sh-sci.11" },
++	{ "scif4", NULL, "sh-sci.12" },
++	{ "scif5", NULL, "sh-sci.13" },
++	{ "scifa3", NULL, "sh-sci.14" },
++	{ "scifa4", NULL, "sh-sci.15" },
++	{ "scifa5", NULL, "sh-sci.16" },
++	{ "hscif2", NULL, "sh-sci.17" },
++	{ "du0", "du.0", "rcar-du-r8a7794" },
++	{ "du1", "du.1", "rcar-du-r8a7794" },
++	{ "hsusb", NULL, "usb_phy_rcar_gen2" },
++	{ "ssi0", "ssi.0", "rcar_sound" },
++	{ "ssi1", "ssi.1", "rcar_sound" },
++	{ "src1", "src.1", "rcar_sound" },
++	{ "src2", "src.2", "rcar_sound" },
++	{ "dvc0", "dvc.0", "rcar_sound" },
++	{ "dvc1", "dvc.1", "rcar_sound" },
++	{ "vin0", NULL, "r8a7794-vin.0" },
++	{ "vsps", NULL, NULL },
++#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
++	{ "vsp1-du0", NULL, "vsp1.2" },
++#else
++	{ "vsp1-du0", NULL, NULL },
++#endif
++	{ "vpc0", NULL, "vpc1" },
++	{ "2ddmac", NULL, "tddmac" },
++	{ "fdp0", NULL, "fdp0" },
++	{ "pvrsrvkm", NULL, "pvrsrvkm" },
++#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC)
++	{ "hsusb", NULL, "renesas_usbhs" },
++#else
++	{ "ehci", NULL, "pci-rcar-gen2.0" },
++#endif
++};
++
++/*
++ * This is a really crude hack to work around core platform clock issues
++ */
++static const struct clk_name clk_enables[] __initconst = {
++	{ "ether", NULL, "ee700000.ethernet" },
++	{ "i2c1", NULL, "e6518000.i2c" },
++	{ "mmcif0", NULL, "ee200000.mmc" },
++	{ "sdhi0", NULL, "ee100000.sd" },
++	{ "sdhi1", NULL, "ee140000.sd" },
++	{ "ehci", NULL, "pci-rcar-gen2.1" },
++	{ "vcp0", NULL, "vcp1" },
++	{ "dmal", NULL, "sh-dma-engine.0" },
++	{ "sys-dmac1", NULL, "sh-dma-engine.2" },
++	{ "sys-dmac0", NULL, "sh-dma-engine.3" },
++#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC)
++	{ "usbdmac0", NULL, "sh-dma-engine.4" },
++#endif
++	{ "ipmmu_gp", NULL, "ipmmu_gp" },
++};
++
++#define DMAE_CHANNEL(a, b)			\
++{						\
++	.offset		= (a) - 0x20,		\
++	.dmars		= (a) - 0x20 + 0x40,	\
++	.chclr_bit	= (b),			\
++	.chclr_offset	= 0x80 - 0x20,		\
++}
++
++/* Sys-DMAC */
++#define SYS_DMAC_SLAVE(_id, _bit, _addr, toffset, roffset, t, r)	\
++{								\
++	.slave_id	= SYS_DMAC_SLAVE_## _id ##_TX,		\
++	.addr		= _addr + toffset,			\
++	.chcr		= CHCR_TX(XMIT_SZ_## _bit ##BIT),	\
++	.mid_rid	= t,					\
++}, {								\
++	.slave_id	= SYS_DMAC_SLAVE_## _id ##_RX,		\
++	.addr		= _addr + roffset,			\
++	.chcr		= CHCR_RX(XMIT_SZ_## _bit ##BIT),	\
++	.mid_rid	= r,					\
++}
++
++#define SYS_DMAC_SLAVE_TX(_id, _bit, _addr, toffset, roffset, t, r)	\
++{								\
++	.slave_id	= SYS_DMAC_SLAVE_## _id ##_TX,		\
++	.addr		= _addr + toffset,			\
++	.chcr		= CHCR_TX(XMIT_SZ_## _bit ##BIT),	\
++	.mid_rid	= t,					\
++}
++
++static const struct sh_dmae_slave_config r8a7794_sys_dmac_slaves[] = {
++	SYS_DMAC_SLAVE(MMCIF0, 32, 0xee200000, 0x34, 0x34, 0xd1, 0xd2),
++	SYS_DMAC_SLAVE(SDHI0, 256, 0xee100000, 0x60, 0x2060, 0xcd, 0xce),
++	SYS_DMAC_SLAVE(SDHI1, 256, 0xee140000, 0x30, 0x2030, 0xc1, 0xc2),
++	SYS_DMAC_SLAVE(SCIF0, 8, 0xe6e60000, 0xc, 0x14, 0x29, 0x2a),
++	SYS_DMAC_SLAVE(SCIF1, 8, 0xe6e68000, 0xc, 0x14, 0x2d, 0x2e),
++	SYS_DMAC_SLAVE(SCIF2, 8, 0xe6e58000, 0xc, 0x14, 0x2b, 0x2c),
++	SYS_DMAC_SLAVE(SCIF3, 8, 0xe6ea8000, 0xc, 0x14, 0x2f, 0x30),
++	SYS_DMAC_SLAVE(SCIF4, 8, 0xe6ee0000, 0xc, 0x14, 0xfb, 0xfc),
++	SYS_DMAC_SLAVE(SCIF5, 8, 0xe6ee8000, 0xc, 0x14, 0xfd, 0xfe),
++	SYS_DMAC_SLAVE(SCIFA0, 8, 0xe6c40000, 0x20, 0x24, 0x21, 0x22),
++	SYS_DMAC_SLAVE(SCIFA1, 8, 0xe6c50000, 0x20, 0x24, 0x25, 0x26),
++	SYS_DMAC_SLAVE(SCIFA2, 8, 0xe6c60000, 0x20, 0x24, 0x27, 0x28),
++	SYS_DMAC_SLAVE(SCIFA3, 8, 0xe6c70000, 0x20, 0x24, 0x1b, 0x1c),
++	SYS_DMAC_SLAVE(SCIFA4, 8, 0xe6c78000, 0x20, 0x24, 0x1f, 0x20),
++	SYS_DMAC_SLAVE(SCIFA5, 8, 0xe6c80000, 0x20, 0x24, 0x23, 0x24),
++	SYS_DMAC_SLAVE(SCIFB0, 8, 0xe6c20000, 0x40, 0x60, 0x3d, 0x3e),
++	SYS_DMAC_SLAVE(SCIFB1, 8, 0xe6c30000, 0x40, 0x60, 0x19, 0x1a),
++	SYS_DMAC_SLAVE(SCIFB2, 8, 0xe6ce0000, 0x40, 0x60, 0x1d, 0x1e),
++	SYS_DMAC_SLAVE(HSCIF0, 8, 0xe62c0000, 0xc, 0x14, 0x39, 0x3a),
++	SYS_DMAC_SLAVE(HSCIF1, 8, 0xe62c8000, 0xc, 0x14, 0x4d, 0x4e),
++	SYS_DMAC_SLAVE(HSCIF2, 8, 0xe62d0000, 0xc, 0x14, 0x3b, 0x3c),
++	SYS_DMAC_SLAVE(MSIOF0, 32, 0xe7e20000, 0x50, 0x60, 0x51, 0x52),
++	SYS_DMAC_SLAVE(MSIOF1, 32, 0xe7e10000, 0x50, 0x60, 0x55, 0x56),
++	SYS_DMAC_SLAVE(MSIOF2, 32, 0xe7e00000, 0x50, 0x60, 0x41, 0x42),
++};
++
++static const struct sh_dmae_channel r8a7794_sys_dmac_channels[] = {
++	DMAE_CHANNEL(0x8000, 0),
++	DMAE_CHANNEL(0x8080, 1),
++	DMAE_CHANNEL(0x8100, 2),
++	DMAE_CHANNEL(0x8180, 3),
++	DMAE_CHANNEL(0x8200, 4),
++	DMAE_CHANNEL(0x8280, 5),
++	DMAE_CHANNEL(0x8300, 6),
++	DMAE_CHANNEL(0x8380, 7),
++	DMAE_CHANNEL(0x8400, 8),
++	DMAE_CHANNEL(0x8480, 9),
++	DMAE_CHANNEL(0x8500, 10),
++	DMAE_CHANNEL(0x8580, 11),
++	DMAE_CHANNEL(0x8600, 12),
++	DMAE_CHANNEL(0x8680, 13),
++	DMAE_CHANNEL(0x8700, 14),
++};
++
++static struct sh_dmae_pdata r8a7794_sys_dmac_platform_data = {
++	.slave		= r8a7794_sys_dmac_slaves,
++	.slave_num	= ARRAY_SIZE(r8a7794_sys_dmac_slaves),
++	.channel	= r8a7794_sys_dmac_channels,
++	.channel_num	= ARRAY_SIZE(r8a7794_sys_dmac_channels),
++	.ts_low_shift	= TS_LOW_SHIFT,
++	.ts_low_mask	= TS_LOW_BIT << TS_LOW_SHIFT,
++	.ts_high_shift	= TS_HI_SHIFT,
++	.ts_high_mask	= TS_HI_BIT << TS_HI_SHIFT,
++	.ts_shift	= dma_ts_shift,
++	.ts_shift_num	= ARRAY_SIZE(dma_ts_shift),
++	.dmaor_init	= DMAOR_DME,
++	.chclr_present	= 1,
++	.chclr_bitwise	= 1,
++	.fourty_bits_addr = 1,
++};
++
++static struct resource r8a7794_sys_dmac_resources[] = {
++	/* Channel registers and DMAOR for low */
++	DEFINE_RES_MEM(0xe6700020, 0x8763 - 0x20),
++	DEFINE_RES_IRQ(gic_spi(197)),
++	DEFINE_RES_NAMED(gic_spi(200), 15, NULL, IORESOURCE_IRQ),
++
++	/* Channel registers and DMAOR for high */
++	DEFINE_RES_MEM(0xe6720020, 0x8763 - 0x20),
++	DEFINE_RES_IRQ(gic_spi(220)),
++	DEFINE_RES_NAMED(gic_spi(216), 4, NULL, IORESOURCE_IRQ),
++	DEFINE_RES_NAMED(gic_spi(308), 11, NULL, IORESOURCE_IRQ),
++};
++
++#define r8a7794_register_sys_dmac(id)				\
++	platform_device_register_resndata(			\
++		&platform_bus, "sh-dma-engine", 2 + id,		\
++		&r8a7794_sys_dmac_resources[id * 3],	id * 1 + 3,	\
++		&r8a7794_sys_dmac_platform_data,		\
++		sizeof(r8a7794_sys_dmac_platform_data))
++
++static void __init silk_add_dmac_prototype(void)
++{
++	r8a7794_register_sys_dmac(0);
++	r8a7794_register_sys_dmac(1);
++}
++
++static struct sh_mmcif_plat_data mmcif0_pdata = {
++	.caps		= MMC_CAP_4_BIT_DATA |
++			  MMC_CAP_8_BIT_DATA |
++			  MMC_CAP_NONREMOVABLE,
++	.ccs_unsupported = true,
++	.clk_ctrl2_present = true,
++	.slave_id_tx	= SYS_DMAC_SLAVE_MMCIF0_TX,
++	.slave_id_rx	= SYS_DMAC_SLAVE_MMCIF0_RX,
++};
++
++static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
++	.dma_slave_tx   = SYS_DMAC_SLAVE_SDHI0_TX,
++	.dma_slave_rx   = SYS_DMAC_SLAVE_SDHI0_RX,
++	.dma_rx_offset  = 0x2000,
++
++	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
++			  MMC_CAP_POWER_OFF_CARD,
++	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT,
++};
++
++static struct sh_mobile_sdhi_info sdhi1_info __initdata = {
++	.dma_slave_tx   = SYS_DMAC_SLAVE_SDHI1_TX,
++	.dma_slave_rx   = SYS_DMAC_SLAVE_SDHI1_RX,
++	.dma_rx_offset  = 0x2000,
++
++	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
++			  MMC_CAP_POWER_OFF_CARD,
++	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT,
++};
++
++/* SCIF */
++#define SCIF_PD(scif_type, index, scif_index)				\
++static struct plat_sci_port scif##index##_platform_data = {	\
++	.type		= PORT_##scif_type,			\
++	.flags		= UPF_BOOT_AUTOCONF | UPF_IOREMAP,	\
++	.scscr		= SCSCR_RE | SCSCR_TE,			\
++	.dma_slave_tx	= SYS_DMAC_SLAVE_##scif_type##scif_index##_TX,	\
++	.dma_slave_rx	= SYS_DMAC_SLAVE_##scif_type##scif_index##_RX,	\
++}
++
++#define PDATA_SCIF(index, baseaddr, irq, i) SCIF_PD(SCIF, index, i)
++#define PDATA_SCIFA(index, baseaddr, irq, i) SCIF_PD(SCIFA, index, i)
++#define PDATA_SCIFB(index, baseaddr, irq, i) SCIF_PD(SCIFB, index, i)
++#define PDATA_HSCIF(index, baseaddr, irq, i) SCIF_PD(HSCIF, index, i)
++
++PDATA_SCIFA(0,  0xe6c40000, gic_spi(144), 0); /* SCIFA0 */
++PDATA_SCIFA(1,  0xe6c50000, gic_spi(145), 1); /* SCIFA1 */
++PDATA_SCIFB(2,  0xe6c20000, gic_spi(148), 0); /* SCIFB0 */
++PDATA_SCIFB(3,  0xe6c30000, gic_spi(149), 1); /* SCIFB1 */
++PDATA_SCIFB(4,  0xe6ce0000, gic_spi(150), 2); /* SCIFB2 */
++PDATA_SCIFA(5,  0xe6c60000, gic_spi(151), 2); /* SCIFA2 */
++PDATA_SCIF(6,   0xe6e60000, gic_spi(152), 0); /* SCIF0 */
++PDATA_SCIF(7,   0xe6e68000, gic_spi(153), 1); /* SCIF1 */
++PDATA_HSCIF(8,  0xe62c0000, gic_spi(154), 0); /* HSCIF0 */
++PDATA_HSCIF(9,  0xe62c8000, gic_spi(155), 1); /* HSCIF1 */
++PDATA_SCIF(10,  0xe6e58000, gic_spi(22), 2); /* SCIF2 */
++PDATA_SCIF(11,  0xe6ea8000, gic_spi(23), 3); /* SCIF3 */
++PDATA_SCIF(12,  0xe6ee0000, gic_spi(24), 4); /* SCIF4 */
++PDATA_SCIF(13,  0xe6ee8000, gic_spi(25), 5); /* SCIF5 */
++PDATA_SCIFA(14, 0xe6c70000, gic_spi(29), 3); /* SCIFA3 */
++PDATA_SCIFA(15, 0xe6c78000, gic_spi(30), 4); /* SCIFA4 */
++PDATA_SCIFA(16, 0xe6c80000, gic_spi(31), 5); /* SCIFA5 */
++PDATA_HSCIF(17, 0xe6cd0000, gic_spi(21), 2); /* HSCIF2 */
++
++#define SCIF_AD(scif_type, index, baseaddr)		\
++	OF_DEV_AUXDATA("renesas," scif_type "-r8a7794", baseaddr, \
++			"sh-sci." # index, &scif##index##_platform_data)
++
++#define AUXDATA_SCIF(index, baseaddr, irq) SCIF_AD("scif", index, baseaddr)
++#define AUXDATA_SCIFA(index, baseaddr, irq) SCIF_AD("scifa", index, baseaddr)
++#define AUXDATA_SCIFB(index, baseaddr, irq) SCIF_AD("scifb", index, baseaddr)
++#define AUXDATA_HSCIF(index, baseaddr, irq) SCIF_AD("hscif", index, baseaddr)
++
++#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC)
++/* USB-DMAC */
++static const struct sh_dmae_channel usb_dmac_channels[] = {
++	{
++		.offset = 0,
++	}, {
++		.offset = 0x20,
++	},
++};
++
++static const struct sh_dmae_slave_config usb_dmac_slaves[] = {
++	{
++		.slave_id	= USB_DMAC_SLAVE_USBHS_TX,
++		.chcr		= USBTS_INDEX2VAL(USBTS_XMIT_SZ_32BYTE),
++	}, {
++		.slave_id	= USB_DMAC_SLAVE_USBHS_RX,
++		.chcr		= USBTS_INDEX2VAL(USBTS_XMIT_SZ_32BYTE),
++	},
++};
++
++static struct sh_dmae_pdata usb_dmac_platform_data = {
++	.slave		= usb_dmac_slaves,
++	.slave_num	= ARRAY_SIZE(usb_dmac_slaves),
++	.channel	= usb_dmac_channels,
++	.channel_num	= ARRAY_SIZE(usb_dmac_channels),
++	.ts_low_shift	= USBTS_LOW_SHIFT,
++	.ts_low_mask	= USBTS_LOW_BIT << USBTS_LOW_SHIFT,
++	.ts_high_shift	= USBTS_HI_SHIFT,
++	.ts_high_mask	= USBTS_HI_BIT << USBTS_HI_SHIFT,
++	.ts_shift	= dma_usbts_shift,
++	.ts_shift_num	= ARRAY_SIZE(dma_usbts_shift),
++	.dmaor_init	= DMAOR_DME,
++	.chcr_offset	= 0x14,
++	.chcr_ie_bit	= 1 << 5,
++	.dmaor_is_32bit	= 1,
++	.needs_tend_set	= 1,
++	.no_dmars	= 1,
++	.slave_only	= 1,
++};
++
++static struct resource usb_dmac_resources[] = {
++	DEFINE_RES_MEM(0xe65a0020, 0x44), /* Channel registers and DMAOR */
++	DEFINE_RES_MEM(0xe65a0000, 0x14), /* VCR/SWR/DMICR */
++	DEFINE_RES_IRQ(gic_spi(109)),
++};
++
++static void __init silk_add_usb_dmac_prototype(void)
++{
++	platform_device_register_resndata(&platform_bus, "sh-dma-engine",
++					  4,
++					  usb_dmac_resources,
++					  ARRAY_SIZE(usb_dmac_resources),
++					  &usb_dmac_platform_data,
++					  sizeof(usb_dmac_platform_data));
++}
++
++/* USBHS */
++static const struct resource usbhs_resources[] __initconst = {
++	DEFINE_RES_MEM(0xe6590000, 0x100),
++	DEFINE_RES_IRQ(gic_spi(107)),
++};
++
++struct usbhs_private {
++	struct renesas_usbhs_platform_info info;
++	struct usb_phy *phy;
++	int pwen_gpio;
++};
++
++#define usbhs_get_priv(pdev) \
++	container_of(renesas_usbhs_get_info(pdev), struct usbhs_private, info)
++
++static int usbhs_power_ctrl(struct platform_device *pdev,
++				void __iomem *base, int enable)
++{
++	struct usbhs_private *priv = usbhs_get_priv(pdev);
++
++	if (!priv->phy)
++		return -ENODEV;
++
++	if (enable) {
++		int retval = usb_phy_init(priv->phy);
++
++		if (!retval)
++			retval = usb_phy_set_suspend(priv->phy, 0);
++		return retval;
++	}
++
++	usb_phy_set_suspend(priv->phy, 1);
++	usb_phy_shutdown(priv->phy);
++	return 0;
++}
++
++static int usbhs_hardware_init(struct platform_device *pdev)
++{
++	struct usbhs_private *priv = usbhs_get_priv(pdev);
++	struct usb_phy *phy;
++	int ret;
++	struct device_node *np;
++
++	np = of_find_node_by_path("/gpio@e6055000");
++	if (np) {
++		priv->pwen_gpio = of_get_gpio(np, 24);
++		of_node_put(np);
++	} else {
++		pr_warn("Error: Unable to get PWEN GPIO line\n");
++		ret = -ENOTSUPP;
++		goto error2;
++	}
++
++	phy = usb_get_phy_dev(&pdev->dev, 0);
++	if (IS_ERR(phy)) {
++		ret = PTR_ERR(phy);
++		goto error;
++	}
++
++	priv->phy = phy;
++	return 0;
++ error:
++	gpio_free(priv->pwen_gpio);
++ error2:
++	return ret;
++}
++
++static int usbhs_hardware_exit(struct platform_device *pdev)
++{
++	struct usbhs_private *priv = usbhs_get_priv(pdev);
++
++	if (!priv->phy)
++		return 0;
++
++	usb_put_phy(priv->phy);
++	priv->phy = NULL;
++	gpio_free(priv->pwen_gpio);
++	return 0;
++}
++
++static int usbhs_get_id(struct platform_device *pdev)
++{
++	return USBHS_GADGET;
++}
++
++static int usbhs_get_vbus(struct platform_device *pdev)
++{
++	return 0;
++}
++
++static u32 lager_usbhs_pipe_type[] = {
++	USB_ENDPOINT_XFER_CONTROL,
++	USB_ENDPOINT_XFER_ISOC,
++	USB_ENDPOINT_XFER_ISOC,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_INT,
++	USB_ENDPOINT_XFER_INT,
++	USB_ENDPOINT_XFER_INT,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_BULK,
++	USB_ENDPOINT_XFER_BULK,
++};
++
++static struct usbhs_private usbhs_priv __initdata = {
++	.info = {
++		.platform_callback = {
++			.power_ctrl	= usbhs_power_ctrl,
++			.hardware_init	= usbhs_hardware_init,
++			.hardware_exit	= usbhs_hardware_exit,
++			.get_id		= usbhs_get_id,
++			.get_vbus	= usbhs_get_vbus,
++		},
++		.driver_param = {
++			.buswait_bwait	= 4,
++			.pipe_type = lager_usbhs_pipe_type,
++			.pipe_size = ARRAY_SIZE(lager_usbhs_pipe_type),
++			.d0_rx_id	= USB_DMAC_SLAVE_USBHS_RX,
++			.d1_tx_id	= USB_DMAC_SLAVE_USBHS_TX,
++			.usb_dmac_xfer_size = 32,
++		},
++	}
++};
++
++static void __init silk_register_usbhs(void)
++{
++	usb_bind_phy("renesas_usbhs", 0, "usb_phy_rcar_gen2");
++	platform_device_register_resndata(&platform_bus,
++					  "renesas_usbhs", -1,
++					  usbhs_resources,
++					  ARRAY_SIZE(usbhs_resources),
++					  &usbhs_priv.info,
++					  sizeof(usbhs_priv.info));
++}
++
++#else
++/* Internal PCI0 */
++static const struct resource pci0_resources[] __initconst = {
++	DEFINE_RES_MEM(0xee090000, 0x10000),	/* CFG */
++	DEFINE_RES_MEM(0xee080000, 0x10000),	/* MEM */
++	DEFINE_RES_IRQ(gic_spi(108)),
++};
++
++static const struct platform_device_info pci0_info __initconst = {
++	.parent		= &platform_bus,
++	.name		= "pci-rcar-gen2",
++	.id		= 0,
++	.res		= pci0_resources,
++	.num_res	= ARRAY_SIZE(pci0_resources),
++	.dma_mask	= DMA_BIT_MASK(32),
++};
++
++static void __init silk_add_usb0_device(void)
++{
++	usb_bind_phy("pci-rcar-gen2.0", 0, "usb_phy_rcar_gen2");
++	platform_device_register_full(&pci0_info);
++}
++#endif
++/* USBHS PHY */
++static const struct rcar_gen2_phy_platform_data usbhs_phy_pdata __initconst = {
++#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC)
++	.chan0_pci = 0,	/* Channel 0 is USBHS */
++#else
++	.chan0_pci = 1,	/* Channel 0 is PCI USB */
++#endif
++	.chan2_pci = 1,	/* Channel 2 is PCI USB */
++	.gpio_vbus = 857,
++	.wakeup = true,
++};
++
++static const struct resource usbhs_phy_resources[] __initconst = {
++	DEFINE_RES_MEM(0xe6590100, 0x100),
++};
++
++/* Internal PCI1 */
++static const struct resource pci1_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 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 silk_add_usb1_device(void)
++{
++	usb_bind_phy("pci-rcar-gen2.1", 0, "usb_phy_rcar_gen2");
++	platform_device_register_full(&pci1_info);
++}
++
++/* POWER IC */
++static struct i2c_board_info poweric_i2c[] = {
++	{ I2C_BOARD_INFO("da9063", 0x58), },
++};
++
++static void silk_restart(char mode, const char *cmd)
++{
++	struct i2c_adapter *adap;
++	struct i2c_client *client;
++	u8 val;
++	int busnum = 8;
++
++	adap = i2c_get_adapter(busnum);
++	if (!adap) {
++		pr_err("failed to get adapter i2c%d\n", busnum);
++		return;
++	}
++
++	client = i2c_new_device(adap, &poweric_i2c[0]);
++	if (!client)
++		pr_err("failed to register %s to i2c%d\n",
++		       poweric_i2c[0].type, busnum);
++
++	i2c_put_adapter(adap);
++
++	val = i2c_smbus_read_byte_data(client, 0x13);
++
++	if (val < 0)
++		pr_err("couldn't access da9063\n");
++
++	val |= 0x02;
++
++	i2c_smbus_write_byte_data(client, 0x13, val);
++}
++
++/* VIN */
++static const struct resource vin_resources[] __initconst = {
++	/* VIN0 */
++	DEFINE_RES_MEM(0xe6ef0000, 0x1000),
++	DEFINE_RES_IRQ(gic_spi(188)),
++};
++
++static void __init silk_add_vin_device(unsigned idx,
++					struct rcar_vin_platform_data *pdata)
++{
++	struct platform_device_info vin_info = {
++		.parent		= &platform_bus,
++		.name		= "r8a7794-vin",
++		.id		= idx,
++		.res		= &vin_resources[idx * 2],
++		.num_res	= 2,
++		.dma_mask	= DMA_BIT_MASK(32),
++		.data		= pdata,
++		.size_data	= sizeof(*pdata),
++	};
++
++	BUG_ON(idx > 1);
++
++	platform_device_register_full(&vin_info);
++}
++
++#define SILK_CAMERA(idx, name, addr, pdata, flag)			\
++static struct i2c_board_info i2c_cam##idx##_device = {			\
++	I2C_BOARD_INFO(name, addr),					\
++};									\
++									\
++static struct rcar_vin_platform_data vin##idx##_pdata = {		\
++	.flags = flag,							\
++};									\
++									\
++static struct soc_camera_link cam##idx##_link = {			\
++	.bus_id = idx,							\
++	.board_info = &i2c_cam##idx##_device,				\
++	.i2c_adapter_id = 1,						\
++	.module_name = name,						\
++	.priv = pdata,							\
++}
++
++SILK_CAMERA(0, "adv7180", 0x20, NULL, RCAR_VIN_BT656);
++
++static void __init silk_add_camera0_device(void)
++{
++	platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0,
++				      &cam0_link, sizeof(cam0_link));
++	silk_add_vin_device(0, &vin0_pdata);
++}
++
++/* VSP1 */
++#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
++static const struct vsp1_platform_data silk_vsps_pdata __initconst = {
++	.features = 0,
++	.rpf_count = 5,
++	.uds_count = 3,
++	.wpf_count = 4,
++};
++
++static const struct vsp1_platform_data silk_vspd0_pdata __initconst = {
++	.features = VSP1_HAS_LIF,
++	.rpf_count = 4,
++	.uds_count = 1,
++	.wpf_count = 4,
++};
++
++static const struct vsp1_platform_data * const silk_vsp1_pdata[] __initconst
++									= {
++	&silk_vsps_pdata,
++	&silk_vspd0_pdata,
++};
++
++static const struct resource vsp1_1_resources[] __initconst = {
++	DEFINE_RES_MEM(0xfe928000, 0x8000),
++	DEFINE_RES_IRQ(gic_spi(267)),
++};
++
++static const struct resource vsp1_2_resources[] __initconst = {
++	DEFINE_RES_MEM(0xfe930000, 0x8000),
++	DEFINE_RES_IRQ(gic_spi(246)),
++};
++
++static const struct resource * const vsp1_resources[] __initconst = {
++	vsp1_1_resources,
++	vsp1_2_resources,
++};
++
++static void __init silk_add_vsp1_devices(void)
++{
++	struct platform_device_info info = {
++		.name = "vsp1",
++		.size_data = sizeof(*silk_vsp1_pdata[0]),
++		.num_res = 2,
++		.dma_mask = DMA_BIT_MASK(32),
++	};
++	unsigned int i;
++
++	for (i = 1; i < ARRAY_SIZE(vsp1_resources); ++i) {
++		info.id = i + 1;
++		info.data = silk_vsp1_pdata[i];
++		info.res = vsp1_resources[i];
++
++		platform_device_register_full(&info);
++	}
++}
++#endif
++
++/* MSIOF */
++static struct sh_msiof_spi_info msiof0_info = {
++	.rx_fifo_override       = 256,
++	.num_chipselect         = 1,
++	.dma_tx_id              = SYS_DMAC_SLAVE_MSIOF0_TX,
++	.dma_rx_id              = SYS_DMAC_SLAVE_MSIOF0_RX,
++};
++
++static struct sh_msiof_spi_info msiof1_info = {
++	.rx_fifo_override       = 256,
++	.num_chipselect         = 1,
++	.dma_tx_id              = SYS_DMAC_SLAVE_MSIOF1_TX,
++	.dma_rx_id              = SYS_DMAC_SLAVE_MSIOF1_RX,
++};
++
++/* MSIOF spidev */
++static const struct spi_board_info spi_bus[] __initconst = {
++	{
++		.modalias	= "spidev",
++		.max_speed_hz	= 6000000,
++		.mode		= SPI_MODE_3,
++		.bus_num	= 1,
++		.chip_select	= 0,
++	},
++	{
++		.modalias	= "spidev",
++		.max_speed_hz	= 6000000,
++		.mode		= SPI_MODE_3,
++		.bus_num	= 2,
++		.chip_select	= 0,
++	},
++};
++
++#define silk_add_msiof_device spi_register_board_info
++
++static struct of_dev_auxdata silk_auxdata_lookup[] __initdata = {
++	OF_DEV_AUXDATA("renesas,mmcif-r8a7794", 0xee200000, "sh_mmcif",
++			&mmcif0_pdata),
++	OF_DEV_AUXDATA("renesas,sdhi-r8a7794", 0xee100000, "sdhi0",
++			&sdhi0_info),
++	OF_DEV_AUXDATA("renesas,sdhi-r8a7794", 0xee140000, "sdhi1",
++			&sdhi1_info),
++	AUXDATA_SCIFA(0,  0xe6c40000, gic_spi(144)), /* SCIFA0 */
++	AUXDATA_SCIFA(1,  0xe6c50000, gic_spi(145)), /* SCIFA1 */
++	AUXDATA_SCIFB(2,  0xe6c20000, gic_spi(148)), /* SCIFB0 */
++	AUXDATA_SCIFB(3,  0xe6c30000, gic_spi(149)), /* SCIFB1 */
++	AUXDATA_SCIFB(4,  0xe6ce0000, gic_spi(150)), /* SCIFB2 */
++	AUXDATA_SCIFA(5,  0xe6c60000, gic_spi(151)), /* SCIFA2 */
++	AUXDATA_SCIF(6,   0xe6e60000, gic_spi(152)), /* SCIF0 */
++	AUXDATA_SCIF(7,   0xe6e68000, gic_spi(153)), /* SCIF1 */
++	AUXDATA_HSCIF(8,  0xe62c0000, gic_spi(154)), /* HSCIF0 */
++	AUXDATA_HSCIF(9,  0xe62c8000, gic_spi(155)), /* HSCIF1 */
++	AUXDATA_SCIF(10,  0xe6e58000, gic_spi(22)), /* SCIF2 */
++	AUXDATA_SCIF(11,  0xe6ea8000, gic_spi(23)), /* SCIF3 */
++	AUXDATA_SCIF(12,  0xe6ee0000, gic_spi(24)), /* SCIF4 */
++	AUXDATA_SCIF(13,  0xe6ee8000, gic_spi(25)), /* SCIF5 */
++	AUXDATA_SCIFA(14, 0xe6c70000, gic_spi(29)), /* SCIFA3 */
++	AUXDATA_SCIFA(15, 0xe6c78000, gic_spi(30)), /* SCIFA4 */
++	AUXDATA_SCIFA(16, 0xe6c80000, gic_spi(31)), /* SCIFA5 */
++	AUXDATA_HSCIF(17, 0xe6cd0000, gic_spi(21)), /* HSCIF2 */
++	OF_DEV_AUXDATA("renesas,msiof-r8a7794", 0xe6e20000,
++		       "spi_r8a7794_msiof.0", &msiof0_info),
++	OF_DEV_AUXDATA("renesas,msiof-r8a7794", 0xe6e10000,
++		       "spi_r8a7794_msiof.1", &msiof1_info),
++	{},
++};
++
++static void __init silk_add_standard_devices(void)
++{
++	shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
++	shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
++	r8a7794_add_dt_devices();
++	silk_add_dmac_prototype();
++#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC)
++	silk_add_usb_dmac_prototype();
++#endif
++	of_platform_populate(NULL, of_default_bus_match_table,
++			     silk_auxdata_lookup, NULL);
++	silk_add_du_device();
++
++	platform_device_register_resndata(&platform_bus, "usb_phy_rcar_gen2",
++					  -1, usbhs_phy_resources,
++					  ARRAY_SIZE(usbhs_phy_resources),
++					  &usbhs_phy_pdata,
++					  sizeof(usbhs_phy_pdata));
++#if IS_ENABLED(CONFIG_USB_RENESAS_USBHS_UDC)
++	silk_register_usbhs();
++#else
++	silk_add_usb0_device();
++#endif
++	silk_add_usb1_device();
++	silk_add_rsnd_device();
++	silk_add_camera0_device();
++#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
++	silk_add_vsp1_devices();
++#endif
++	silk_add_msiof_device(spi_bus, ARRAY_SIZE(spi_bus));
++}
++
++static const char * const silk_boards_compat_dt[] __initconst = {
++	"renesas,silk",
++	"renesas,silk-reference",
++	NULL,
++};
++
++DT_MACHINE_START(SILK_DT, "silk")
++	.smp		= smp_ops(r8a7794_smp_ops),
++	.init_early	= r8a7794_init_early,
++	.init_time	= r8a7794_timer_init,
++	.init_machine	= silk_add_standard_devices,
++	.init_late	= shmobile_init_late,
++	.reserve	= rcar_gen2_reserve,
++	.restart	= silk_restart,
++	.dt_compat	= silk_boards_compat_dt,
++MACHINE_END
+-- 
+1.9.1
+