From 1dd26e7ff4bd7f9f5c4926ea3e10f0c56df04cc2 Mon Sep 17 00:00:00 2001
From: Yannick Gicquel <yannick.gicquel@iot.bzh>
Date: Wed, 7 Sep 2016 14:38:49 +0200
Subject: [PATCH] silk-reference: Add DRM_RCAR_DU_CONNECT_VSP configuration

Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh>
---
 arch/arm/mach-shmobile/board-silk-reference.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-silk-reference.c b/arch/arm/mach-shmobile/board-silk-reference.c
index d4c64fa..9195c0f 100644
--- a/arch/arm/mach-shmobile/board-silk-reference.c
+++ b/arch/arm/mach-shmobile/board-silk-reference.c
@@ -31,7 +31,8 @@
 #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)
+#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) && \
+!defined(CONFIG_DRM_RCAR_DU_CONNECT_VSP)
 #include <linux/platform_data/vsp1.h>
 #endif
 #include <linux/serial_sci.h>
@@ -91,10 +92,16 @@ static struct rcar_du_crtc_data silk_du_crtcs[] = {
 	{
 		.exclk = 148500000,
 		.init_conn_type = DRM_MODE_CONNECTOR_HDMIA,
+#ifdef CONFIG_DRM_RCAR_DU_CONNECT_VSP
+		.vsp = CONFIG_DRM_RCAR_DU0_USE_VSPDU_CH,
+#endif
 	},
 	{
 		.exclk = 74250000,
 		.init_conn_type = DRM_MODE_CONNECTOR_VGA,
+#ifdef CONFIG_DRM_RCAR_DU_CONNECT_VSP
+		.vsp = CONFIG_DRM_RCAR_DU1_USE_VSPDU_CH,
+#endif
 	},
 };
 
@@ -250,7 +257,8 @@ static const struct clk_name clk_names[] __initconst = {
 	{ "dvc1", "dvc.1", "rcar_sound" },
 	{ "vin0", NULL, "r8a7794-vin.0" },
 	{ "vsps", NULL, NULL },
-#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
+#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) && \
+!defined(CONFIG_DRM_RCAR_DU_CONNECT_VSP)
 	{ "vsp1-du0", NULL, "vsp1.2" },
 #else
 	{ "vsp1-du0", NULL, NULL },
@@ -821,7 +829,8 @@ static void __init silk_add_camera0_device(void)
 }
 
 /* VSP1 */
-#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
+#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) && \
+!defined(CONFIG_DRM_RCAR_DU_CONNECT_VSP)
 static const struct vsp1_platform_data silk_vsps_pdata __initconst = {
 	.features = 0,
 	.rpf_count = 5,
@@ -970,7 +979,8 @@ static void __init silk_add_standard_devices(void)
 	silk_add_usb1_device();
 	silk_add_rsnd_device();
 	silk_add_camera0_device();
-#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
+#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) && \
+!defined(CONFIG_DRM_RCAR_DU_CONNECT_VSP)
 	silk_add_vsp1_devices();
 #endif
 	silk_add_msiof_device(spi_bus, ARRAY_SIZE(spi_bus));
-- 
1.9.1