Merge remote-tracking branch 'origin/pyro' into eel

Signed-off-by: Tom Rini <trini@konsulko.com>

4 files changed, 52 insertions, 25 deletions

diff --git a/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bb b/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bb
deleted file mode 100644
index 3251662..0000000
--- a/meta-rcar-gen3-adas/recipes-bsp/ti-bt-firmware/ti-bt-firmware_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-SUMMARY = "Bluetooth firmare files for WL18xx combo modules"
-SECTION = "misc"
-
-LICENSE = "CLOSED"
-
-PE = "1"
-PV = "0.0"
-
-SRC_URI = "git://github.com/TI-ECS/bt-firmware.git;protocol=git "
-SRCREV = "169b2df5b968f0ede32ea9044859942fc220c435"
-
-S = "${WORKDIR}/git"
-
-CLEANBROKEN = "1"
-
-do_populate_lic[noexec] = "1"
-do_compile[noexec] = "1"
-do_configure[noexec] = "1"
-
-do_install() {
-	install -d  ${D}/lib/firmware/ti-connectivity/
-	cp *.bts ${D}/lib/firmware/ti-connectivity/
-}
-
-FILES_${PN} = "/lib/firmware/ti-connectivity/*"
\ No newline at end of file
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux-firmware/linux-firmware_git.bbappend b/meta-rcar-gen3-adas/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
new file mode 100644
index 0000000..c620ef4
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
@@ -0,0 +1,14 @@
+# Support additional firmware for WiLink8 modules
+#
+# TIInit_11.8.32.bts V4.2 is not in the linux-firmware repository.
+
+SRC_URI_append = " \
+     https://git.ti.com/ti-bt/service-packs/blobs/raw/3acb49e97179320cb7564d202d0dde23ad7bd0a2/initscripts/TIInit_11.8.32.bts \
+"
+
+SRC_URI[md5sum] = "b1e142773e8ef0537b93895ebe2fcae3"
+SRC_URI[sha256sum] = "962322c05857ad6b1fb81467bdfc59c125e04a6a8eaabf7f24b742ddd68c3bfa"
+
+do_install_append() {
+     install -m 644 ${WORKDIR}/TIInit_11.8.32.bts ${D}/lib/firmware/ti-connectivity/
+}
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch
new file mode 100644
index 0000000..31a66b7
--- /dev/null
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch
@@ -0,0 +1,34 @@
+From 9f2cf209ef8235f33683ca941fd0d7bdcca4078d Mon Sep 17 00:00:00 2001
+From: Matt Porter <mporter@konsulko.com>
+Date: Sun, 17 Dec 2017 21:44:41 -0500
+Subject: [PATCH] arm64: dts: renesas: disable r8a7796 hscif0 dma
+
+When streaming A2DP audio on WiLink8, DMA errors are
+seen from the rcar-dmac driver servicing hscif0. As
+a result, data corruption is seen by the UIM service
+managing the link to the Wilink8 device. This data
+corruption manifests as dropped frames and audibly as
+"skips" in the audio playback.
+
+Workaround this issue by disabling DMA for hscif0.
+
+Signed-off-by: Matt Porter <mporter@konsulko.com>
+---
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+index e3a5c25bc3da..dd97af4bdd60 100644
+--- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
++++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
+@@ -1282,7 +1282,6 @@
+ 				 <&scif_clk>;
+ 			clock-names = "fck", "brg_int", "scif_clk";
+ 			dmas = <&dmac1 0x31>, <&dmac1 0x30>;
+-			dma-names = "tx", "rx";
+ 			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ 			status = "disabled";
+ 		};
+-- 
+2.11.0
+
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 924e309..3cadae6 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
@@ -6,6 +6,9 @@ COMPATIBLE_MACHINE_v3msk = "v3msk"
 BRANCH = "v4.9/rcar-3.5.9"
 SRCREV = "2c20c9881d53f1b5c7a3ebf55bb83ec15902d0d0"
 
+KERNEL_MODULE_PROBECONF += "btwilink"
+module_conf_btwilink = "blacklist btwilink"
+
 SRC_URI_remove = " \
     file://0001-dmaengine-rcar-dmac-ensure-CHCR-DE-bit-is-actually-0.patch \
     file://0002-dmaengine-rcar-dmac-use-TCRB-instead-of-TCR-for-resi.patch \
@@ -81,6 +84,7 @@ SRC_URI_append = " \
     file://0080-dmaengine-rcar-dmac-ensure-CHCR-DE-bit-is-actually-0.patch \
     file://0081-dmaengine-rcar-dmac-use-TCRB-instead-of-TCR-for-resi.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 = " \