rcar-gen3: linux-renesas: Update Linux BSP to v3.9.6

This commit updates Linux BSP version to v3.9.6 for the following
changes:
[Audio driver]
- Fixup 6ch settings to 8ch. The rsnd need to use 8ch clock settings
  for 6ch for TDM.
- Avoid a potential deadlock.

[DMA Engine driver]
- With cyclic DMA residue 0 is valid.

[IPMMU driver]
- Remove cache snoop transaction for page table walk request.

[SD/MMC driver]
- Fix SCC error handling to avoid false positive CRC error.

[Thermal driver]
- Fix interrupt type.
- Disable interrupt in .remove function.
- Fix initial value of IRQCTL register.

[USB2.0 Host driver]
- Correct VBUS behavior at over-current.

[Kernel]
- [H/W Restriction No.123] The eMMC of R-Car M3 Ver.3.0 is restricted
  up to HS200 for H/W restriction by device tree.

(cherry picked from commit 77fdd4c4b8eac5673f9b6934f7e4e2c6c73ee6d3)

Change-Id: Ic34d5c12b797e2fa43c5b3e2edd128000c2b6f0f
Signed-off-by: Duy Dang <duy.dang.yw@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>

2 files changed, 31 insertions, 12 deletions

diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0006-ADSP-remove-HDMI-support-from-rcar-sound.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0006-ADSP-remove-HDMI-support-from-rcar-sound.patch
index f1a9f30..3f601b6 100644
--- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0006-ADSP-remove-HDMI-support-from-rcar-sound.patch
+++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0006-ADSP-remove-HDMI-support-from-rcar-sound.patch
@@ -1,15 +1,18 @@
-From 9ad46b0976a91a5de41ab62c3d0fe923857a8dda Mon Sep 17 00:00:00 2001
+From acd7751ebcce90a442588f37fc6731990b5e09ea Mon Sep 17 00:00:00 2001
 From: Nguyen Dang <nguyen.dang.wh@renesas.com>
 Date: Tue, 6 Nov 2018 11:46:25 +0700
-Subject: [PATCH 6/6] ADSP: remove HDMI support from rcar-sound
+Subject: [PATCH v2 6/6] ADSP: remove HDMI support from rcar-sound
 
 Signed-off-by: Nguyen Dang <nguyen.dang.wh@renesas.com>
+[takeshi.kihara.df: support for dt file separation by M3v3.0 SoC]
+Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts  | 6 ------
- arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 6 ------
- arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts  | 5 -----
- arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 5 -----
- 4 files changed, 22 deletions(-)
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts       | 6 ------
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts      | 6 ------
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts       | 5 -----
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts | 5 -----
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts      | 5 -----
+ 5 files changed, 27 deletions(-)
 
 diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 index 6928afbd8e06..b268afd7df85 100644
@@ -46,7 +49,7 @@ index 498f78875dbd..b6ec3036e9fd 100644
  	status = "okay";
  
 diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
-index 02a938b416d0..2dba6e8e627a 100644
+index cf92aa3939e3..4faf935c4a32 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 @@ -88,11 +88,6 @@
@@ -61,8 +64,24 @@ index 02a938b416d0..2dba6e8e627a 100644
  &hdmi0 {
  	status = "okay";
  
+diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts
+index 664dc9250bbb..13960f69b2f7 100644
+--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts
++++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs-2x4g.dts
+@@ -96,11 +96,6 @@
+ 		      "dclkin.0", "dclkin.1", "dclkin.2";
+ };
+ 
+-&sound_card {
+-	dais = <&rsnd_port0	/* ak4613 */
+-		&rsnd_port1>;	/* HDMI0  */
+-};
+-
+ &hdmi0 {
+ 	status = "okay";
+ 
 diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
-index bd66be180d6d..708bd634b5af 100644
+index 7d39dc96ac8a..1cd6f0463361 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts
 @@ -88,11 +88,6 @@
@@ -78,5 +97,5 @@ index bd66be180d6d..708bd634b5af 100644
  	status = "okay";
  
 -- 
-2.19.1
+2.21.0
 
diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb
index 393af01..f559fc2 100644
--- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb
+++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb
@@ -11,8 +11,8 @@ COMPATIBLE_MACHINE = "salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu"
 
 RENESAS_BSP_URL = " \
     git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-bsp.git"
-BRANCH = "v4.14.75-ltsi/rcar-3.9.4"
-SRCREV = "1f12f0466c7782ef7f44481ecf08db5e77448c7f"
+BRANCH = "v4.14.75-ltsi/rcar-3.9.6"
+SRCREV = "1d76a004d3a19367669b861559c1fbbf546b3065"
 
 SRC_URI = "${RENESAS_BSP_URL};protocol=git;nocheckout=1;branch=${BRANCH}"