Merge remote-tracking branch 'cogent/v2.23.1' into sandbox/kingfisher_v2.23.1.20180427

Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>

 Conflicts:
	meta-rcar-gen3-adas/conf/layer.conf
	meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/ulcb.cfg
	meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend
	meta-rcar-gen3-adas/recipes-multimedia/pulseaudio/pulseaudio_8.0.bbappend

Change-Id: Ib0345634b8bec6a85357152138355d8f932bafc0

1 files changed, 0 insertions, 206 deletions

diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0051-arm64-dts-Gen3-view-boards-TYPE1-second-4-cameras.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0051-arm64-dts-Gen3-view-boards-TYPE1-second-4-cameras.patch
deleted file mode 100644
index a09c485..0000000
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0051-arm64-dts-Gen3-view-boards-TYPE1-second-4-cameras.patch
+++ /dev/null
@@ -1,206 +0,0 @@
-From d9ec2149ffc47fd2ea4ab5e9a503a3be7c6f09f5 Mon Sep 17 00:00:00 2001
-From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
-Date: Mon, 15 May 2017 19:18:06 +0300
-Subject: [PATCH] arm64: dts: Gen3 view boards: TYPE1 second 4 cameras
-
-This set 4 cameras to TYPE1 in DT
-
-Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
----
- arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts       | 8 ++++----
- arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-view.dts     | 8 ++++----
- arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x-view.dts | 8 ++++----
- arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts           | 8 ++++----
- arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-view.dts         | 8 ++++----
- arch/arm64/boot/dts/renesas/r8a7795-salvator-x-view.dts     | 8 ++++----
- 6 files changed, 24 insertions(+), 24 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
-index 8da87dd..d2e6f66 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
-+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
-@@ -989,22 +989,22 @@
- 				port@0 {
- 					max9286_des1ep0: endpoint@0 {
- 						max9271-addr = <0x50>;
--						dvp-order = <1>;
-+						dvp-order = <2>;
- 						remote-endpoint = <&ov106xx_in4>;
- 					};
- 					max9286_des1ep1: endpoint@1 {
- 						max9271-addr = <0x51>;
--						dvp-order = <1>;
-+						dvp-order = <2>;
- 						remote-endpoint = <&ov106xx_in5>;
- 					};
- 					max9286_des1ep2: endpoint@2 {
- 						max9271-addr = <0x52>;
--						dvp-order = <1>;
-+						dvp-order = <2>;
- 						remote-endpoint = <&ov106xx_in6>;
- 					};
- 					max9286_des1ep3: endpoint@3 {
- 						max9271-addr = <0x53>;
--						dvp-order = <1>;
-+						dvp-order = <2>;
- 						remote-endpoint = <&ov106xx_in7>;
- 					};
- 				};
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-view.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-view.dts
-index b36b9d8..e3a9414 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-view.dts
-+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-view.dts
-@@ -216,22 +216,22 @@
- 		port@0 {
- 			max9286_des1ep0: endpoint@0 {
- 				max9271-addr = <0x54>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in4>;
- 			};
- 			max9286_des1ep1: endpoint@1 {
- 				max9271-addr = <0x55>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in5>;
- 			};
- 			max9286_des1ep2: endpoint@2 {
- 				max9271-addr = <0x56>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in6>;
- 			};
- 			max9286_des1ep3: endpoint@3 {
- 				max9271-addr = <0x57>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in7>;
- 			};
- 		};
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x-view.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x-view.dts
-index c063899..2785fd7 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x-view.dts
-+++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x-view.dts
-@@ -230,22 +230,22 @@
- 		port@0 {
- 			max9286_des1ep0: endpoint@0 {
- 				max9271-addr = <0x54>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in4>;
- 			};
- 			max9286_des1ep1: endpoint@1 {
- 				max9271-addr = <0x55>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in5>;
- 			};
- 			max9286_des1ep2: endpoint@2 {
- 				max9271-addr = <0x56>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in6>;
- 			};
- 			max9286_des1ep3: endpoint@3 {
- 				max9271-addr = <0x57>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in7>;
- 			};
- 		};
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
-index b26d8e2..b8f8819 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
-+++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
-@@ -989,22 +989,22 @@
- 				port@0 {
- 					max9286_des1ep0: endpoint@0 {
- 						max9271-addr = <0x50>;
--						dvp-order = <1>;
-+						dvp-order = <2>;
- 						remote-endpoint = <&ov106xx_in4>;
- 					};
- 					max9286_des1ep1: endpoint@1 {
- 						max9271-addr = <0x51>;
--						dvp-order = <1>;
-+						dvp-order = <2>;
- 						remote-endpoint = <&ov106xx_in5>;
- 					};
- 					max9286_des1ep2: endpoint@2 {
- 						max9271-addr = <0x52>;
--						dvp-order = <1>;
-+						dvp-order = <2>;
- 						remote-endpoint = <&ov106xx_in6>;
- 					};
- 					max9286_des1ep3: endpoint@3 {
- 						max9271-addr = <0x53>;
--						dvp-order = <1>;
-+						dvp-order = <2>;
- 						remote-endpoint = <&ov106xx_in7>;
- 					};
- 				};
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-view.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-view.dts
-index a8b9eea..86ed4a8 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-view.dts
-+++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-view.dts
-@@ -216,22 +216,22 @@
- 		port@0 {
- 			max9286_des1ep0: endpoint@0 {
- 				max9271-addr = <0x54>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in4>;
- 			};
- 			max9286_des1ep1: endpoint@1 {
- 				max9271-addr = <0x55>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in5>;
- 			};
- 			max9286_des1ep2: endpoint@2 {
- 				max9271-addr = <0x56>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in6>;
- 			};
- 			max9286_des1ep3: endpoint@3 {
- 				max9271-addr = <0x57>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in7>;
- 			};
- 		};
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x-view.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x-view.dts
-index eb09ef0..37eabc0 100644
---- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x-view.dts
-+++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x-view.dts
-@@ -230,22 +230,22 @@
- 		port@0 {
- 			max9286_des1ep0: endpoint@0 {
- 				max9271-addr = <0x54>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in4>;
- 			};
- 			max9286_des1ep1: endpoint@1 {
- 				max9271-addr = <0x55>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in5>;
- 			};
- 			max9286_des1ep2: endpoint@2 {
- 				max9271-addr = <0x56>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in6>;
- 			};
- 			max9286_des1ep3: endpoint@3 {
- 				max9271-addr = <0x57>;
--				dvp-order = <1>;
-+				dvp-order = <2>;
- 				remote-endpoint = <&ov106xx_in7>;
- 			};
- 		};
--- 
-1.9.1
-