1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
|
From 0a907ffb0598971a603eb0a4117cf251974c33b8 Mon Sep 17 00:00:00 2001
From: Yannick Gicquel <yannick.gicquel@iot.bzh>
Date: Wed, 7 Sep 2016 13:59:40 +0200
Subject: [PATCH] porter-reference: Add DRM_RCAR_DU_CONNECT_VSP configuration
Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh>
---
arch/arm/mach-shmobile/board-porter-reference.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-porter-reference.c b/arch/arm/mach-shmobile/board-porter-reference.c
index ae06151..75513cb 100644
--- a/arch/arm/mach-shmobile/board-porter-reference.c
+++ b/arch/arm/mach-shmobile/board-porter-reference.c
@@ -30,7 +30,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>
@@ -86,10 +87,16 @@ static struct rcar_du_crtc_data porter_du_crtcs[] = {
{
.exclk = 0, /* NoP */
.init_conn_type = DRM_MODE_CONNECTOR_LVDS,
+#ifdef CONFIG_DRM_RCAR_DU_CONNECT_VSP
+ .vsp = CONFIG_DRM_RCAR_DU0_USE_VSPDU_CH,
+#endif
},
{
.exclk = 0, /* NoP */
.init_conn_type = DRM_MODE_CONNECTOR_HDMIA,
+#ifdef CONFIG_DRM_RCAR_DU_CONNECT_VSP
+ .vsp = CONFIG_DRM_RCAR_DU1_USE_VSPDU_CH,
+#endif
},
};
@@ -139,7 +146,8 @@ static const struct clk_name clk_names[] __initconst = {
{ "hsusb", NULL, "usb_phy_rcar_gen2" },
{ "vin0", NULL, "r8a7791-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" },
{ "vsp1-du1", NULL, "vsp1.3" },
#else
@@ -661,7 +669,8 @@ static void __init porter_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 porter_vsps_pdata __initconst = {
.features = 0,
.rpf_count = 5,
@@ -850,7 +859,8 @@ static void __init porter_add_standard_devices(void)
porter_add_du_device();
porter_add_usb_devices();
porter_add_camera0_device();
-#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1)
+#if IS_ENABLED(CONFIG_VIDEO_RENESAS_VSP1) && \
+!defined(CONFIG_DRM_RCAR_DU_CONNECT_VSP)
porter_add_vsp1_devices();
#endif
porter_add_msiof_device(spi_bus, ARRAY_SIZE(spi_bus));
--
1.9.1
|
