recipes-kernel: bump to rcar-gen2-1.9.7

Change-Id: Iba9317f7f0a4549b2e86db3283be6c307cc3fb36
Signed-off-by: Yannick Gicquel <yannick.gicquel@iot.bzh>

4 files changed, 156 insertions, 4 deletions

diff --git a/meta-rcar-gen2/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb b/meta-rcar-gen2/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
index a1de59c..12d3592 100644
--- a/meta-rcar-gen2/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
+++ b/meta-rcar-gen2/recipes-kernel/linux-libc-headers/linux-libc-headers_3.10.bb
@@ -8,8 +8,8 @@ PV_append = "+git${SRCREV}"
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 RENESAS_BACKPORTS_URL="git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git"
-SRCREV = "b8ca8c397343f4233f9f68fc3a5bf8e1c9b88251"
-SRC_URI = "${RENESAS_BACKPORTS_URL};protocol=git;branch=bsp/v3.10.31-ltsi/rcar-gen2-1.9.2 \
+SRCREV = "165e12ce2d7839e755debbec78dfa43b54345275"
+SRC_URI = "${RENESAS_BACKPORTS_URL};protocol=git;branch=bsp/v3.10.31-ltsi/rcar-gen2-1.9.7 \
           file://scripts-Makefile.headersinst-install-headers-from-sc.patch \
           file://0001-kernel-add-support-for-gcc-5.patch \
 "
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-silk-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configura.patch b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-silk-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configura.patch
new file mode 100644
index 0000000..6eff1c3
--- /dev/null
+++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-silk-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configura.patch
@@ -0,0 +1,74 @@
+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
+
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0009-porter-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configu.patch b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0009-porter-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configu.patch
new file mode 100644
index 0000000..b712a19
--- /dev/null
+++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0009-porter-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configu.patch
@@ -0,0 +1,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
+
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb
index 51a091b..912345a 100644
--- a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb
+++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas_3.10.bb
@@ -10,8 +10,8 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 PV_append = "+git${SRCREV}"
 
 RENESAS_BACKPORTS_URL="git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-backport.git"
-SRCREV = "b8ca8c397343f4233f9f68fc3a5bf8e1c9b88251"
-SRC_URI = "${RENESAS_BACKPORTS_URL};protocol=git;branch=bsp/v3.10.31-ltsi/rcar-gen2-1.9.2 \
+SRCREV = "165e12ce2d7839e755debbec78dfa43b54345275"
+SRC_URI = "${RENESAS_BACKPORTS_URL};protocol=git;branch=bsp/v3.10.31-ltsi/rcar-gen2-1.9.7 \
 	file://0001-kernel-add-support-for-gcc-5.patch \
 	file://0001-arm-lager-Add-vmalloc-384M-to-bootargs-of-DTS.patch \
 	file://0001-arm-koelsch-Add-vmalloc-384M-to-bootargs-of-DTS.patch \
@@ -21,12 +21,14 @@ SRC_URI = "${RENESAS_BACKPORTS_URL};protocol=git;branch=bsp/v3.10.31-ltsi/rcar-g
 
 SRC_URI_append_porter = " \
 	file://0001-kernel-Silk-board-support.patch \
+	file://0002-silk-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configura.patch \
 	file://0002-kernel-silk-fix-ethernet-phy-irq.patch \
 	file://0003-kernel-silk-fix-sd-detect.patch \
 	file://0004-kernel-Revert-i2c-rcar-Support-ACK-by-HW-auto-restart-after-NACK.patch \
 	file://0006-Rcar-DU-add-RGB-connector.patch \
 	file://0007-SILK-add-i2c0.patch \
 	file://0008-Porter-board-support.patch \
+	file://0009-porter-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configu.patch \
 	file://0009-shmobile-add-atag-dtb-compat.patch \
 	file://0010-Silk-Add-missing-pins-handle-to-Eth.patch \
 	file://0011-Silk-Add-missing-DU-pins.patch \
@@ -52,12 +54,14 @@ SRC_URI_append_porter = " \
 
 SRC_URI_append_silk = " \
 	file://0001-kernel-Silk-board-support.patch \
+	file://0002-silk-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configura.patch \
 	file://0002-kernel-silk-fix-ethernet-phy-irq.patch \
 	file://0003-kernel-silk-fix-sd-detect.patch \
 	file://0004-kernel-Revert-i2c-rcar-Support-ACK-by-HW-auto-restart-after-NACK.patch \
 	file://0006-Rcar-DU-add-RGB-connector.patch \
 	file://0007-SILK-add-i2c0.patch \
 	file://0008-Porter-board-support.patch \
+	file://0009-porter-reference-Add-DRM_RCAR_DU_CONNECT_VSP-configu.patch \
 	file://0009-shmobile-add-atag-dtb-compat.patch \
 	file://0010-Silk-Add-missing-pins-handle-to-Eth.patch \
 	file://0011-Silk-Add-missing-DU-pins.patch \