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, 82 insertions, 10 deletions

diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend
index c4cad0f..e782c9f 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend
@@ -2,6 +2,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
 COMPATIBLE_MACHINE_eagle = "eagle"
 COMPATIBLE_MACHINE_v3msk = "v3msk"
+COMPATIBLE_MACHINE_condor = "condor"
+COMPATIBLE_MACHINE_v3mzf = "v3mzf"
+COMPATIBLE_MACHINE_v3hsk = "v3hsk"
 
 BRANCH = "v4.9/rcar-3.5.9"
 SRCREV = "2c20c9881d53f1b5c7a3ebf55bb83ec15902d0d0"
@@ -17,6 +20,8 @@ SRC_URI_remove = " \
 SRC_URI_append = " \
     ${@bb.utils.contains('MACHINE_FEATURES', 'h3ulcb-had', ' file://hyperflash.cfg', '', d)} \
     ${@base_conditional("SDHI_SEQ", "1", " file://sdhi_seq.cfg", "", d)} \
+    file://qspi.cfg \
+    file://imr.cfg \
     file://0001-spi-sh-msiof-fixes.patch \
     file://0002-spi-spidev-add-spi-gpio-into-spidev.patch \
     file://0003-spi-spi-gpio-fix-CPOL-mode.patch \
@@ -50,7 +55,6 @@ SRC_URI_append = " \
     file://0032-media-i2c-Add-ov5642-sensor.patch \
     file://0033-media-soc-camera-fix-parallel-i-f-in-VIN.patch \
     file://0034-media-soc_camera-Fix-VIDIOC_S_SELECTION-ioctl-miscal.patch \
-    file://0035-regulator-fixed-probe-after-i2c.patch \
     file://0040-arm64-dts-renesas-add-ADAS-boards.patch \
     file://0042-arm64-dts-renesas-r8a7795-es1-h3ulcb-disable-eMMC.patch \
     file://0043-arm64-dts-renesas-ulcb-use-versaclock-for-du-rgb-and-lvds.patch \
@@ -61,9 +65,8 @@ SRC_URI_append = " \
     ${@base_conditional("KF_ENABLE_MOST", "1", " file://0048-arm64-dts-renesas-ulcb-kf-enable-most.patch", "", d)} \
     file://0049-clk-r8a779x-add-IMP-clock.patch \
     file://0050-arm64-dts-renesas-r8a779x-add-IMP-nodes.patch \
-    ${@base_conditional("LVDSCAMERA_FIRST4_TYPE1", "1", " file://0050-arm64-dts-Gen3-view-boards-TYPE1-first-4-cameras.patch", "", d)} \
-    ${@base_conditional("LVDSCAMERA_SECOND4_TYPE1", "1", " file://0051-arm64-dts-Gen3-view-boards-TYPE1-second-4-cameras.patch", "", d)} \
-    ${@base_conditional("LVDSCAMERA_FIRST4_TYPE2", "1", " file://0052-arm64-dts-Gen3-view-boards-TYPE2-first-4-cameras.patch", "", d)} \
+    file://0051-arm64-renesas-r8a7798-Add-Renesas-R8A7798-SoC-suppor.patch \
+    file://0052-soc-renesas-rcar-sysc-Add-workaround-for-A3-PD-issue.patch \
     file://0062-IIO-lsm9ds0-add-IMU-driver.patch \
     file://0063-ASoC-PCM3168A-add-TDM-modes-merge-ADC-and-DAC.patch \
     file://0064-ADV7511-limit-maximum-pixelclock.patch \
@@ -72,7 +75,7 @@ SRC_URI_append = " \
     file://0068-drm-adv7511-use-smbus-to-retrieve-edid.patch \
     file://0070-clk-clk-5p49x-add-5P49V5925-chip.patch \
     file://0071-ASoC-add-dummy-device-for-WL18xx-PCM-audio.patch \
-    file://0072-usb-hub-disable-autosuspend-for-SMSC-hubs.patch \
+    file://0072-usb-hub-disable-autosuspend-for-SMSC-and-TI-hubs.patch \
     file://0073-MOST-dim2-add-device-tree-support.patch \
     file://0074-MOST-dim2-add-R-Car3-related-initialization.patch \
     file://0075-MOST-core-fix-memory-allocation-at-arm64.patch \
@@ -81,14 +84,45 @@ SRC_URI_append = " \
     file://0078-MOST-aim-fix-null-pointer-crash.patch \
     file://0079-Revert-dmaengine-rcar-dmac-use-TCRB-instead-of-TCR-f.patch \
     file://0082-gpio-pca953x-fix-interrupt-trigger.patch \
-    file://0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch \
-    file://0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch \
-"
-
-SRC_URI_append_r8a7797 = " \
+    file://0083-spi-Document-DT-bindings-for-SPI-controllers-in-slav.patch \
+    file://0084-spi-core-Add-support-for-registering-SPI-slave-contr.patch \
+    file://0085-spi-Document-SPI-slave-controller-support.patch \
+    file://0086-spi-sh-msiof-Add-slave-mode-support.patch \
+    file://0087-spi-slave-Add-SPI-slave-handler-reporting-uptime-at-.patch \
+    file://0088-spi-slave-Add-SPI-slave-handler-controlling-system-s.patch \
+    file://0089-spi-Generalize-SPI-master-to-controller.patch \
+    file://0090-pinctrl-sh-pfc-r8a7795-fix-ssi349_ctrl-name.patch \
     file://0103-gpu-drm-rcar-du-Extend-VSP1-DRM-interface.patch \
     file://0104-media-vsp1-extend-DRM-VSP1-interface.patch \
     file://0105-media-rcar-imr-IMR-driver-updates-for-raw-DL.patch \
+    file://0106-media-rcar-imr-Add-RSE-support.patch \
+    file://0107-V3H-device-tree-Add-VIP-devices-IRQs.patch \
+    file://0108-can-mcp251x-add-reset-gpio-support.patch \
+    file://0109-ASoC-R-Car-fix-incorrect-behavior-with-PulseAudio.patch \
+    file://0110-Renesas-clk-Add-RPC-clock-source.patch \
+    file://0111-Renesas-r8a7798-Add-RPC-clock.patch \
+    file://0112-Renesas-r8a7798-pinctrl-Add-RPC-pin-control.patch \
+    file://0113-Renesas-RPC-Add-RPC-driver.patch \
+    file://0114-R8A7798-dtsi-Add-RPC-node-to-dtsi.patch \
+    file://0115-R8A7798-condor-dts-Add-qspi-flash.patch \
+    file://0116-spi-nor-Add-s25fs512-flash-support.patch \
+    file://0117-spi-nor-Add-flash-array-support.patch \
+    file://0118-r8a7797-clk-Add-rpc-clock.patch \
+    file://0119-r8a7797-pinctrl-Add-qspi-pins.patch \
+    file://0120-r8a7797-dtsi-Add-rpc-node.patch \
+    file://0121-r8a7797-eagle-dts-Add-spi-flash-node.patch \
+    file://0122-r8a7797-v3msk-r8a7797-v3mzf-dts-Add-spi-flash-s25fs5.patch \
+    file://0123-V3HSK-dts-Add-qspi-node.patch \
+    file://0124-RPC-Hyperflash-Add-devicetree-support.patch \
+    file://0125-r8a7797-pinctrl-Add-pin-function-for-hyperflash.patch \
+    file://0126-r8a7798-pinctrl-Add-pin-function-for-hyperflash.patch \
+    file://0127-IMR-UIO-Driver-initial-version.patch \
+    file://0128-rcar_imr-v4l2-driver-Fix-module-support.patch \
+    file://0129-Add-cropping-handling-to-VSP-alpha-planes.patch \
+    file://0130-Add-RAW-sensors-MBUS-formats.patch \
+    file://0131-ARM64-dts-renesas-ulcb-Make-AK4613-sound-device-name.patch \
+    file://0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch \
+    file://0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch \
 "
 
 SRC_URI_append_h3ulcb = " file://ulcb.cfg"
@@ -96,6 +130,9 @@ SRC_URI_append_m3ulcb = " file://ulcb.cfg"
 SRC_URI_append_salvator-x = " file://salvator-x.cfg"
 SRC_URI_append_eagle = " file://eagle.cfg"
 SRC_URI_append_v3msk = " file://v3msk.cfg"
+SRC_URI_append_condor = " file://condor.cfg"
+SRC_URI_append_v3mzf = " file://v3mzf.cfg"
+SRC_URI_append_v3hsk = " file://v3hsk.cfg"
 
 KERNEL_DEVICETREE_append_h3ulcb = " \
     renesas/r8a7795-es1-h3ulcb-view.dtb \
@@ -126,13 +163,48 @@ KERNEL_DEVICETREE_append_salvator-x = " \
 "
 
 KERNEL_DEVICETREE_append_eagle = " \
+    renesas/r8a7797-es1-eagle.dtb \
+    renesas/r8a7797-es1-eagle-function.dtb \
     renesas/r8a7797-eagle.dtb \
     renesas/r8a7797-eagle-function.dtb \
 "
 
 KERNEL_DEVICETREE_append_v3msk = " \
+    renesas/r8a7797-es1-v3msk.dtb \
+    renesas/r8a7797-es1-v3msk-kf.dtb \
+    renesas/r8a7797-es1-v3msk-vbm.dtb \
+    renesas/r8a7797-es1-v3msk-vbm-v2.dtb \
+    renesas/r8a7797-es1-v3msk-view.dtb \
     renesas/r8a7797-v3msk.dtb \
     renesas/r8a7797-v3msk-kf.dtb \
     renesas/r8a7797-v3msk-vbm.dtb \
+    renesas/r8a7797-v3msk-vbm-v2.dtb \
+    renesas/r8a7797-v3msk-vbm-v2-isp.dtb \
     renesas/r8a7797-v3msk-view.dtb \
 "
+
+KERNEL_DEVICETREE_append_v3mzf = " \
+    renesas/r8a7797-v3mzf.dtb \
+"
+
+KERNEL_DEVICETREE_append_condor = " \
+    renesas/r8a7798-condor.dtb \
+"
+
+KERNEL_DEVICETREE_append_v3hsk = " \
+    renesas/r8a7798-v3hsk.dtb \
+    renesas/r8a7798-v3hsk-vbm.dtb \
+    renesas/r8a7798-v3hsk-vbm-v2.dtb \
+    renesas/r8a7798-v3hsk-vbm-v2-isp.dtb \
+"
+
+# Prefer V4L2 rcar_imr driver over UIO uio_imr
+KERNEL_MODULE_AUTOLOAD += "rcar_imr"
+KERNEL_MODULE_PROBECONF += "rcar_imr"
+KERNEL_MODULE_PROBECONF += "uio_imr"
+module_conf_uio_imr = 'blacklist uio_imr'
+
+# V3H VIP devices
+KERNEL_MODULE_AUTOLOAD_append_r8a7798 += " uio_pdrv_genirq"
+KERNEL_MODULE_PROBECONF_append_r8a7798 += " uio_pdrv_genirq"
+module_conf_uio_pdrv_genirq_r8a7798 = 'options uio_pdrv_genirq of_id="generic-uio"'