Update KERNEL_VERSION to 4.1.524.1-ltsi

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

27 files changed, 96 insertions, 167 deletions

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 4b4d80f46d051c..4ee3ebb1f9b01c 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-4.1.42
+4.1.52
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index e9fcb81eb0102b..b7719e7750b47c 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 1
- SUBLEVEL = 51
+ SUBLEVEL = 52
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Series 4800
diff --git a/patches.misc/mtd-nand-support-for-toshiba-benand-built-in-ecc-nand.patch b/patches.misc/mtd-nand-support-for-toshiba-benand-built-in-ecc-nand.patch
index a08b9bd3203a1b..81a25abd17c81c 100644
--- a/patches.misc/mtd-nand-support-for-toshiba-benand-built-in-ecc-nand.patch
+++ b/patches.misc/mtd-nand-support-for-toshiba-benand-built-in-ecc-nand.patch
@@ -75,7 +75,7 @@ Signed-off-by: KOBAYASHI Yoshitake <yoshitake.kobayashi@toshiba.co.jp>
  #include <linux/interrupt.h>
  #include <linux/bitops.h>
  #include <linux/leds.h>
-@@ -3532,8 +3533,13 @@ static void nand_decode_ext_id(struct mt
+@@ -3537,8 +3538,13 @@ static void nand_decode_ext_id(struct mt
  		if (id_len >= 6 && id_data[0] == NAND_MFR_TOSHIBA &&
  				nand_is_slc(chip) &&
  				(id_data[5] & 0x7) == 0x6 /* 24nm */ &&
@@ -91,7 +91,7 @@ Signed-off-by: KOBAYASHI Yoshitake <yoshitake.kobayashi@toshiba.co.jp>
  		}
  
  	}
-@@ -4081,6 +4087,26 @@ int nand_scan_tail(struct mtd_info *mtd)
+@@ -4086,6 +4092,26 @@ int nand_scan_tail(struct mtd_info *mtd)
  		}
  		break;
  
diff --git a/patches.renesas/0015-ARM-shmobile-r8a7790-Remove-MSIOF-address-from-devic.patch b/patches.renesas/0015-ARM-shmobile-r8a7790-Remove-MSIOF-address-from-devic.patch
index 44769f4276d26a..c0c0521f6a34ff 100644
--- a/patches.renesas/0015-ARM-shmobile-r8a7790-Remove-MSIOF-address-from-devic.patch
+++ b/patches.renesas/0015-ARM-shmobile-r8a7790-Remove-MSIOF-address-from-devic.patch
@@ -14,14 +14,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit c7d1f08a0c91ad9796d6d1fac8eb913e8a6d4288)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi | 8 ++++----
+ arch/arm/boot/dts/r8a7790.dtsi |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index a81cfda0872f..22e73906ec88 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
-@@ -1282,7 +1282,7 @@
+@@ -1285,7 +1285,7 @@
  
  	msiof0: spi@e6e20000 {
  		compatible = "renesas,msiof-r8a7790";
@@ -30,7 +28,7 @@ index a81cfda0872f..22e73906ec88 100644
  		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp0_clks R8A7790_CLK_MSIOF0>;
  		dmas = <&dmac0 0x51>, <&dmac0 0x52>;
-@@ -1294,7 +1294,7 @@
+@@ -1297,7 +1297,7 @@
  
  	msiof1: spi@e6e10000 {
  		compatible = "renesas,msiof-r8a7790";
@@ -39,7 +37,7 @@ index a81cfda0872f..22e73906ec88 100644
  		interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp2_clks R8A7790_CLK_MSIOF1>;
  		dmas = <&dmac0 0x55>, <&dmac0 0x56>;
-@@ -1306,7 +1306,7 @@
+@@ -1309,7 +1309,7 @@
  
  	msiof2: spi@e6e00000 {
  		compatible = "renesas,msiof-r8a7790";
@@ -48,7 +46,7 @@ index a81cfda0872f..22e73906ec88 100644
  		interrupts = <0 158 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp2_clks R8A7790_CLK_MSIOF2>;
  		dmas = <&dmac0 0x41>, <&dmac0 0x42>;
-@@ -1318,7 +1318,7 @@
+@@ -1321,7 +1321,7 @@
  
  	msiof3: spi@e6c90000 {
  		compatible = "renesas,msiof-r8a7790";
@@ -57,6 +55,3 @@ index a81cfda0872f..22e73906ec88 100644
  		interrupts = <0 159 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp2_clks R8A7790_CLK_MSIOF3>;
  		dmas = <&dmac0 0x45>, <&dmac0 0x46>;
--- 
-2.6.2
-
diff --git a/patches.renesas/0016-ARM-shmobile-r8a7791-Remove-MSIOF-address-from-devic.patch b/patches.renesas/0016-ARM-shmobile-r8a7791-Remove-MSIOF-address-from-devic.patch
index 49ee0694e265e3..48ff97736f7b85 100644
--- a/patches.renesas/0016-ARM-shmobile-r8a7791-Remove-MSIOF-address-from-devic.patch
+++ b/patches.renesas/0016-ARM-shmobile-r8a7791-Remove-MSIOF-address-from-devic.patch
@@ -14,12 +14,10 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit cb6d08a2b61fc0025a0148d06b71b8a7d0920e98)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +-
- arch/arm/boot/dts/r8a7791.dtsi                     | 6 +++---
+ Documentation/devicetree/bindings/spi/sh-msiof.txt |    2 +-
+ arch/arm/boot/dts/r8a7791.dtsi                     |    6 +++---
  2 files changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/spi/sh-msiof.txt b/Documentation/devicetree/bindings/spi/sh-msiof.txt
-index 4c388bb2f0a2..8f771441be60 100644
 --- a/Documentation/devicetree/bindings/spi/sh-msiof.txt
 +++ b/Documentation/devicetree/bindings/spi/sh-msiof.txt
 @@ -60,7 +60,7 @@ Example:
@@ -31,11 +29,9 @@ index 4c388bb2f0a2..8f771441be60 100644
  		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;
  		dmas = <&dmac0 0x51>, <&dmac0 0x52>;
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index 20ab76680884..d2c41ad701cc 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
-@@ -1297,7 +1297,7 @@
+@@ -1300,7 +1300,7 @@
  
  	msiof0: spi@e6e20000 {
  		compatible = "renesas,msiof-r8a7791";
@@ -44,7 +40,7 @@ index 20ab76680884..d2c41ad701cc 100644
  		interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;
  		dmas = <&dmac0 0x51>, <&dmac0 0x52>;
-@@ -1309,7 +1309,7 @@
+@@ -1312,7 +1312,7 @@
  
  	msiof1: spi@e6e10000 {
  		compatible = "renesas,msiof-r8a7791";
@@ -53,7 +49,7 @@ index 20ab76680884..d2c41ad701cc 100644
  		interrupts = <0 157 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp2_clks R8A7791_CLK_MSIOF1>;
  		dmas = <&dmac0 0x55>, <&dmac0 0x56>;
-@@ -1321,7 +1321,7 @@
+@@ -1324,7 +1324,7 @@
  
  	msiof2: spi@e6e00000 {
  		compatible = "renesas,msiof-r8a7791";
@@ -62,6 +58,3 @@ index 20ab76680884..d2c41ad701cc 100644
  		interrupts = <0 158 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp2_clks R8A7791_CLK_MSIOF2>;
  		dmas = <&dmac0 0x41>, <&dmac0 0x42>;
--- 
-2.6.2
-
diff --git a/patches.renesas/0023-ARM-shmobile-r8a7790-dtsi-Use-generic-names-for-devi.patch b/patches.renesas/0023-ARM-shmobile-r8a7790-dtsi-Use-generic-names-for-devi.patch
index 1aba76b2c81a00..e7ccf800df887e 100644
--- a/patches.renesas/0023-ARM-shmobile-r8a7790-dtsi-Use-generic-names-for-devi.patch
+++ b/patches.renesas/0023-ARM-shmobile-r8a7790-dtsi-Use-generic-names-for-devi.patch
@@ -11,14 +11,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit b694e3807b5b12273ba057e8cfcf82c2331606e0)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi | 2 +-
+ arch/arm/boot/dts/r8a7790.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index 22e73906ec88..c9055e39b8bb 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
-@@ -1451,7 +1451,7 @@
+@@ -1454,7 +1454,7 @@
  		status = "disabled";
  	};
  
@@ -27,6 +25,3 @@ index 22e73906ec88..c9055e39b8bb 100644
  		/*
  		 * #sound-dai-cells is required
  		 *
--- 
-2.6.2
-
diff --git a/patches.renesas/0024-ARM-shmobile-r8a7791-dtsi-Use-generic-names-for-devi.patch b/patches.renesas/0024-ARM-shmobile-r8a7791-dtsi-Use-generic-names-for-devi.patch
index f73ee5ed14cb2c..ba08f667c56e97 100644
--- a/patches.renesas/0024-ARM-shmobile-r8a7791-dtsi-Use-generic-names-for-devi.patch
+++ b/patches.renesas/0024-ARM-shmobile-r8a7791-dtsi-Use-generic-names-for-devi.patch
@@ -11,14 +11,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 6c63e07dcc2e941288d18e3fe9b448265f9ca9d0)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791.dtsi | 2 +-
+ arch/arm/boot/dts/r8a7791.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index d2c41ad701cc..30e1e13a228f 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
-@@ -1494,7 +1494,7 @@
+@@ -1497,7 +1497,7 @@
  		status = "disabled";
  	};
  
@@ -27,6 +25,3 @@ index d2c41ad701cc..30e1e13a228f 100644
  		/*
  		 * #sound-dai-cells is required
  		 *
--- 
-2.6.2
-
diff --git a/patches.renesas/0066-pinctrl-fix-confusing-debug-message-in-pinctrl_regis.patch b/patches.renesas/0066-pinctrl-fix-confusing-debug-message-in-pinctrl_regis.patch
index a189024339e068..17fcd47ce06da4 100644
--- a/patches.renesas/0066-pinctrl-fix-confusing-debug-message-in-pinctrl_regis.patch
+++ b/patches.renesas/0066-pinctrl-fix-confusing-debug-message-in-pinctrl_regis.patch
@@ -16,14 +16,12 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 (cherry picked from commit 7e9236ff3d92ec326f29a20d86add10f1ff4e9b3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/pinctrl/core.c | 2 +-
+ drivers/pinctrl/core.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
-index 5b4e6897af22..700935097d03 100644
 --- a/drivers/pinctrl/core.c
 +++ b/drivers/pinctrl/core.c
-@@ -1115,7 +1115,7 @@ int pinctrl_register_map(struct pinctrl_map const *maps, unsigned num_maps,
+@@ -1125,7 +1125,7 @@ int pinctrl_register_map(struct pinctrl_
  	int i, ret;
  	struct pinctrl_maps *maps_node;
  
@@ -32,6 +30,3 @@ index 5b4e6897af22..700935097d03 100644
  
  	/* First sanity check the new mapping */
  	for (i = 0; i < num_maps; i++) {
--- 
-2.6.2
-
diff --git a/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch b/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
index 7f1d7e503a358f..5675e48a1fce79 100644
--- a/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
+++ b/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
@@ -156,7 +156,7 @@ Conflicts:
  	return 0;
 --- a/drivers/pinctrl/core.c
 +++ b/drivers/pinctrl/core.c
-@@ -1704,14 +1704,14 @@ struct pinctrl_dev *pinctrl_register(str
+@@ -1714,14 +1714,14 @@ struct pinctrl_dev *pinctrl_register(str
  	int ret;
  
  	if (!pctldesc)
@@ -174,7 +174,7 @@ Conflicts:
  	}
  
  	/* Initialize pin control device struct */
-@@ -1724,20 +1724,23 @@ struct pinctrl_dev *pinctrl_register(str
+@@ -1734,20 +1734,23 @@ struct pinctrl_dev *pinctrl_register(str
  	mutex_init(&pctldev->mutex);
  
  	/* check core ops for sanity */
@@ -201,7 +201,7 @@ Conflicts:
  			goto out_err;
  	}
  
-@@ -1783,7 +1786,7 @@ struct pinctrl_dev *pinctrl_register(str
+@@ -1793,7 +1796,7 @@ struct pinctrl_dev *pinctrl_register(str
  out_err:
  	mutex_destroy(&pctldev->mutex);
  	kfree(pctldev);
diff --git a/patches.renesas/0098-ASoC-rsnd-tidyup-SSI-parent-related-function-macro-n.patch b/patches.renesas/0098-ASoC-rsnd-tidyup-SSI-parent-related-function-macro-n.patch
index 6bba9f8637b0f3..37361a8cbe4277 100644
--- a/patches.renesas/0098-ASoC-rsnd-tidyup-SSI-parent-related-function-macro-n.patch
+++ b/patches.renesas/0098-ASoC-rsnd-tidyup-SSI-parent-related-function-macro-n.patch
@@ -53,7 +53,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  			else
  				rsnd_ssi_master_clk_stop(ssi);
  		}
-@@ -599,7 +603,7 @@ int rsnd_ssi_is_pin_sharing(struct rsnd_
+@@ -606,7 +610,7 @@ int rsnd_ssi_is_pin_sharing(struct rsnd_
  	return !!(rsnd_ssi_mode_flags(ssi) & RSND_SSI_CLK_PIN_SHARE);
  }
  
@@ -62,7 +62,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  {
  	if (!rsnd_ssi_is_pin_sharing(&ssi->mod))
  		return;
-@@ -733,7 +737,7 @@ int rsnd_ssi_probe(struct platform_devic
+@@ -740,7 +744,7 @@ int rsnd_ssi_probe(struct platform_devic
  		if (ret)
  			return ret;
  
diff --git a/patches.renesas/0099-ASoC-rsnd-make-sure-SSI-parent-child-uses-same-numbe.patch b/patches.renesas/0099-ASoC-rsnd-make-sure-SSI-parent-child-uses-same-numbe.patch
index 78e6b9fb3471ed..0adf0affe7df59 100644
--- a/patches.renesas/0099-ASoC-rsnd-make-sure-SSI-parent-child-uses-same-numbe.patch
+++ b/patches.renesas/0099-ASoC-rsnd-make-sure-SSI-parent-child-uses-same-numbe.patch
@@ -70,7 +70,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  static void rsnd_ssi_record_error(struct rsnd_ssi *ssi, u32 status)
  {
  	/* under/over flow error */
-@@ -461,6 +493,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_
+@@ -468,6 +500,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_
  	.quit	= rsnd_ssi_quit,
  	.start	= rsnd_ssi_start,
  	.stop	= rsnd_ssi_stop,
@@ -78,7 +78,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  };
  
  static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
-@@ -570,6 +603,7 @@ static struct rsnd_mod_ops rsnd_ssi_dma_
+@@ -577,6 +610,7 @@ static struct rsnd_mod_ops rsnd_ssi_dma_
  	.start	= rsnd_ssi_dma_start,
  	.stop	= rsnd_ssi_dma_stop,
  	.fallback = rsnd_ssi_fallback,
diff --git a/patches.renesas/0106-ASoC-rsnd-spin-lock-for-interrupt-handler.patch b/patches.renesas/0106-ASoC-rsnd-spin-lock-for-interrupt-handler.patch
index c8958ad99eff97..429bcc232bb577 100644
--- a/patches.renesas/0106-ASoC-rsnd-spin-lock-for-interrupt-handler.patch
+++ b/patches.renesas/0106-ASoC-rsnd-spin-lock-for-interrupt-handler.patch
@@ -142,7 +142,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	/* PIO only */
  	if (!is_dma && (status & DIRQ)) {
-@@ -467,6 +472,9 @@ static irqreturn_t rsnd_ssi_interrupt(in
+@@ -474,6 +479,9 @@ static irqreturn_t rsnd_ssi_interrupt(in
  
  	rsnd_ssi_record_error(ssi, status);
  
diff --git a/patches.renesas/0108-ASoC-rsnd-don-t-care-under-over-run-error-when-PIO.patch b/patches.renesas/0108-ASoC-rsnd-don-t-care-under-over-run-error-when-PIO.patch
index d7b1bc3d357ecf..e92a82d90b4a3d 100644
--- a/patches.renesas/0108-ASoC-rsnd-don-t-care-under-over-run-error-when-PIO.patch
+++ b/patches.renesas/0108-ASoC-rsnd-don-t-care-under-over-run-error-when-PIO.patch
@@ -43,7 +43,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	rsnd_mod_write(&ssi->mod, SSICR, cr);
  
-@@ -453,8 +455,8 @@ static irqreturn_t rsnd_ssi_interrupt(in
+@@ -460,8 +462,8 @@ static irqreturn_t rsnd_ssi_interrupt(in
  		rsnd_dai_pointer_update(io, sizeof(*buf));
  	}
  
diff --git a/patches.renesas/0109-ASoC-rsnd-don-t-call-snd_pcm_period_elapsed-under-sp.patch b/patches.renesas/0109-ASoC-rsnd-don-t-call-snd_pcm_period_elapsed-under-sp.patch
index 6d2fc2e6cc1282..3f34f4ec9e695c 100644
--- a/patches.renesas/0109-ASoC-rsnd-don-t-call-snd_pcm_period_elapsed-under-sp.patch
+++ b/patches.renesas/0109-ASoC-rsnd-don-t-call-snd_pcm_period_elapsed-under-sp.patch
@@ -116,16 +116,16 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	spin_lock(&priv->lock);
  
-@@ -452,7 +453,7 @@ static irqreturn_t rsnd_ssi_interrupt(in
+@@ -459,7 +460,7 @@ static irqreturn_t rsnd_ssi_interrupt(in
  		else
- 			*buf = rsnd_mod_read(mod, SSIRDR);
+ 			*buf = (rsnd_mod_read(mod, SSIRDR) >> shift);
  
 -		rsnd_dai_pointer_update(io, sizeof(*buf));
 +		elapsed = rsnd_dai_pointer_update(io, sizeof(*buf));
  	}
  
  	/* DMA only */
-@@ -477,6 +478,9 @@ static irqreturn_t rsnd_ssi_interrupt(in
+@@ -484,6 +485,9 @@ static irqreturn_t rsnd_ssi_interrupt(in
  rsnd_ssi_interrupt_out:
  	spin_unlock(&priv->lock);
  
diff --git a/patches.renesas/0119-ASoC-rsnd-rsnd_mod-has-rsnd_priv.patch b/patches.renesas/0119-ASoC-rsnd-rsnd_mod-has-rsnd_priv.patch
index 28f9fd91f959d3..42bc6e3321dbe7 100644
--- a/patches.renesas/0119-ASoC-rsnd-rsnd_mod-has-rsnd_priv.patch
+++ b/patches.renesas/0119-ASoC-rsnd-rsnd_mod-has-rsnd_priv.patch
@@ -95,7 +95,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	}
 --- a/sound/soc/sh/rcar/ssi.c
 +++ b/sound/soc/sh/rcar/ssi.c
-@@ -783,7 +783,7 @@ int rsnd_ssi_probe(struct platform_devic
+@@ -790,7 +790,7 @@ int rsnd_ssi_probe(struct platform_devic
  		else if (rsnd_ssi_pio_available(ssi))
  			ops = &rsnd_ssi_pio_ops;
  
diff --git a/patches.renesas/0120-ASoC-rsnd-adds-struct-rsnd_dai_stream-as-on-each-fuc.patch b/patches.renesas/0120-ASoC-rsnd-adds-struct-rsnd_dai_stream-as-on-each-fuc.patch
index 9753bf26ed1434..9d5e17fa71b892 100644
--- a/patches.renesas/0120-ASoC-rsnd-adds-struct-rsnd_dai_stream-as-on-each-fuc.patch
+++ b/patches.renesas/0120-ASoC-rsnd-adds-struct-rsnd_dai_stream-as-on-each-fuc.patch
@@ -309,7 +309,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  			 struct rsnd_priv *priv)
  {
  	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-@@ -466,9 +470,9 @@ static irqreturn_t rsnd_ssi_interrupt(in
+@@ -473,9 +477,9 @@ static irqreturn_t rsnd_ssi_interrupt(in
  		dev_dbg(dev, "%s[%d] restart\n",
  			rsnd_mod_name(mod), rsnd_mod_id(mod));
  
@@ -321,7 +321,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  		else
  			dev_warn(dev, "no more SSI restart\n");
  	}
-@@ -488,6 +492,7 @@ rsnd_ssi_interrupt_out:
+@@ -495,6 +499,7 @@ rsnd_ssi_interrupt_out:
   *		SSI PIO
   */
  static int rsnd_ssi_pio_probe(struct rsnd_mod *mod,
@@ -329,7 +329,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  			      struct rsnd_priv *priv)
  {
  	struct device *dev = rsnd_priv_to_dev(priv);
-@@ -513,6 +518,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_
+@@ -520,6 +525,7 @@ static struct rsnd_mod_ops rsnd_ssi_pio_
  };
  
  static int rsnd_ssi_dma_probe(struct rsnd_mod *mod,
@@ -337,7 +337,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  			      struct rsnd_priv *priv)
  {
  	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-@@ -535,6 +541,7 @@ static int rsnd_ssi_dma_probe(struct rsn
+@@ -542,6 +548,7 @@ static int rsnd_ssi_dma_probe(struct rsn
  }
  
  static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
@@ -345,7 +345,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  			       struct rsnd_priv *priv)
  {
  	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
-@@ -550,6 +557,7 @@ static int rsnd_ssi_dma_remove(struct rs
+@@ -557,6 +564,7 @@ static int rsnd_ssi_dma_remove(struct rs
  }
  
  static int rsnd_ssi_fallback(struct rsnd_mod *mod,
@@ -353,7 +353,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  			     struct rsnd_priv *priv)
  {
  	struct device *dev = rsnd_priv_to_dev(priv);
-@@ -570,23 +578,25 @@ static int rsnd_ssi_fallback(struct rsnd
+@@ -577,23 +585,25 @@ static int rsnd_ssi_fallback(struct rsnd
  }
  
  static int rsnd_ssi_dma_start(struct rsnd_mod *mod,
diff --git a/patches.renesas/0123-ASoC-rsnd-don-t-use-rsnd_mod_to_io-on-rsnd_dma_xxx.patch b/patches.renesas/0123-ASoC-rsnd-don-t-use-rsnd_mod_to_io-on-rsnd_dma_xxx.patch
index d61c7fa9ab2d2e..15852c76bc5bb8 100644
--- a/patches.renesas/0123-ASoC-rsnd-don-t-use-rsnd_mod_to_io-on-rsnd_dma_xxx.patch
+++ b/patches.renesas/0123-ASoC-rsnd-don-t-use-rsnd_mod_to_io-on-rsnd_dma_xxx.patch
@@ -471,7 +471,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  }
 --- a/sound/soc/sh/rcar/ssi.c
 +++ b/sound/soc/sh/rcar/ssi.c
-@@ -534,7 +534,7 @@ static int rsnd_ssi_dma_probe(struct rsn
+@@ -541,7 +541,7 @@ static int rsnd_ssi_dma_probe(struct rsn
  		return ret;
  
  	ret = rsnd_dma_init(
@@ -480,7 +480,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  		dma_id);
  
  	return ret;
-@@ -548,7 +548,7 @@ static int rsnd_ssi_dma_remove(struct rs
+@@ -555,7 +555,7 @@ static int rsnd_ssi_dma_remove(struct rs
  	struct device *dev = rsnd_priv_to_dev(priv);
  	int irq = ssi->info->irq;
  
@@ -489,7 +489,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	/* PIO will request IRQ again */
  	devm_free_irq(dev, irq, ssi);
-@@ -583,7 +583,7 @@ static int rsnd_ssi_dma_start(struct rsn
+@@ -590,7 +590,7 @@ static int rsnd_ssi_dma_start(struct rsn
  {
  	struct rsnd_dma *dma = rsnd_mod_to_dma(mod);
  
@@ -498,7 +498,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	rsnd_ssi_start(mod, io, priv);
  
-@@ -598,15 +598,15 @@ static int rsnd_ssi_dma_stop(struct rsnd
+@@ -605,15 +605,15 @@ static int rsnd_ssi_dma_stop(struct rsnd
  
  	rsnd_ssi_stop(mod, io, priv);
  
diff --git a/patches.renesas/0124-ASoC-rsnd-don-t-use-rsnd_mod_to_io-on-rsnd_ssi_xxx.patch b/patches.renesas/0124-ASoC-rsnd-don-t-use-rsnd_mod_to_io-on-rsnd_ssi_xxx.patch
index e7ded3feaa9818..2dd77fc501c278 100644
--- a/patches.renesas/0124-ASoC-rsnd-don-t-use-rsnd_mod_to_io-on-rsnd_ssi_xxx.patch
+++ b/patches.renesas/0124-ASoC-rsnd-don-t-use-rsnd_mod_to_io-on-rsnd_ssi_xxx.patch
@@ -110,7 +110,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	int is_dma = rsnd_ssi_is_dma_mode(mod);
  	u32 status;
  	bool elapsed = false;
-@@ -484,6 +481,13 @@ rsnd_ssi_interrupt_out:
+@@ -491,6 +488,13 @@ rsnd_ssi_interrupt_out:
  
  	if (elapsed)
  		rsnd_dai_period_elapsed(io);
@@ -124,7 +124,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	return IRQ_HANDLED;
  }
-@@ -502,7 +506,7 @@ static int rsnd_ssi_pio_probe(struct rsn
+@@ -509,7 +513,7 @@ static int rsnd_ssi_pio_probe(struct rsn
  	ret = devm_request_irq(dev, ssi->info->irq,
  			       rsnd_ssi_interrupt,
  			       IRQF_SHARED,
@@ -133,7 +133,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	return ret;
  }
-@@ -529,7 +533,7 @@ static int rsnd_ssi_dma_probe(struct rsn
+@@ -536,7 +540,7 @@ static int rsnd_ssi_dma_probe(struct rsn
  	ret = devm_request_irq(dev, ssi->info->irq,
  			       rsnd_ssi_interrupt,
  			       IRQF_SHARED,
@@ -142,7 +142,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	if (ret)
  		return ret;
  
-@@ -610,7 +614,7 @@ static struct dma_chan *rsnd_ssi_dma_req
+@@ -617,7 +621,7 @@ static struct dma_chan *rsnd_ssi_dma_req
  	int is_play = rsnd_io_is_play(io);
  	char *name;
  
diff --git a/patches.renesas/0191-ARM-shmobile-r8a7790-Add-Audio-CTU-support-on-DTSI.patch b/patches.renesas/0191-ARM-shmobile-r8a7790-Add-Audio-CTU-support-on-DTSI.patch
index 856516a919f21b..3c3684a1bbbe4c 100644
--- a/patches.renesas/0191-ARM-shmobile-r8a7790-Add-Audio-CTU-support-on-DTSI.patch
+++ b/patches.renesas/0191-ARM-shmobile-r8a7790-Add-Audio-CTU-support-on-DTSI.patch
@@ -9,15 +9,13 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit a7163784961e513a6d8c60b264737af623d1f33c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi            | 16 ++++++++++++++++
- include/dt-bindings/clock/r8a7790-clock.h |  2 ++
+ arch/arm/boot/dts/r8a7790.dtsi            |   16 ++++++++++++++++
+ include/dt-bindings/clock/r8a7790-clock.h |    2 ++
  2 files changed, 18 insertions(+)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index 3ae0c3bfb9b9..6aa1d759690b 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
-@@ -1303,6 +1303,7 @@
+@@ -1306,6 +1306,7 @@
  				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
  				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
  				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
@@ -25,7 +23,7 @@ index 3ae0c3bfb9b9..6aa1d759690b 100644
  				<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>;
  
  			#clock-cells = <1>;
-@@ -1312,6 +1313,7 @@
+@@ -1315,6 +1316,7 @@
  				R8A7790_CLK_SSI4 R8A7790_CLK_SSI3 R8A7790_CLK_SSI2 R8A7790_CLK_SSI1 R8A7790_CLK_SSI0
  				R8A7790_CLK_SCU_ALL
  				R8A7790_CLK_SCU_DVC1 R8A7790_CLK_SCU_DVC0
@@ -33,7 +31,7 @@ index 3ae0c3bfb9b9..6aa1d759690b 100644
  				R8A7790_CLK_SCU_SRC9 R8A7790_CLK_SCU_SRC8 R8A7790_CLK_SCU_SRC7 R8A7790_CLK_SCU_SRC6 R8A7790_CLK_SCU_SRC5
  				R8A7790_CLK_SCU_SRC4 R8A7790_CLK_SCU_SRC3 R8A7790_CLK_SCU_SRC2 R8A7790_CLK_SCU_SRC1 R8A7790_CLK_SCU_SRC0
  			>;
-@@ -1321,6 +1323,7 @@
+@@ -1324,6 +1326,7 @@
  				"ssi4", "ssi3", "ssi2", "ssi1", "ssi0",
  				"scu-all",
  				"scu-dvc1", "scu-dvc0",
@@ -41,7 +39,7 @@ index 3ae0c3bfb9b9..6aa1d759690b 100644
  				"scu-src9", "scu-src8", "scu-src7", "scu-src6", "scu-src5",
  				"scu-src4", "scu-src3", "scu-src2", "scu-src1", "scu-src0";
  		};
-@@ -1536,6 +1539,7 @@
+@@ -1539,6 +1542,7 @@
  			<&mstp10_clks R8A7790_CLK_SCU_SRC5>, <&mstp10_clks R8A7790_CLK_SCU_SRC4>,
  			<&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,
  			<&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,
@@ -49,7 +47,7 @@ index 3ae0c3bfb9b9..6aa1d759690b 100644
  			<&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,
  			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
  		clock-names = "ssi-all",
-@@ -1543,6 +1547,7 @@
+@@ -1546,6 +1550,7 @@
  				"ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
  				"src.9", "src.8", "src.7", "src.6", "src.5",
  				"src.4", "src.3", "src.2", "src.1", "src.0",
@@ -57,7 +55,7 @@ index 3ae0c3bfb9b9..6aa1d759690b 100644
  				"dvc.0", "dvc.1",
  				"clk_a", "clk_b", "clk_c", "clk_i";
  
-@@ -1559,6 +1564,17 @@
+@@ -1562,6 +1567,17 @@
  			};
  		};
  
@@ -75,8 +73,6 @@ index 3ae0c3bfb9b9..6aa1d759690b 100644
  		rcar_sound,src {
  			src0: src@0 {
  				interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;
-diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
-index e119ef372ba3..7b1ad8922eec 100644
 --- a/include/dt-bindings/clock/r8a7790-clock.h
 +++ b/include/dt-bindings/clock/r8a7790-clock.h
 @@ -144,6 +144,8 @@
@@ -88,6 +84,3 @@ index e119ef372ba3..7b1ad8922eec 100644
  #define R8A7790_CLK_SCU_SRC9		22
  #define R8A7790_CLK_SCU_SRC8		23
  #define R8A7790_CLK_SCU_SRC7		24
--- 
-2.6.2
-
diff --git a/patches.renesas/0192-ARM-shmobile-r8a7790-Add-Audio-MIX-support-on-DTSI.patch b/patches.renesas/0192-ARM-shmobile-r8a7790-Add-Audio-MIX-support-on-DTSI.patch
index b7211a41f047ac..75e07308c870cf 100644
--- a/patches.renesas/0192-ARM-shmobile-r8a7790-Add-Audio-MIX-support-on-DTSI.patch
+++ b/patches.renesas/0192-ARM-shmobile-r8a7790-Add-Audio-MIX-support-on-DTSI.patch
@@ -9,14 +9,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit fc67bf42fa9a3e7c891e6318475f9c4d81a1d44e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi | 7 +++++++
+ arch/arm/boot/dts/r8a7790.dtsi |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index 6aa1d759690b..f1cdccc0a8c8 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
-@@ -1540,6 +1540,7 @@
+@@ -1543,6 +1543,7 @@
  			<&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,
  			<&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,
  			<&mstp10_clks R8A7790_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7790_CLK_SCU_CTU1_MIX1>,
@@ -24,7 +22,7 @@ index 6aa1d759690b..f1cdccc0a8c8 100644
  			<&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,
  			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
  		clock-names = "ssi-all",
-@@ -1548,6 +1549,7 @@
+@@ -1551,6 +1552,7 @@
  				"src.9", "src.8", "src.7", "src.6", "src.5",
  				"src.4", "src.3", "src.2", "src.1", "src.0",
  				"ctu.0", "ctu.1",
@@ -32,7 +30,7 @@ index 6aa1d759690b..f1cdccc0a8c8 100644
  				"dvc.0", "dvc.1",
  				"clk_a", "clk_b", "clk_c", "clk_i";
  
-@@ -1564,6 +1566,11 @@
+@@ -1567,6 +1569,11 @@
  			};
  		};
  
@@ -44,6 +42,3 @@ index 6aa1d759690b..f1cdccc0a8c8 100644
  		rcar_sound,ctu {
  			ctu00: ctu@0 { };
  			ctu01: ctu@1 { };
--- 
-2.6.2
-
diff --git a/patches.renesas/0193-ARM-shmobile-r8a7791-Add-Audio-CTU-support-on-DTSI.patch b/patches.renesas/0193-ARM-shmobile-r8a7791-Add-Audio-CTU-support-on-DTSI.patch
index 4efe0345a3214b..4b99a5226e4831 100644
--- a/patches.renesas/0193-ARM-shmobile-r8a7791-Add-Audio-CTU-support-on-DTSI.patch
+++ b/patches.renesas/0193-ARM-shmobile-r8a7791-Add-Audio-CTU-support-on-DTSI.patch
@@ -8,15 +8,13 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 88401702fe395880bb03c9d17720185c1d89b43f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791.dtsi            | 16 ++++++++++++++++
- include/dt-bindings/clock/r8a7791-clock.h |  2 ++
+ arch/arm/boot/dts/r8a7791.dtsi            |   16 ++++++++++++++++
+ include/dt-bindings/clock/r8a7791-clock.h |    2 ++
  2 files changed, 18 insertions(+)
 
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index 07ea2bebe496..cdd55b82ba4e 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
-@@ -1311,6 +1311,7 @@
+@@ -1314,6 +1314,7 @@
  				<&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
  				<&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
  				<&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
@@ -24,7 +22,7 @@ index 07ea2bebe496..cdd55b82ba4e 100644
  				<&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>;
  
  			#clock-cells = <1>;
-@@ -1320,6 +1321,7 @@
+@@ -1323,6 +1324,7 @@
  				R8A7791_CLK_SSI4 R8A7791_CLK_SSI3 R8A7791_CLK_SSI2 R8A7791_CLK_SSI1 R8A7791_CLK_SSI0
  				R8A7791_CLK_SCU_ALL
  				R8A7791_CLK_SCU_DVC1 R8A7791_CLK_SCU_DVC0
@@ -32,7 +30,7 @@ index 07ea2bebe496..cdd55b82ba4e 100644
  				R8A7791_CLK_SCU_SRC9 R8A7791_CLK_SCU_SRC8 R8A7791_CLK_SCU_SRC7 R8A7791_CLK_SCU_SRC6 R8A7791_CLK_SCU_SRC5
  				R8A7791_CLK_SCU_SRC4 R8A7791_CLK_SCU_SRC3 R8A7791_CLK_SCU_SRC2 R8A7791_CLK_SCU_SRC1 R8A7791_CLK_SCU_SRC0
  			>;
-@@ -1329,6 +1331,7 @@
+@@ -1332,6 +1334,7 @@
  				"ssi4", "ssi3", "ssi2", "ssi1", "ssi0",
  				"scu-all",
  				"scu-dvc1", "scu-dvc0",
@@ -40,7 +38,7 @@ index 07ea2bebe496..cdd55b82ba4e 100644
  				"scu-src9", "scu-src8", "scu-src7", "scu-src6", "scu-src5",
  				"scu-src4", "scu-src3", "scu-src2", "scu-src1", "scu-src0";
  		};
-@@ -1582,6 +1585,7 @@
+@@ -1585,6 +1588,7 @@
  			<&mstp10_clks R8A7791_CLK_SCU_SRC5>, <&mstp10_clks R8A7791_CLK_SCU_SRC4>,
  			<&mstp10_clks R8A7791_CLK_SCU_SRC3>, <&mstp10_clks R8A7791_CLK_SCU_SRC2>,
  			<&mstp10_clks R8A7791_CLK_SCU_SRC1>, <&mstp10_clks R8A7791_CLK_SCU_SRC0>,
@@ -48,7 +46,7 @@ index 07ea2bebe496..cdd55b82ba4e 100644
  			<&mstp10_clks R8A7791_CLK_SCU_DVC0>, <&mstp10_clks R8A7791_CLK_SCU_DVC1>,
  			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
  		clock-names = "ssi-all",
-@@ -1589,6 +1593,7 @@
+@@ -1592,6 +1596,7 @@
  				"ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
  				"src.9", "src.8", "src.7", "src.6", "src.5",
  				"src.4", "src.3", "src.2", "src.1", "src.0",
@@ -56,7 +54,7 @@ index 07ea2bebe496..cdd55b82ba4e 100644
  				"dvc.0", "dvc.1",
  				"clk_a", "clk_b", "clk_c", "clk_i";
  
-@@ -1605,6 +1610,17 @@
+@@ -1608,6 +1613,17 @@
  			};
  		};
  
@@ -74,8 +72,6 @@ index 07ea2bebe496..cdd55b82ba4e 100644
  		rcar_sound,src {
  			src0: src@0 {
  				interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;
-diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
-index 402268384b99..dd09b73c4aaf 100644
 --- a/include/dt-bindings/clock/r8a7791-clock.h
 +++ b/include/dt-bindings/clock/r8a7791-clock.h
 @@ -141,6 +141,8 @@
@@ -87,6 +83,3 @@ index 402268384b99..dd09b73c4aaf 100644
  #define R8A7791_CLK_SCU_SRC9		22
  #define R8A7791_CLK_SCU_SRC8		23
  #define R8A7791_CLK_SCU_SRC7		24
--- 
-2.6.2
-
diff --git a/patches.renesas/0194-ARM-shmobile-r8a7791-Add-Audio-MIX-support-on-DTSI.patch b/patches.renesas/0194-ARM-shmobile-r8a7791-Add-Audio-MIX-support-on-DTSI.patch
index adddb66fe812de..390926eaa6c97c 100644
--- a/patches.renesas/0194-ARM-shmobile-r8a7791-Add-Audio-MIX-support-on-DTSI.patch
+++ b/patches.renesas/0194-ARM-shmobile-r8a7791-Add-Audio-MIX-support-on-DTSI.patch
@@ -8,14 +8,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 7fd6e11dca09b21efbe2b9db4eff08c8f4a16125)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791.dtsi | 7 +++++++
+ arch/arm/boot/dts/r8a7791.dtsi |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index cdd55b82ba4e..d37339bd7cdb 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
-@@ -1586,6 +1586,7 @@
+@@ -1589,6 +1589,7 @@
  			<&mstp10_clks R8A7791_CLK_SCU_SRC3>, <&mstp10_clks R8A7791_CLK_SCU_SRC2>,
  			<&mstp10_clks R8A7791_CLK_SCU_SRC1>, <&mstp10_clks R8A7791_CLK_SCU_SRC0>,
  			<&mstp10_clks R8A7791_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7791_CLK_SCU_CTU1_MIX1>,
@@ -23,7 +21,7 @@ index cdd55b82ba4e..d37339bd7cdb 100644
  			<&mstp10_clks R8A7791_CLK_SCU_DVC0>, <&mstp10_clks R8A7791_CLK_SCU_DVC1>,
  			<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
  		clock-names = "ssi-all",
-@@ -1594,6 +1595,7 @@
+@@ -1597,6 +1598,7 @@
  				"src.9", "src.8", "src.7", "src.6", "src.5",
  				"src.4", "src.3", "src.2", "src.1", "src.0",
  				"ctu.0", "ctu.1",
@@ -31,7 +29,7 @@ index cdd55b82ba4e..d37339bd7cdb 100644
  				"dvc.0", "dvc.1",
  				"clk_a", "clk_b", "clk_c", "clk_i";
  
-@@ -1610,6 +1612,11 @@
+@@ -1613,6 +1615,11 @@
  			};
  		};
  
@@ -43,6 +41,3 @@ index cdd55b82ba4e..d37339bd7cdb 100644
  		rcar_sound,ctu {
  			ctu00: ctu@0 { };
  			ctu01: ctu@1 { };
--- 
-2.6.2
-
diff --git a/patches.renesas/0211-ARM-shmobile-r8a7790-dtsi-Add-CPG-MSTP-Clock-Domain.patch b/patches.renesas/0211-ARM-shmobile-r8a7790-dtsi-Add-CPG-MSTP-Clock-Domain.patch
index c17afcd4284a7c..e801724f1e961d 100644
--- a/patches.renesas/0211-ARM-shmobile-r8a7790-dtsi-Add-CPG-MSTP-Clock-Domain.patch
+++ b/patches.renesas/0211-ARM-shmobile-r8a7790-dtsi-Add-CPG-MSTP-Clock-Domain.patch
@@ -20,11 +20,9 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 484adb005886b1db79050afc7074d2356618b0c2)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi | 86 +++++++++++++++++++++++++++++++++++++-----
+ arch/arm/boot/dts/r8a7790.dtsi |   86 ++++++++++++++++++++++++++++++++++++-----
  1 file changed, 77 insertions(+), 9 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index 5b2952d5c700..a0b2a79cbfbd 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
 @@ -134,6 +134,7 @@
@@ -510,7 +508,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		};
  
  		/* Variable factor clocks */
-@@ -1343,6 +1401,7 @@
+@@ -1346,6 +1404,7 @@
  		clocks = <&mstp9_clks R8A7790_CLK_QSPI_MOD>;
  		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
  		dma-names = "tx", "rx";
@@ -518,7 +516,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		num-cs = <1>;
  		#address-cells = <1>;
  		#size-cells = <0>;
-@@ -1356,6 +1415,7 @@
+@@ -1359,6 +1418,7 @@
  		clocks = <&mstp0_clks R8A7790_CLK_MSIOF0>;
  		dmas = <&dmac0 0x51>, <&dmac0 0x52>;
  		dma-names = "tx", "rx";
@@ -526,7 +524,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		#address-cells = <1>;
  		#size-cells = <0>;
  		status = "disabled";
-@@ -1368,6 +1428,7 @@
+@@ -1371,6 +1431,7 @@
  		clocks = <&mstp2_clks R8A7790_CLK_MSIOF1>;
  		dmas = <&dmac0 0x55>, <&dmac0 0x56>;
  		dma-names = "tx", "rx";
@@ -534,7 +532,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		#address-cells = <1>;
  		#size-cells = <0>;
  		status = "disabled";
-@@ -1380,6 +1441,7 @@
+@@ -1383,6 +1444,7 @@
  		clocks = <&mstp2_clks R8A7790_CLK_MSIOF2>;
  		dmas = <&dmac0 0x41>, <&dmac0 0x42>;
  		dma-names = "tx", "rx";
@@ -542,7 +540,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		#address-cells = <1>;
  		#size-cells = <0>;
  		status = "disabled";
-@@ -1392,6 +1454,7 @@
+@@ -1395,6 +1457,7 @@
  		clocks = <&mstp2_clks R8A7790_CLK_MSIOF3>;
  		dmas = <&dmac0 0x45>, <&dmac0 0x46>;
  		dma-names = "tx", "rx";
@@ -550,7 +548,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		#address-cells = <1>;
  		#size-cells = <0>;
  		status = "disabled";
-@@ -1402,6 +1465,7 @@
+@@ -1405,6 +1468,7 @@
  		reg = <0 0xee000000 0 0xc00>;
  		interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp3_clks R8A7790_CLK_SSUSB>;
@@ -558,7 +556,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		phys = <&usb2 1>;
  		phy-names = "usb";
  		status = "disabled";
-@@ -1410,10 +1474,11 @@
+@@ -1413,10 +1477,11 @@
  	pci0: pci@ee090000 {
  		compatible = "renesas,pci-r8a7790";
  		device_type = "pci";
@@ -571,7 +569,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		status = "disabled";
  
  		bus-range = <0 0>;
-@@ -1444,10 +1509,11 @@
+@@ -1447,10 +1512,11 @@
  	pci1: pci@ee0b0000 {
  		compatible = "renesas,pci-r8a7790";
  		device_type = "pci";
@@ -584,7 +582,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		status = "disabled";
  
  		bus-range = <1 1>;
-@@ -1465,6 +1531,7 @@
+@@ -1468,6 +1534,7 @@
  		compatible = "renesas,pci-r8a7790";
  		device_type = "pci";
  		clocks = <&mstp7_clks R8A7790_CLK_EHCI>;
@@ -592,7 +590,7 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		reg = <0 0xee0d0000 0 0xc00>,
  		      <0 0xee0c0000 0 0x1100>;
  		interrupts = <0 113 IRQ_TYPE_LEVEL_HIGH>;
-@@ -1517,6 +1584,7 @@
+@@ -1520,6 +1587,7 @@
  		interrupt-map = <0 0 0 0 &gic 0 116 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp3_clks R8A7790_CLK_PCIEC>, <&pcie_bus_clk>;
  		clock-names = "pcie", "pcie_bus";
@@ -600,6 +598,3 @@ index 5b2952d5c700..a0b2a79cbfbd 100644
  		status = "disabled";
  	};
  
--- 
-2.6.2
-
diff --git a/patches.renesas/0212-ARM-shmobile-r8a7791-dtsi-Add-CPG-MSTP-Clock-Domain.patch b/patches.renesas/0212-ARM-shmobile-r8a7791-dtsi-Add-CPG-MSTP-Clock-Domain.patch
index 3276d8e0f5254d..a5ad6a4670e051 100644
--- a/patches.renesas/0212-ARM-shmobile-r8a7791-dtsi-Add-CPG-MSTP-Clock-Domain.patch
+++ b/patches.renesas/0212-ARM-shmobile-r8a7791-dtsi-Add-CPG-MSTP-Clock-Domain.patch
@@ -20,11 +20,9 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 797a0626e08ca4af539cd4888ebbc8c5aacc993d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791.dtsi | 88 ++++++++++++++++++++++++++++++++++++++----
+ arch/arm/boot/dts/r8a7791.dtsi |   88 +++++++++++++++++++++++++++++++++++++----
  1 file changed, 80 insertions(+), 8 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index 1cb6c2d07933..831525dd39a6 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
 @@ -91,6 +91,7 @@
@@ -556,7 +554,7 @@ index 1cb6c2d07933..831525dd39a6 100644
  		};
  
  		/* Variable factor clocks */
-@@ -1361,6 +1425,7 @@
+@@ -1364,6 +1428,7 @@
  		clocks = <&mstp9_clks R8A7791_CLK_QSPI_MOD>;
  		dmas = <&dmac0 0x17>, <&dmac0 0x18>;
  		dma-names = "tx", "rx";
@@ -564,7 +562,7 @@ index 1cb6c2d07933..831525dd39a6 100644
  		num-cs = <1>;
  		#address-cells = <1>;
  		#size-cells = <0>;
-@@ -1374,6 +1439,7 @@
+@@ -1377,6 +1442,7 @@
  		clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;
  		dmas = <&dmac0 0x51>, <&dmac0 0x52>;
  		dma-names = "tx", "rx";
@@ -572,7 +570,7 @@ index 1cb6c2d07933..831525dd39a6 100644
  		#address-cells = <1>;
  		#size-cells = <0>;
  		status = "disabled";
-@@ -1386,6 +1452,7 @@
+@@ -1389,6 +1455,7 @@
  		clocks = <&mstp2_clks R8A7791_CLK_MSIOF1>;
  		dmas = <&dmac0 0x55>, <&dmac0 0x56>;
  		dma-names = "tx", "rx";
@@ -580,7 +578,7 @@ index 1cb6c2d07933..831525dd39a6 100644
  		#address-cells = <1>;
  		#size-cells = <0>;
  		status = "disabled";
-@@ -1398,6 +1465,7 @@
+@@ -1401,6 +1468,7 @@
  		clocks = <&mstp2_clks R8A7791_CLK_MSIOF2>;
  		dmas = <&dmac0 0x41>, <&dmac0 0x42>;
  		dma-names = "tx", "rx";
@@ -588,7 +586,7 @@ index 1cb6c2d07933..831525dd39a6 100644
  		#address-cells = <1>;
  		#size-cells = <0>;
  		status = "disabled";
-@@ -1408,6 +1476,7 @@
+@@ -1411,6 +1479,7 @@
  		reg = <0 0xee000000 0 0xc00>;
  		interrupts = <0 101 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp3_clks R8A7791_CLK_SSUSB>;
@@ -596,7 +594,7 @@ index 1cb6c2d07933..831525dd39a6 100644
  		phys = <&usb2 1>;
  		phy-names = "usb";
  		status = "disabled";
-@@ -1416,10 +1485,11 @@
+@@ -1419,10 +1488,11 @@
  	pci0: pci@ee090000 {
  		compatible = "renesas,pci-r8a7791";
  		device_type = "pci";
@@ -609,7 +607,7 @@ index 1cb6c2d07933..831525dd39a6 100644
  		status = "disabled";
  
  		bus-range = <0 0>;
-@@ -1450,10 +1520,11 @@
+@@ -1453,10 +1523,11 @@
  	pci1: pci@ee0d0000 {
  		compatible = "renesas,pci-r8a7791";
  		device_type = "pci";
@@ -622,7 +620,7 @@ index 1cb6c2d07933..831525dd39a6 100644
  		status = "disabled";
  
  		bus-range = <1 1>;
-@@ -1503,6 +1574,7 @@
+@@ -1506,6 +1577,7 @@
  		interrupt-map = <0 0 0 0 &gic 0 116 IRQ_TYPE_LEVEL_HIGH>;
  		clocks = <&mstp3_clks R8A7791_CLK_PCIEC>, <&pcie_bus_clk>;
  		clock-names = "pcie", "pcie_bus";
@@ -630,6 +628,3 @@ index 1cb6c2d07933..831525dd39a6 100644
  		status = "disabled";
  	};
  
--- 
-2.6.2
-
diff --git a/patches.renesas/0278-ASoC-rsnd-remove-unnecessary-out-of-memory-message-f.patch b/patches.renesas/0278-ASoC-rsnd-remove-unnecessary-out-of-memory-message-f.patch
index 4303966e4e19ad..4f94c32da32f0f 100644
--- a/patches.renesas/0278-ASoC-rsnd-remove-unnecessary-out-of-memory-message-f.patch
+++ b/patches.renesas/0278-ASoC-rsnd-remove-unnecessary-out-of-memory-message-f.patch
@@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 
 --- a/sound/soc/sh/rcar/ssi.c
 +++ b/sound/soc/sh/rcar/ssi.c
-@@ -771,10 +771,8 @@ int rsnd_ssi_probe(struct platform_devic
+@@ -778,10 +778,8 @@ int rsnd_ssi_probe(struct platform_devic
  	 */
  	nr	= info->ssi_info_nr;
  	ssi	= devm_kzalloc(dev, sizeof(*ssi) * nr, GFP_KERNEL);
diff --git a/patches.renesas/0319-ARM-shmobile-r8a7790-dtsi-Add-CPG-MSTP-Clock-Domain-.patch b/patches.renesas/0319-ARM-shmobile-r8a7790-dtsi-Add-CPG-MSTP-Clock-Domain-.patch
index eeb656ecad23ea..8f4cec0727a19e 100644
--- a/patches.renesas/0319-ARM-shmobile-r8a7790-dtsi-Add-CPG-MSTP-Clock-Domain-.patch
+++ b/patches.renesas/0319-ARM-shmobile-r8a7790-dtsi-Add-CPG-MSTP-Clock-Domain-.patch
@@ -16,14 +16,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 6507c4efd2ca4a3dccedbc5b4724f9faabf97fca)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi | 1 +
+ arch/arm/boot/dts/r8a7790.dtsi |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index a0b2a79cbfbd..4624d0f2a754 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
-@@ -1627,6 +1627,7 @@
+@@ -1630,6 +1630,7 @@
  				"mix.0", "mix.1",
  				"dvc.0", "dvc.1",
  				"clk_a", "clk_b", "clk_c", "clk_i";
@@ -31,6 +29,3 @@ index a0b2a79cbfbd..4624d0f2a754 100644
  
  		status = "disabled";
  
--- 
-2.6.2
-
diff --git a/patches.renesas/0320-ARM-shmobile-r8a7791-dtsi-Add-CPG-MSTP-Clock-Domain-.patch b/patches.renesas/0320-ARM-shmobile-r8a7791-dtsi-Add-CPG-MSTP-Clock-Domain-.patch
index 1e6564b5352807..50e40dbcdf1085 100644
--- a/patches.renesas/0320-ARM-shmobile-r8a7791-dtsi-Add-CPG-MSTP-Clock-Domain-.patch
+++ b/patches.renesas/0320-ARM-shmobile-r8a7791-dtsi-Add-CPG-MSTP-Clock-Domain-.patch
@@ -16,14 +16,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 56e86dd4bbeb66a7ad67e20fa045c6f51b4da571)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791.dtsi | 1 +
+ arch/arm/boot/dts/r8a7791.dtsi |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index 831525dd39a6..1666c8a6b143 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
-@@ -1677,6 +1677,7 @@
+@@ -1680,6 +1680,7 @@
  				"mix.0", "mix.1",
  				"dvc.0", "dvc.1",
  				"clk_a", "clk_b", "clk_c", "clk_i";
@@ -31,6 +29,3 @@ index 831525dd39a6..1666c8a6b143 100644
  
  		status = "disabled";
  
--- 
-2.6.2
-