Fix up Renesas patches so they apply properly.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/patches.renesas/0001-clocksource-em_sti-Split-clock-prepare-and-enable-st.patch b/patches.renesas/0001-clocksource-em_sti-Split-clock-prepare-and-enable-st.patch
index 4c0a8cb..8a38ac5 100644
--- a/patches.renesas/0001-clocksource-em_sti-Split-clock-prepare-and-enable-st.patch
+++ b/patches.renesas/0001-clocksource-em_sti-Split-clock-prepare-and-enable-st.patch
@@ -22,14 +22,12 @@
 (cherry picked from commit 3814ae092d36da04d5fbaf777c1564dc4ee68559)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clocksource/em_sti.c | 21 ++++++++++++++-------
+ drivers/clocksource/em_sti.c |   21 ++++++++++++++-------
  1 file changed, 14 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
-index 19bb1792d647..51a346c91a98 100644
 --- a/drivers/clocksource/em_sti.c
 +++ b/drivers/clocksource/em_sti.c
-@@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_priv *p)
+@@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_p
  	int ret;
  
  	/* enable clock */
@@ -38,7 +36,7 @@
  	if (ret) {
  		dev_err(&p->pdev->dev, "cannot enable clock\n");
  		return ret;
-@@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti_priv *p)
+@@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti
  	em_sti_write(p, STI_INTENCLR, 3);
  
  	/* stop clock */
@@ -47,7 +45,7 @@
  }
  
  static cycle_t em_sti_count(struct em_sti_priv *p)
-@@ -303,6 +303,7 @@ static int em_sti_probe(struct platform_device *pdev)
+@@ -303,6 +303,7 @@ static int em_sti_probe(struct platform_
  	struct em_sti_priv *p;
  	struct resource *res;
  	int irq;
@@ -55,7 +53,7 @@
  
  	p = devm_kzalloc(&pdev->dev, sizeof(*p), GFP_KERNEL);
  	if (p == NULL)
-@@ -323,6 +324,13 @@ static int em_sti_probe(struct platform_device *pdev)
+@@ -323,6 +324,13 @@ static int em_sti_probe(struct platform_
  	if (IS_ERR(p->base))
  		return PTR_ERR(p->base);
  
@@ -69,7 +67,7 @@
  	/* get hold of clock */
  	p->clk = devm_clk_get(&pdev->dev, "sclk");
  	if (IS_ERR(p->clk)) {
-@@ -330,11 +338,10 @@ static int em_sti_probe(struct platform_device *pdev)
+@@ -330,11 +338,10 @@ static int em_sti_probe(struct platform_
  		return PTR_ERR(p->clk);
  	}
  
@@ -85,6 +83,3 @@
  	}
  
  	raw_spin_lock_init(&p->lock);
--- 
-2.13.3
-
diff --git a/patches.renesas/0002-clocksource-em_sti-Compute-rate-before-registration.patch b/patches.renesas/0002-clocksource-em_sti-Compute-rate-before-registration.patch
index 2f24ccd..a2b32e2 100644
--- a/patches.renesas/0002-clocksource-em_sti-Compute-rate-before-registration.patch
+++ b/patches.renesas/0002-clocksource-em_sti-Compute-rate-before-registration.patch
@@ -30,14 +30,12 @@
 (cherry picked from commit 4e53aa2fde4124878fc6b2183d6e8ec46e12ceb0)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clocksource/em_sti.c | 25 ++++++++++++-------------
+ drivers/clocksource/em_sti.c |   25 ++++++++++++-------------
  1 file changed, 12 insertions(+), 13 deletions(-)
 
-diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c
-index 51a346c91a98..e1d465239042 100644
 --- a/drivers/clocksource/em_sti.c
 +++ b/drivers/clocksource/em_sti.c
-@@ -84,9 +84,6 @@ static int em_sti_enable(struct em_sti_priv *p)
+@@ -84,9 +84,6 @@ static int em_sti_enable(struct em_sti_p
  		return ret;
  	}
  
@@ -47,7 +45,7 @@
  	/* reset the counter */
  	em_sti_write(p, STI_SET_H, 0x40000000);
  	em_sti_write(p, STI_SET_L, 0x00000000);
-@@ -205,13 +202,9 @@ static cycle_t em_sti_clocksource_read(struct clocksource *cs)
+@@ -205,13 +202,9 @@ static cycle_t em_sti_clocksource_read(s
  
  static int em_sti_clocksource_enable(struct clocksource *cs)
  {
@@ -62,7 +60,7 @@
  }
  
  static void em_sti_clocksource_disable(struct clocksource *cs)
-@@ -240,8 +233,7 @@ static int em_sti_register_clocksource(struct em_sti_priv *p)
+@@ -240,8 +233,7 @@ static int em_sti_register_clocksource(s
  
  	dev_info(&p->pdev->dev, "used as clock source\n");
  
@@ -72,7 +70,7 @@
  	return 0;
  }
  
-@@ -263,7 +255,6 @@ static int em_sti_clock_event_set_oneshot(struct clock_event_device *ced)
+@@ -263,7 +255,6 @@ static int em_sti_clock_event_set_onesho
  
  	dev_info(&p->pdev->dev, "used for oneshot clock events\n");
  	em_sti_start(p, USER_CLOCKEVENT);
@@ -80,7 +78,7 @@
  	return 0;
  }
  
-@@ -294,8 +285,7 @@ static void em_sti_register_clockevent(struct em_sti_priv *p)
+@@ -294,8 +285,7 @@ static void em_sti_register_clockevent(s
  
  	dev_info(&p->pdev->dev, "used for clock events\n");
  
@@ -90,7 +88,7 @@
  }
  
  static int em_sti_probe(struct platform_device *pdev)
-@@ -344,6 +334,15 @@ static int em_sti_probe(struct platform_device *pdev)
+@@ -344,6 +334,15 @@ static int em_sti_probe(struct platform_
  		return ret;
  	}
  
@@ -106,6 +104,3 @@
  	raw_spin_lock_init(&p->lock);
  	em_sti_register_clockevent(p);
  	em_sti_register_clocksource(p);
--- 
-2.13.3
-
diff --git a/patches.renesas/0003-arm64-dts-r8a7796-Add-I2C-for-DVFS-device-node.patch b/patches.renesas/0003-arm64-dts-r8a7796-Add-I2C-for-DVFS-device-node.patch
index 638e73c..8f0bb31 100644
--- a/patches.renesas/0003-arm64-dts-r8a7796-Add-I2C-for-DVFS-device-node.patch
+++ b/patches.renesas/0003-arm64-dts-r8a7796-Add-I2C-for-DVFS-device-node.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 0fb1fd20043f619e444720062e61cdc40130c0c5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 14 ++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index f7120cdedd0d..c95ad177b097 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -25,6 +25,7 @@
@@ -47,6 +45,3 @@
  		i2c0: i2c@e6500000 {
  			#address-cells = <1>;
  			#size-cells = <0>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0004-arm64-dts-r8a7796-salvator-x-Add-I2C-for-DVFS-device.patch b/patches.renesas/0004-arm64-dts-r8a7796-salvator-x-Add-I2C-for-DVFS-device.patch
index d299391..7deb36f 100644
--- a/patches.renesas/0004-arm64-dts-r8a7796-salvator-x-Add-I2C-for-DVFS-device.patch
+++ b/patches.renesas/0004-arm64-dts-r8a7796-salvator-x-Add-I2C-for-DVFS-device.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit d8e62f0729bb404caa6ba42b65d5a1e4d370a6e3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 4 ++++
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |    4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
-index c7f40f8f3169..61f4662db497 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 @@ -261,3 +261,7 @@
@@ -29,6 +27,3 @@
 +&i2c_dvfs {
 +	status = "okay";
 +};
--- 
-2.13.3
-
diff --git a/patches.renesas/0005-arm64-dts-r8a7795-Add-I2C-for-DVFS-core-to-dtsi.patch b/patches.renesas/0005-arm64-dts-r8a7795-Add-I2C-for-DVFS-core-to-dtsi.patch
index 8f026d9..de5286b 100644
--- a/patches.renesas/0005-arm64-dts-r8a7795-Add-I2C-for-DVFS-core-to-dtsi.patch
+++ b/patches.renesas/0005-arm64-dts-r8a7795-Add-I2C-for-DVFS-core-to-dtsi.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit d7e0d64a46f97f67ecbc0194ce6a394f512109c5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 14 ++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |   14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index eac4f29aa5cd..fe266bb3d913 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -25,6 +25,7 @@
@@ -29,10 +27,11 @@
  	};
  
  	psci {
-@@ -793,6 +794,19 @@
+@@ -792,6 +793,19 @@
+ 			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
  			status = "disabled";
  		};
- 
++
 +		i2c_dvfs: i2c@e60b0000 {
 +			#address-cells = <1>;
 +			#size-cells = <0>;
@@ -45,10 +44,6 @@
 +			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
 +			status = "disabled";
 +		};
-+
+ 
  		i2c0: i2c@e6500000 {
  			#address-cells = <1>;
- 			#size-cells = <0>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0006-arm64-dts-r8a7795-salvator-x-Enable-I2C-for-DVFS-dev.patch b/patches.renesas/0006-arm64-dts-r8a7795-salvator-x-Enable-I2C-for-DVFS-dev.patch
index c345566..01b2764 100644
--- a/patches.renesas/0006-arm64-dts-r8a7795-salvator-x-Enable-I2C-for-DVFS-dev.patch
+++ b/patches.renesas/0006-arm64-dts-r8a7795-salvator-x-Enable-I2C-for-DVFS-dev.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 006ced572a3b2247639ce06443aff00704888001)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 4 ++++
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |    4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
-index 7a8986edcdc0..dc1177c76aa5 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 @@ -485,6 +485,10 @@
@@ -32,6 +30,3 @@
  &avb {
  	pinctrl-0 = <&avb_pins>;
  	pinctrl-names = "default";
--- 
-2.13.3
-
diff --git a/patches.renesas/0007-arm64-dts-h3ulcb-Update-memory-node-to-4-GiB-map.patch b/patches.renesas/0007-arm64-dts-h3ulcb-Update-memory-node-to-4-GiB-map.patch
index 35e9d29..245e3a9 100644
--- a/patches.renesas/0007-arm64-dts-h3ulcb-Update-memory-node-to-4-GiB-map.patch
+++ b/patches.renesas/0007-arm64-dts-h3ulcb-Update-memory-node-to-4-GiB-map.patch
@@ -20,11 +20,9 @@
 (cherry picked from commit a262d66224c4c34bc2bee16d4d37d460a738788c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 15 +++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts |   15 +++++++++++++++
  1 file changed, 15 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
-index c5f8f69a4f5f..9811534f296e 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
 @@ -33,6 +33,21 @@
@@ -49,6 +47,3 @@
  	leds {
  		compatible = "gpio-leds";
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0008-arm64-dts-r8a7795-Use-rgmii-txid-phy-mode-for-Ethern.patch b/patches.renesas/0008-arm64-dts-r8a7795-Use-rgmii-txid-phy-mode-for-Ethern.patch
index c7bbbb4..a6c7578 100644
--- a/patches.renesas/0008-arm64-dts-r8a7795-Use-rgmii-txid-phy-mode-for-Ethern.patch
+++ b/patches.renesas/0008-arm64-dts-r8a7795-Use-rgmii-txid-phy-mode-for-Ethern.patch
@@ -35,11 +35,9 @@
 (cherry picked from commit dda3887907d743385f2599fa18c765bd295ae2da)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index fe266bb3d913..382a8987bca9 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -564,7 +564,7 @@
@@ -51,6 +49,3 @@
  			#address-cells = <1>;
  			#size-cells = <0>;
  			status = "disabled";
--- 
-2.13.3
-
diff --git a/patches.renesas/0009-arm64-dts-r8a7795-salvator-x-Fix-EthernetAVB-PHY-tim.patch b/patches.renesas/0009-arm64-dts-r8a7795-salvator-x-Fix-EthernetAVB-PHY-tim.patch
index a126d46..dac9ae5 100644
--- a/patches.renesas/0009-arm64-dts-r8a7795-salvator-x-Fix-EthernetAVB-PHY-tim.patch
+++ b/patches.renesas/0009-arm64-dts-r8a7795-salvator-x-Fix-EthernetAVB-PHY-tim.patch
@@ -16,11 +16,9 @@
 (cherry picked from commit 0e45da1c6ea6b18616d95c697ecd6234bc504ef6)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 13 +------------
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |   13 +------------
  1 file changed, 1 insertion(+), 12 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
-index dc1177c76aa5..5158ba3f9ce3 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 @@ -497,18 +497,7 @@
@@ -43,6 +41,3 @@
  		reg = <0>;
  		interrupt-parent = <&gpio2>;
  		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0010-arm64-dts-h3ulcb-Fix-EthernetAVB-PHY-timing.patch b/patches.renesas/0010-arm64-dts-h3ulcb-Fix-EthernetAVB-PHY-timing.patch
index a0c5eed..a64a621 100644
--- a/patches.renesas/0010-arm64-dts-h3ulcb-Fix-EthernetAVB-PHY-timing.patch
+++ b/patches.renesas/0010-arm64-dts-h3ulcb-Fix-EthernetAVB-PHY-timing.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 5b9fd1962f605a31842371471e559407c293131f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 13 +------------
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts |   13 +------------
  1 file changed, 1 insertion(+), 12 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
-index 9811534f296e..69c623faf80c 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
 @@ -354,18 +354,7 @@
@@ -41,6 +39,3 @@
  		reg = <0>;
  		interrupt-parent = <&gpio2>;
  		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0011-arm64-dts-r8a7796-Use-rgmii-txid-phy-mode-for-Ethern.patch b/patches.renesas/0011-arm64-dts-r8a7796-Use-rgmii-txid-phy-mode-for-Ethern.patch
index ecfe3e3..3199034 100644
--- a/patches.renesas/0011-arm64-dts-r8a7796-Use-rgmii-txid-phy-mode-for-Ethern.patch
+++ b/patches.renesas/0011-arm64-dts-r8a7796-Use-rgmii-txid-phy-mode-for-Ethern.patch
@@ -35,11 +35,9 @@
 (cherry picked from commit 325f39010b431f6a1ece74d69f10dcca2329c08d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index c95ad177b097..1c1c1eae9cba 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -483,7 +483,7 @@
@@ -51,6 +49,3 @@
  			#address-cells = <1>;
  			#size-cells = <0>;
  			status = "disabled";
--- 
-2.13.3
-
diff --git a/patches.renesas/0012-arm64-dts-r8a7796-salvator-x-Fix-EthernetAVB-PHY-tim.patch b/patches.renesas/0012-arm64-dts-r8a7796-salvator-x-Fix-EthernetAVB-PHY-tim.patch
index 0c11d65..b2a721e 100644
--- a/patches.renesas/0012-arm64-dts-r8a7796-salvator-x-Fix-EthernetAVB-PHY-tim.patch
+++ b/patches.renesas/0012-arm64-dts-r8a7796-salvator-x-Fix-EthernetAVB-PHY-tim.patch
@@ -16,11 +16,9 @@
 (cherry picked from commit ef3f08c83fd186ab4bbad6a6250c5a347fbf6551)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 13 +------------
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |   13 +------------
  1 file changed, 1 insertion(+), 12 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
-index 61f4662db497..93ed23ab71bb 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 @@ -172,18 +172,7 @@
@@ -43,6 +41,3 @@
  		reg = <0>;
  		interrupt-parent = <&gpio2>;
  		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0013-arm64-defconfig-Enable-SH-Mobile-I2C-controller.patch b/patches.renesas/0013-arm64-defconfig-Enable-SH-Mobile-I2C-controller.patch
index c85ecbc..686ec71 100644
--- a/patches.renesas/0013-arm64-defconfig-Enable-SH-Mobile-I2C-controller.patch
+++ b/patches.renesas/0013-arm64-defconfig-Enable-SH-Mobile-I2C-controller.patch
@@ -14,11 +14,9 @@
 Conflicts:
 	arch/arm64/configs/defconfig
 ---
- arch/arm64/configs/defconfig | 1 +
+ arch/arm64/configs/defconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 8447beac5570..908fcffb4233 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -234,6 +234,7 @@ CONFIG_I2C_IMX=y
@@ -29,6 +27,3 @@
  CONFIG_I2C_TEGRA=y
  CONFIG_I2C_UNIPHIER_F=y
  CONFIG_I2C_RCAR=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0014-ARM64-defconfig-enable-the-leds-pwm-driver-and-defau.patch b/patches.renesas/0014-ARM64-defconfig-enable-the-leds-pwm-driver-and-defau.patch
index 08b6cb7..0c7be8c 100644
--- a/patches.renesas/0014-ARM64-defconfig-enable-the-leds-pwm-driver-and-defau.patch
+++ b/patches.renesas/0014-ARM64-defconfig-enable-the-leds-pwm-driver-and-defau.patch
@@ -15,11 +15,9 @@
 (cherry picked from commit 95fbe8b08b2d420e4f5a77701f165d6b23827862)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/configs/defconfig | 2 ++
+ arch/arm64/configs/defconfig |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 908fcffb4233..c11c1473dad0 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -370,8 +370,10 @@ CONFIG_MMC_SUNXI=y
@@ -33,6 +31,3 @@
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGER_CPU=y
  CONFIG_RTC_CLASS=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0015-arm64-dts-r8a7796-dtsi-Add-all-HSCIF-nodes.patch b/patches.renesas/0015-arm64-dts-r8a7796-dtsi-Add-all-HSCIF-nodes.patch
index 6a255dc..075c5c5 100644
--- a/patches.renesas/0015-arm64-dts-r8a7796-dtsi-Add-all-HSCIF-nodes.patch
+++ b/patches.renesas/0015-arm64-dts-r8a7796-dtsi-Add-all-HSCIF-nodes.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 68cd161072605c276d4e6c8cd06fbe7b00a0f680)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 70 ++++++++++++++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   70 +++++++++++++++++++++++++++++++
  1 file changed, 70 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index 1c1c1eae9cba..714fd96b29eb 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -489,6 +489,76 @@
@@ -98,6 +96,3 @@
  		scif2: serial@e6e88000 {
  			compatible = "renesas,scif-r8a7796",
  				     "renesas,rcar-gen3-scif", "renesas,scif";
--- 
-2.13.3
-
diff --git a/patches.renesas/0016-arm64-dts-r8a7796-Add-all-SCIF-nodes.patch b/patches.renesas/0016-arm64-dts-r8a7796-Add-all-SCIF-nodes.patch
index 8421946..a4e4928 100644
--- a/patches.renesas/0016-arm64-dts-r8a7796-Add-all-SCIF-nodes.patch
+++ b/patches.renesas/0016-arm64-dts-r8a7796-Add-all-SCIF-nodes.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 19d76f3ec8fc6ff38f1c5ca534d75a957c8661ea)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 65 ++++++++++++++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   65 +++++++++++++++++++++++++++++++
  1 file changed, 65 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index 714fd96b29eb..5fb93fc043c2 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -559,6 +559,32 @@
@@ -52,10 +50,14 @@
  		scif2: serial@e6e88000 {
  			compatible = "renesas,scif-r8a7796",
  				     "renesas,rcar-gen3-scif", "renesas,scif";
-@@ -572,6 +598,45 @@
- 			status = "disabled";
- 		};
- 
+@@ -568,6 +594,45 @@
+ 				 <&cpg CPG_CORE R8A7796_CLK_S3D1>,
+ 				 <&scif_clk>;
+ 			clock-names = "fck", "brg_int", "scif_clk";
++			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
++			status = "disabled";
++		};
++
 +		scif3: serial@e6c50000 {
 +			compatible = "renesas,scif-r8a7796",
 +				     "renesas,rcar-gen3-scif", "renesas,scif";
@@ -91,13 +93,6 @@
 +				 <&cpg CPG_CORE R8A7796_CLK_S3D1>,
 +				 <&scif_clk>;
 +			clock-names = "fck", "brg_int", "scif_clk";
-+			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
-+			status = "disabled";
-+		};
-+
- 		msiof0: spi@e6e90000 {
- 			compatible = "renesas,msiof-r8a7796",
- 				     "renesas,rcar-gen3-msiof";
--- 
-2.13.3
-
+ 			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
+ 			status = "disabled";
+ 		};
diff --git a/patches.renesas/0017-arm64-dts-r8a7796-Enable-SCIF-DMA.patch b/patches.renesas/0017-arm64-dts-r8a7796-Enable-SCIF-DMA.patch
index 9c6ef78..1f8d70c 100644
--- a/patches.renesas/0017-arm64-dts-r8a7796-Enable-SCIF-DMA.patch
+++ b/patches.renesas/0017-arm64-dts-r8a7796-Enable-SCIF-DMA.patch
@@ -9,11 +9,9 @@
 (cherry picked from commit dbcae5ea4bd27409291e3329c9106f37f0118590)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 13 +++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index 5fb93fc043c2..951e351ddae1 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -568,6 +568,9 @@
@@ -64,6 +62,3 @@
  			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
  			status = "disabled";
  		};
--- 
-2.13.3
-
diff --git a/patches.renesas/0018-arm64-dts-r8a7796-salvator-x-add-SCIF1-DEBUG1.patch b/patches.renesas/0018-arm64-dts-r8a7796-salvator-x-add-SCIF1-DEBUG1.patch
index c506f3f..e953f53 100644
--- a/patches.renesas/0018-arm64-dts-r8a7796-salvator-x-add-SCIF1-DEBUG1.patch
+++ b/patches.renesas/0018-arm64-dts-r8a7796-salvator-x-add-SCIF1-DEBUG1.patch
@@ -11,11 +11,9 @@
 (cherry picked from commit d5566d251f5e839e36db8db8105d8f8f57e54768)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 14 ++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |   14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
-index 93ed23ab71bb..74b8c653c9fe 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 @@ -18,6 +18,7 @@
@@ -53,6 +51,3 @@
  &scif2 {
  	pinctrl-0 = <&scif2_pins>;
  	pinctrl-names = "default";
--- 
-2.13.3
-
diff --git a/patches.renesas/0019-arm64-dts-r8a7796-Enable-HSCIF-DMA.patch b/patches.renesas/0019-arm64-dts-r8a7796-Enable-HSCIF-DMA.patch
index 54084b1..0326b7f 100644
--- a/patches.renesas/0019-arm64-dts-r8a7796-Enable-HSCIF-DMA.patch
+++ b/patches.renesas/0019-arm64-dts-r8a7796-Enable-HSCIF-DMA.patch
@@ -9,11 +9,9 @@
 (cherry picked from commit 6d50bb8935042c4b7747b57df064ff41295e4769)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 13 +++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index 951e351ddae1..aa404ed9142e 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -499,6 +499,9 @@
@@ -64,6 +62,3 @@
  			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
  			status = "disabled";
  		};
--- 
-2.13.3
-
diff --git a/patches.renesas/0020-arm64-dts-r8a7795-Add-Cortex-A53-CPU-cores.patch b/patches.renesas/0020-arm64-dts-r8a7795-Add-Cortex-A53-CPU-cores.patch
index ac17d08..93bc351 100644
--- a/patches.renesas/0020-arm64-dts-r8a7795-Add-Cortex-A53-CPU-cores.patch
+++ b/patches.renesas/0020-arm64-dts-r8a7795-Add-Cortex-A53-CPU-cores.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit 799a75abdef348500bab14e873e7711afa426aaf)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 46 ++++++++++++++++++++++++++++----
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |   46 +++++++++++++++++++++++++++----
  1 file changed, 41 insertions(+), 5 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index 382a8987bca9..61830697e33c 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -73,6 +73,42 @@
@@ -90,6 +88,3 @@
  		};
  
  		cpg: clock-controller@e6150000 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0021-arm64-dts-r8a7795-Add-Cortex-A53-PMU-node.patch b/patches.renesas/0021-arm64-dts-r8a7795-Add-Cortex-A53-PMU-node.patch
index 87644d0..a34b6f5 100644
--- a/patches.renesas/0021-arm64-dts-r8a7795-Add-Cortex-A53-PMU-node.patch
+++ b/patches.renesas/0021-arm64-dts-r8a7795-Add-Cortex-A53-PMU-node.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit 9190748fd608dc3aa80edacab9e6818f2d6f71b6)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 12 ++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index 61830697e33c..3573872974e0 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -340,6 +340,18 @@
@@ -39,6 +37,3 @@
  		timer {
  			compatible = "arm,armv8-timer";
  			interrupts = <GIC_PPI 13
--- 
-2.13.3
-
diff --git a/patches.renesas/0022-arm64-dts-r8a7795-Upgrade-to-PSCI-v1.0-to-support-Su.patch b/patches.renesas/0022-arm64-dts-r8a7795-Upgrade-to-PSCI-v1.0-to-support-Su.patch
index 57df494..12d2c7b 100644
--- a/patches.renesas/0022-arm64-dts-r8a7795-Upgrade-to-PSCI-v1.0-to-support-Su.patch
+++ b/patches.renesas/0022-arm64-dts-r8a7795-Upgrade-to-PSCI-v1.0-to-support-Su.patch
@@ -24,11 +24,9 @@
 (cherry picked from commit 71585040b77e7b388708dc35bdc49f106fa55a4a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index 3573872974e0..c1e00a3e7c45 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -29,7 +29,7 @@
@@ -40,6 +38,3 @@
  		method = "smc";
  	};
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0023-arm64-dts-r8a7796-Upgrade-to-PSCI-v1.0-to-support-Su.patch b/patches.renesas/0023-arm64-dts-r8a7796-Upgrade-to-PSCI-v1.0-to-support-Su.patch
index d391a06..714ea74 100644
--- a/patches.renesas/0023-arm64-dts-r8a7796-Upgrade-to-PSCI-v1.0-to-support-Su.patch
+++ b/patches.renesas/0023-arm64-dts-r8a7796-Upgrade-to-PSCI-v1.0-to-support-Su.patch
@@ -24,11 +24,9 @@
 (cherry picked from commit b3f26910c0daafded536cf5edceab2ab469252cb)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index aa404ed9142e..dbf82bc6ba64 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -29,7 +29,7 @@
@@ -40,6 +38,3 @@
  		method = "smc";
  	};
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0024-arm64-dts-r8a7795-Remove-unit-addresses-and-regs-fro.patch b/patches.renesas/0024-arm64-dts-r8a7795-Remove-unit-addresses-and-regs-fro.patch
index 6757240..5826a1d 100644
--- a/patches.renesas/0024-arm64-dts-r8a7795-Remove-unit-addresses-and-regs-fro.patch
+++ b/patches.renesas/0024-arm64-dts-r8a7795-Remove-unit-addresses-and-regs-fro.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit d165856de103a6d317a9c9a5782eacd5dc90a9dc)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 6 ++----
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |    6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index c1e00a3e7c45..14772bc02125 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -109,17 +109,15 @@
@@ -41,6 +39,3 @@
  			power-domains = <&sysc R8A7795_PD_CA53_SCU>;
  			cache-unified;
  			cache-level = <2>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0025-arm64-dts-r8a7796-Remove-unit-address-and-reg-from-i.patch b/patches.renesas/0025-arm64-dts-r8a7796-Remove-unit-address-and-reg-from-i.patch
index 5822acf..cb7c312 100644
--- a/patches.renesas/0025-arm64-dts-r8a7796-Remove-unit-address-and-reg-from-i.patch
+++ b/patches.renesas/0025-arm64-dts-r8a7796-Remove-unit-address-and-reg-from-i.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 57a4fd420c6e8a04b6a87ff24d34250cd7c48f15)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 3 +--
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index dbf82bc6ba64..27f7dd9bd988 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -47,9 +47,8 @@
@@ -32,6 +30,3 @@
  			power-domains = <&sysc R8A7796_PD_CA57_SCU>;
  			cache-unified;
  			cache-level = <2>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0026-arm64-dts-r8a7795-salvator-x-Set-drive-strength-for-.patch b/patches.renesas/0026-arm64-dts-r8a7795-salvator-x-Set-drive-strength-for-.patch
index 7e70ff7..cc5e2a5 100644
--- a/patches.renesas/0026-arm64-dts-r8a7795-salvator-x-Set-drive-strength-for-.patch
+++ b/patches.renesas/0026-arm64-dts-r8a7795-salvator-x-Set-drive-strength-for-.patch
@@ -19,11 +19,9 @@
 (cherry picked from commit 7d73a4da2681dc5d04e8ed9f4aa96c1deed2dbc5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 18 ++++++++++++++++--
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |   18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
-index 5158ba3f9ce3..277ab8484e0c 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 @@ -247,8 +247,22 @@
@@ -51,6 +49,3 @@
  	};
  
  	du_pins: du {
--- 
-2.13.3
-
diff --git a/patches.renesas/0027-arm64-dts-r8a7795-Tidyup-Audio-DMAC-channel-for-DVC.patch b/patches.renesas/0027-arm64-dts-r8a7795-Tidyup-Audio-DMAC-channel-for-DVC.patch
index e5b05f6..15bf007 100644
--- a/patches.renesas/0027-arm64-dts-r8a7795-Tidyup-Audio-DMAC-channel-for-DVC.patch
+++ b/patches.renesas/0027-arm64-dts-r8a7795-Tidyup-Audio-DMAC-channel-for-DVC.patch
@@ -34,11 +34,9 @@
 (cherry picked from commit b5a8ffad0eb0c1e5e601253edac163b2da9e855d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 4 ++--
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index 14772bc02125..55c09f1b89c9 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -1075,11 +1075,11 @@
@@ -55,6 +53,3 @@
  					dma-names = "tx";
  				};
  			};
--- 
-2.13.3
-
diff --git a/patches.renesas/0028-arm64-defconfig-enable-MVNETA.patch b/patches.renesas/0028-arm64-defconfig-enable-MVNETA.patch
index b74e591..4d1ce80 100644
--- a/patches.renesas/0028-arm64-defconfig-enable-MVNETA.patch
+++ b/patches.renesas/0028-arm64-defconfig-enable-MVNETA.patch
@@ -10,11 +10,9 @@
 (cherry picked from commit d7ec74f412f5e5c6b964a4b635b1e3f1d72a7b34)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/configs/defconfig | 1 +
+ arch/arm64/configs/defconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index c11c1473dad0..8394c2871d8e 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -177,6 +177,7 @@ CONFIG_HNS_ENET=y
@@ -25,6 +23,3 @@
  CONFIG_SKY2=y
  CONFIG_RAVB=y
  CONFIG_SMC91X=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0029-arm64-defconfig-enable-I2C_PXA.patch b/patches.renesas/0029-arm64-defconfig-enable-I2C_PXA.patch
index 0cd3950..8b39ccb 100644
--- a/patches.renesas/0029-arm64-defconfig-enable-I2C_PXA.patch
+++ b/patches.renesas/0029-arm64-defconfig-enable-I2C_PXA.patch
@@ -10,11 +10,9 @@
 (cherry picked from commit efbd24646abc044f70afc53bd331c7b520f499fd)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/configs/defconfig | 1 +
+ arch/arm64/configs/defconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 8394c2871d8e..4c3b6235bf3d 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -234,6 +234,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
@@ -25,6 +23,3 @@
  CONFIG_I2C_QUP=y
  CONFIG_I2C_SH_MOBILE=y
  CONFIG_I2C_TEGRA=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0030-arm64-dts-r8a7796-Add-Cortex-A57-CPU-cores.patch b/patches.renesas/0030-arm64-dts-r8a7796-Add-Cortex-A57-CPU-cores.patch
index 2c0ae54..aee2fb7 100644
--- a/patches.renesas/0030-arm64-dts-r8a7796-Add-Cortex-A57-CPU-cores.patch
+++ b/patches.renesas/0030-arm64-dts-r8a7796-Add-Cortex-A57-CPU-cores.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 7328be4a03b10c19e49a564f4c2e3a9ebcf34ca7)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 20 ++++++++++++++------
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   20 ++++++++++++++------
  1 file changed, 14 insertions(+), 6 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index 27f7dd9bd988..d2a2110fc7fc 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -37,7 +37,6 @@
@@ -72,6 +70,3 @@
  		};
  
  		wdt0: watchdog@e6020000 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0031-arm64-dts-r8a7796-Add-Cortex-A57-PMU-node.patch b/patches.renesas/0031-arm64-dts-r8a7796-Add-Cortex-A57-PMU-node.patch
index 46a7ded..db8f4b3 100644
--- a/patches.renesas/0031-arm64-dts-r8a7796-Add-Cortex-A57-PMU-node.patch
+++ b/patches.renesas/0031-arm64-dts-r8a7796-Add-Cortex-A57-PMU-node.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 9fccf4d6103eeb5db88c1ae026d61b87f722414a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 8 ++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index d2a2110fc7fc..454e1292f910 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -252,6 +252,14 @@
@@ -34,6 +32,3 @@
  		cpg: clock-controller@e6150000 {
  			compatible = "renesas,r8a7796-cpg-mssr";
  			reg = <0 0xe6150000 0 0x1000>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0032-arm64-dts-r8a7796-Add-CA53-L2-cache-controller-node.patch b/patches.renesas/0032-arm64-dts-r8a7796-Add-CA53-L2-cache-controller-node.patch
index 2b2d2c2..da2d8bb 100644
--- a/patches.renesas/0032-arm64-dts-r8a7796-Add-CA53-L2-cache-controller-node.patch
+++ b/patches.renesas/0032-arm64-dts-r8a7796-Add-CA53-L2-cache-controller-node.patch
@@ -16,11 +16,9 @@
 (cherry picked from commit a681e6d63285b879bb9bab0bd79e2021e6dcbda1)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 7 +++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index 454e1292f910..b951f5ffe9e0 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -61,6 +61,13 @@
@@ -37,6 +35,3 @@
  	};
  
  	extal_clk: extal {
--- 
-2.13.3
-
diff --git a/patches.renesas/0033-arm64-dts-r8a7796-Add-Cortex-A53-CPU-cores.patch b/patches.renesas/0033-arm64-dts-r8a7796-Add-Cortex-A53-CPU-cores.patch
index 4a60596..61c304d 100644
--- a/patches.renesas/0033-arm64-dts-r8a7796-Add-Cortex-A53-CPU-cores.patch
+++ b/patches.renesas/0033-arm64-dts-r8a7796-Add-Cortex-A53-CPU-cores.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit b4dc3b4b1a65fec829ee8704c7647c06a8038108)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 46 ++++++++++++++++++++++++++++----
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   46 +++++++++++++++++++++++++++----
  1 file changed, 41 insertions(+), 5 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index b951f5ffe9e0..b32a180009dd 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -55,6 +55,42 @@
@@ -90,6 +88,3 @@
  		};
  
  		wdt0: watchdog@e6020000 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0034-arm64-dts-r8a7796-Add-Cortex-A53-PMU-node.patch b/patches.renesas/0034-arm64-dts-r8a7796-Add-Cortex-A53-PMU-node.patch
index 15647f8..68dc85b 100644
--- a/patches.renesas/0034-arm64-dts-r8a7796-Add-Cortex-A53-PMU-node.patch
+++ b/patches.renesas/0034-arm64-dts-r8a7796-Add-Cortex-A53-PMU-node.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit ccc499330dbcaa8f6065bd1b10a64ca09fa96c3e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 12 ++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index b32a180009dd..a90abf14dc4e 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -303,6 +303,18 @@
@@ -39,6 +37,3 @@
  		cpg: clock-controller@e6150000 {
  			compatible = "renesas,r8a7796-cpg-mssr";
  			reg = <0 0xe6150000 0 0x1000>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0035-arm64-dts-h3ulcb-Drop-superfluous-status-update-for-.patch b/patches.renesas/0035-arm64-dts-h3ulcb-Drop-superfluous-status-update-for-.patch
index ce6a186..da72a98 100644
--- a/patches.renesas/0035-arm64-dts-h3ulcb-Drop-superfluous-status-update-for-.patch
+++ b/patches.renesas/0035-arm64-dts-h3ulcb-Drop-superfluous-status-update-for-.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit c9060f50d82fc9b548571a9adea9ebff22b3347b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 1 -
+ arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
-index 69c623faf80c..ab352159de65 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
 @@ -228,7 +228,6 @@
@@ -27,6 +25,3 @@
  };
  
  &i2c2 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0036-arm64-dts-r8a7795-salvator-x-Drop-superfluous-status.patch b/patches.renesas/0036-arm64-dts-r8a7795-salvator-x-Drop-superfluous-status.patch
index 4a26fa3..e6f927f 100644
--- a/patches.renesas/0036-arm64-dts-r8a7795-salvator-x-Drop-superfluous-status.patch
+++ b/patches.renesas/0036-arm64-dts-r8a7795-salvator-x-Drop-superfluous-status.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 971939d1da07c7b55d35aca31288cce297731c71)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 --
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |    2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
-index 277ab8484e0c..f25241921067 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 @@ -362,7 +362,6 @@
@@ -35,6 +33,3 @@
  };
  
  &pciec0 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0037-arm64-dts-m3ulcb-Drop-superfluous-status-update-for-.patch b/patches.renesas/0037-arm64-dts-m3ulcb-Drop-superfluous-status-update-for-.patch
index d064692..3eb0876 100644
--- a/patches.renesas/0037-arm64-dts-m3ulcb-Drop-superfluous-status-update-for-.patch
+++ b/patches.renesas/0037-arm64-dts-m3ulcb-Drop-superfluous-status-update-for-.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit cb4de4ece41a55ba125e6e8d1fa727457132dc41)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 1 -
+ arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
-index c3f064ac2cb4..372b2a944716 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts
 @@ -180,7 +180,6 @@
@@ -27,6 +25,3 @@
  };
  
  &wdt0 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0038-arm64-dts-r8a7796-salvator-x-Drop-superfluous-status.patch b/patches.renesas/0038-arm64-dts-r8a7796-salvator-x-Drop-superfluous-status.patch
index 7ada2da..f241705 100644
--- a/patches.renesas/0038-arm64-dts-r8a7796-salvator-x-Drop-superfluous-status.patch
+++ b/patches.renesas/0038-arm64-dts-r8a7796-salvator-x-Drop-superfluous-status.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 3cbe33367d4fd480a92fbc131a96fa925be9e95d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 1 -
+ arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
-index 74b8c653c9fe..c9f59b6ce33f 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts
 @@ -250,7 +250,6 @@
@@ -27,6 +25,3 @@
  };
  
  &i2c2 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0039-arm64-set-CONFIG_MMC_BCM2835-y-in-defconfig.patch b/patches.renesas/0039-arm64-set-CONFIG_MMC_BCM2835-y-in-defconfig.patch
index f1ed15a..eef3f0a 100644
--- a/patches.renesas/0039-arm64-set-CONFIG_MMC_BCM2835-y-in-defconfig.patch
+++ b/patches.renesas/0039-arm64-set-CONFIG_MMC_BCM2835-y-in-defconfig.patch
@@ -17,11 +17,9 @@
 (cherry picked from commit 3c9d36192802d60fca73c85c7096221371c36be7)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/configs/defconfig | 1 +
+ arch/arm64/configs/defconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 4c3b6235bf3d..a174a015b96e 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -369,6 +369,7 @@ CONFIG_MMC_DW=y
@@ -32,6 +30,3 @@
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0040-arm64-dts-r8a7795-Correct-SATA-device-size-to-2MiB.patch b/patches.renesas/0040-arm64-dts-r8a7795-Correct-SATA-device-size-to-2MiB.patch
index 1834c0c..11ee4d7 100644
--- a/patches.renesas/0040-arm64-dts-r8a7795-Correct-SATA-device-size-to-2MiB.patch
+++ b/patches.renesas/0040-arm64-dts-r8a7795-Correct-SATA-device-size-to-2MiB.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit e9f0089b2d8a3d450b8ec02eccfb92b950110fbe)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index 55c09f1b89c9..e58175084b57 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -1209,7 +1209,7 @@
@@ -28,6 +26,3 @@
  			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
  			clocks = <&cpg CPG_MOD 815>;
  			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0041-arm64-dts-r8a7795-Add-reset-control-properties.patch b/patches.renesas/0041-arm64-dts-r8a7795-Add-reset-control-properties.patch
index 6c4445b..acb1cbd 100644
--- a/patches.renesas/0041-arm64-dts-r8a7795-Add-reset-control-properties.patch
+++ b/patches.renesas/0041-arm64-dts-r8a7795-Add-reset-control-properties.patch
@@ -16,11 +16,9 @@
 (cherry picked from commit dcccc13210eff0e5be2b36548198952c5683f3db)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795.dtsi | 93 ++++++++++++++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi |   93 +++++++++++++++++++++++++++++++
  1 file changed, 93 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
-index e58175084b57..e99d6443b3e4 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
 @@ -204,6 +204,7 @@
@@ -767,6 +765,3 @@
  			#thermal-sensor-cells = <1>;
  			status = "okay";
  		};
--- 
-2.13.3
-
diff --git a/patches.renesas/0042-arm64-dts-r8a7796-Add-reset-control-properties.patch b/patches.renesas/0042-arm64-dts-r8a7796-Add-reset-control-properties.patch
index 8a964e5..7972fd2 100644
--- a/patches.renesas/0042-arm64-dts-r8a7796-Add-reset-control-properties.patch
+++ b/patches.renesas/0042-arm64-dts-r8a7796-Add-reset-control-properties.patch
@@ -16,11 +16,9 @@
 (cherry picked from commit bec0948e810fffce38b9b886b0283a44eb025043)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7796.dtsi | 46 ++++++++++++++++++++++++++++++++
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi |   46 +++++++++++++++++++++++++++++++
  1 file changed, 46 insertions(+)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
-index a90abf14dc4e..2ec1ed5f4991 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi
 @@ -155,6 +155,7 @@
@@ -391,6 +389,3 @@
  			#thermal-sensor-cells = <1>;
  			status = "okay";
  		};
--- 
-2.13.3
-
diff --git a/patches.renesas/0043-arm64-defconfig-Enable-video-DRM-and-LPASS-drivers-f.patch b/patches.renesas/0043-arm64-defconfig-Enable-video-DRM-and-LPASS-drivers-f.patch
index 436d2b7..2d05e1a 100644
--- a/patches.renesas/0043-arm64-defconfig-Enable-video-DRM-and-LPASS-drivers-f.patch
+++ b/patches.renesas/0043-arm64-defconfig-Enable-video-DRM-and-LPASS-drivers-f.patch
@@ -15,11 +15,9 @@
 (cherry picked from commit 0edf17984f251e633465e028a0115d57b1b7eb88)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/configs/defconfig | 11 +++++++++++
+ arch/arm64/configs/defconfig |   11 +++++++++++
  1 file changed, 11 insertions(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index a174a015b96e..55af8c6f3404 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -279,6 +279,7 @@ CONFIG_RENESAS_WDT=y
@@ -51,6 +49,3 @@
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_HDMI=y
  CONFIG_DRM_RCAR_LVDS=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0044-arm64-defconfig-enable-MVPP2.patch b/patches.renesas/0044-arm64-defconfig-enable-MVPP2.patch
index 2d7dcb6..55201f3 100644
--- a/patches.renesas/0044-arm64-defconfig-enable-MVPP2.patch
+++ b/patches.renesas/0044-arm64-defconfig-enable-MVPP2.patch
@@ -11,11 +11,9 @@
 (cherry picked from commit 66e56302842e9971426bd7e504c4db4f88cbb037)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/configs/defconfig | 1 +
+ arch/arm64/configs/defconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 55af8c6f3404..8b5d5f3131d3 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -177,6 +177,7 @@ CONFIG_HNS_ENET=y
@@ -26,6 +24,3 @@
  CONFIG_MVNETA=y
  CONFIG_SKY2=y
  CONFIG_RAVB=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0045-clk-renesas-Add-r8a7795-ES2.0-CPG-Core-Clock-Definit.patch b/patches.renesas/0045-clk-renesas-Add-r8a7795-ES2.0-CPG-Core-Clock-Definit.patch
index c106d29..053c3ec 100644
--- a/patches.renesas/0045-clk-renesas-Add-r8a7795-ES2.0-CPG-Core-Clock-Definit.patch
+++ b/patches.renesas/0045-clk-renesas-Add-r8a7795-ES2.0-CPG-Core-Clock-Definit.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 89f1b1c614253d7ea57543f769d93fced99d4d05)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- include/dt-bindings/clock/r8a7795-cpg-mssr.h | 7 +++++++
+ include/dt-bindings/clock/r8a7795-cpg-mssr.h |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/include/dt-bindings/clock/r8a7795-cpg-mssr.h b/include/dt-bindings/clock/r8a7795-cpg-mssr.h
-index e864aae0a256..f047eaf261f3 100644
 --- a/include/dt-bindings/clock/r8a7795-cpg-mssr.h
 +++ b/include/dt-bindings/clock/r8a7795-cpg-mssr.h
 @@ -60,4 +60,11 @@
@@ -31,6 +29,3 @@
 +#define R8A7795_CLK_S0D12		51
 +
  #endif /* __DT_BINDINGS_CLOCK_R8A7795_CPG_MSSR_H__ */
--- 
-2.13.3
-
diff --git a/patches.renesas/0046-arm64-kdump-enable-kdump-in-defconfig.patch b/patches.renesas/0046-arm64-kdump-enable-kdump-in-defconfig.patch
index 003d29b..7203177 100644
--- a/patches.renesas/0046-arm64-kdump-enable-kdump-in-defconfig.patch
+++ b/patches.renesas/0046-arm64-kdump-enable-kdump-in-defconfig.patch
@@ -11,11 +11,9 @@
 (cherry picked from commit 3f5c1e1e761981b41d0be22f9aadfc7458fcc786)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/configs/defconfig | 1 +
+ arch/arm64/configs/defconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 8b5d5f3131d3..92041816d78f 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -78,6 +78,7 @@ CONFIG_CMA=y
@@ -26,6 +24,3 @@
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
  CONFIG_COMPAT=y
  CONFIG_CPU_IDLE=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0047-arm64-dts-r8a7795-salvator-x-Drop-_clk-suffix-from-X.patch b/patches.renesas/0047-arm64-dts-r8a7795-salvator-x-Drop-_clk-suffix-from-X.patch
index 873b839..528eaae 100644
--- a/patches.renesas/0047-arm64-dts-r8a7795-salvator-x-Drop-_clk-suffix-from-X.patch
+++ b/patches.renesas/0047-arm64-dts-r8a7795-salvator-x-Drop-_clk-suffix-from-X.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit 6922bd71adab0a7fe8ffbdc3e72a46431fa29656)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 +-
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
-index f25241921067..639aa085d996 100644
 --- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 +++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
 @@ -56,7 +56,7 @@
@@ -29,6 +27,3 @@
  		compatible = "fixed-clock";
  		#clock-cells = <0>;
  		clock-frequency = <24576000>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch b/patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch
index 09cbbf8..f46c4d6 100644
--- a/patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch
+++ b/patches.renesas/0048-arm64-defconfig-enable-the-Safexcel-crypto-engine-as.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit 10ebb57ffcbf062ff224585fefa274e703fc363d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm64/configs/defconfig | 1 +
+ arch/arm64/configs/defconfig |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 92041816d78f..8fe9569d8145 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
 @@ -487,6 +487,7 @@ CONFIG_MEMTEST=y
@@ -28,6 +26,3 @@
  CONFIG_ARM64_CRYPTO=y
  CONFIG_CRYPTO_SHA1_ARM64_CE=y
  CONFIG_CRYPTO_SHA2_ARM64_CE=y
--- 
-2.13.3
-
diff --git a/patches.renesas/0049-i2c-rcar-fix-resume-by-always-initializing-registers.patch b/patches.renesas/0049-i2c-rcar-fix-resume-by-always-initializing-registers.patch
index a03d63f..ab3f370 100644
--- a/patches.renesas/0049-i2c-rcar-fix-resume-by-always-initializing-registers.patch
+++ b/patches.renesas/0049-i2c-rcar-fix-resume-by-always-initializing-registers.patch
@@ -15,14 +15,12 @@
 (cherry picked from commit ae481cc139658e89eb3ea671dd00b67bd87f01a3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/i2c/busses/i2c-rcar.c | 4 ++--
+ drivers/i2c/busses/i2c-rcar.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
-index 26f2ff22e97e..66b84bf51bbf 100644
 --- a/drivers/i2c/busses/i2c-rcar.c
 +++ b/drivers/i2c/busses/i2c-rcar.c
-@@ -700,6 +700,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
+@@ -700,6 +700,8 @@ static int rcar_i2c_master_xfer(struct i
  
  	pm_runtime_get_sync(dev);
  
@@ -31,7 +29,7 @@
  	ret = rcar_i2c_bus_barrier(priv);
  	if (ret < 0)
  		goto out;
-@@ -860,8 +862,6 @@ static int rcar_i2c_probe(struct platform_device *pdev)
+@@ -860,8 +862,6 @@ static int rcar_i2c_probe(struct platfor
  	if (ret < 0)
  		goto out_pm_put;
  
@@ -40,6 +38,3 @@
  	/* Don't suspend when multi-master to keep arbitration working */
  	if (of_property_read_bool(dev->of_node, "multi-master"))
  		priv->flags |= ID_P_PM_BLOCKED;
--- 
-2.13.3
-
diff --git a/patches.renesas/0050-i2c-rcar-clarify-PM-handling-with-more-comments.patch b/patches.renesas/0050-i2c-rcar-clarify-PM-handling-with-more-comments.patch
index cc309d8..c02cf04 100644
--- a/patches.renesas/0050-i2c-rcar-clarify-PM-handling-with-more-comments.patch
+++ b/patches.renesas/0050-i2c-rcar-clarify-PM-handling-with-more-comments.patch
@@ -12,14 +12,12 @@
 (cherry picked from commit 63a761eef55759c0bc725739fe575193c09fa4ef)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/i2c/busses/i2c-rcar.c | 4 +++-
+ drivers/i2c/busses/i2c-rcar.c |    4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
-index 66b84bf51bbf..214bf2835d1f 100644
 --- a/drivers/i2c/busses/i2c-rcar.c
 +++ b/drivers/i2c/busses/i2c-rcar.c
-@@ -753,6 +753,7 @@ static int rcar_reg_slave(struct i2c_client *slave)
+@@ -753,6 +753,7 @@ static int rcar_reg_slave(struct i2c_cli
  	if (slave->flags & I2C_CLIENT_TEN)
  		return -EAFNOSUPPORT;
  
@@ -27,7 +25,7 @@
  	pm_runtime_get_sync(rcar_i2c_priv_to_dev(priv));
  
  	priv->slave = slave;
-@@ -856,13 +857,14 @@ static int rcar_i2c_probe(struct platform_device *pdev)
+@@ -856,13 +857,14 @@ static int rcar_i2c_probe(struct platfor
  	priv->dma_direction = DMA_NONE;
  	priv->dma_rx = priv->dma_tx = ERR_PTR(-EPROBE_DEFER);
  
@@ -43,6 +41,3 @@
  	if (of_property_read_bool(dev->of_node, "multi-master"))
  		priv->flags |= ID_P_PM_BLOCKED;
  	else
--- 
-2.13.3
-
diff --git a/patches.renesas/0051-i2c-rcar-use-correct-length-when-unmapping-DMA.patch b/patches.renesas/0051-i2c-rcar-use-correct-length-when-unmapping-DMA.patch
index 0071740..4080454 100644
--- a/patches.renesas/0051-i2c-rcar-use-correct-length-when-unmapping-DMA.patch
+++ b/patches.renesas/0051-i2c-rcar-use-correct-length-when-unmapping-DMA.patch
@@ -18,14 +18,12 @@
 (cherry picked from commit 916335036d4fe33f9806240cb0d1900f4975b959)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/i2c/busses/i2c-rcar.c | 2 +-
+ drivers/i2c/busses/i2c-rcar.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
-index 214bf2835d1f..8be3e6cb8fe6 100644
 --- a/drivers/i2c/busses/i2c-rcar.c
 +++ b/drivers/i2c/busses/i2c-rcar.c
-@@ -319,7 +319,7 @@ static void rcar_i2c_dma_unmap(struct rcar_i2c_priv *priv)
+@@ -319,7 +319,7 @@ static void rcar_i2c_dma_unmap(struct rc
  	rcar_i2c_write(priv, ICFBSCR, TCYC06);
  
  	dma_unmap_single(chan->device->dev, sg_dma_address(&priv->sg),
@@ -34,6 +32,3 @@
  
  	priv->dma_direction = DMA_NONE;
  }
--- 
-2.13.3
-
diff --git a/patches.renesas/0052-ARM-dts-r7s72100-update-sdhi-clock-bindings.patch b/patches.renesas/0052-ARM-dts-r7s72100-update-sdhi-clock-bindings.patch
index f9b262c..bbde6d1 100644
--- a/patches.renesas/0052-ARM-dts-r7s72100-update-sdhi-clock-bindings.patch
+++ b/patches.renesas/0052-ARM-dts-r7s72100-update-sdhi-clock-bindings.patch
@@ -15,12 +15,10 @@
 (cherry picked from commit 3d2abda02ad2d06d5f22de7f6b0f39126670bc48)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r7s72100.dtsi            | 17 ++++++++++++-----
- include/dt-bindings/clock/r7s72100-clock.h |  6 ++++--
+ arch/arm/boot/dts/r7s72100.dtsi            |   17 ++++++++++++-----
+ include/dt-bindings/clock/r7s72100-clock.h |    6 ++++--
  2 files changed, 16 insertions(+), 7 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
-index b8aa256bd515..614ba79a9774 100644
 --- a/arch/arm/boot/dts/r7s72100.dtsi
 +++ b/arch/arm/boot/dts/r7s72100.dtsi
 @@ -162,9 +162,12 @@
@@ -61,8 +59,6 @@
  		cap-sd-highspeed;
  		cap-sdio-irq;
  		status = "disabled";
-diff --git a/include/dt-bindings/clock/r7s72100-clock.h b/include/dt-bindings/clock/r7s72100-clock.h
-index ce09915c298f..cd2ed5194255 100644
 --- a/include/dt-bindings/clock/r7s72100-clock.h
 +++ b/include/dt-bindings/clock/r7s72100-clock.h
 @@ -49,7 +49,9 @@
@@ -77,6 +73,3 @@
 +#define R7S72100_CLK_SDHI11	0
  
  #endif /* __DT_BINDINGS_CLOCK_R7S72100_H__ */
--- 
-2.13.3
-
diff --git a/patches.renesas/0053-ARM-dts-r8a7743-Fix-SCIFB0-dmas-indentation.patch b/patches.renesas/0053-ARM-dts-r8a7743-Fix-SCIFB0-dmas-indentation.patch
index 5612085..a0fdca6 100644
--- a/patches.renesas/0053-ARM-dts-r8a7743-Fix-SCIFB0-dmas-indentation.patch
+++ b/patches.renesas/0053-ARM-dts-r8a7743-Fix-SCIFB0-dmas-indentation.patch
@@ -9,11 +9,9 @@
 (cherry picked from commit c8290f9f2e1d119512e1821fc13d1d145aa23f77)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7743.dtsi | 2 +-
+ arch/arm/boot/dts/r8a7743.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
-index d8393b97768b..c166be2f18e0 100644
 --- a/arch/arm/boot/dts/r8a7743.dtsi
 +++ b/arch/arm/boot/dts/r8a7743.dtsi
 @@ -277,7 +277,7 @@
@@ -25,6 +23,3 @@
  			dma-names = "tx", "rx", "tx", "rx";
  			power-domains = <&sysc R8A7743_PD_ALWAYS_ON>;
  			status = "disabled";
--- 
-2.13.3
-
diff --git a/patches.renesas/0054-ARM-dts-r8a7745-Fix-SCIFB0-dmas-indentation.patch b/patches.renesas/0054-ARM-dts-r8a7745-Fix-SCIFB0-dmas-indentation.patch
index 071d768..bab1353 100644
--- a/patches.renesas/0054-ARM-dts-r8a7745-Fix-SCIFB0-dmas-indentation.patch
+++ b/patches.renesas/0054-ARM-dts-r8a7745-Fix-SCIFB0-dmas-indentation.patch
@@ -9,11 +9,9 @@
 (cherry picked from commit ad20bb6868f1d29f9c911f14087be4f93c098604)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7745.dtsi | 2 +-
+ arch/arm/boot/dts/r8a7745.dtsi |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi
-index 1f65ff68a469..25175a74b6b7 100644
 --- a/arch/arm/boot/dts/r8a7745.dtsi
 +++ b/arch/arm/boot/dts/r8a7745.dtsi
 @@ -277,7 +277,7 @@
@@ -25,6 +23,3 @@
  			dma-names = "tx", "rx", "tx", "rx";
  			power-domains = <&sysc R8A7745_PD_ALWAYS_ON>;
  			status = "disabled";
--- 
-2.13.3
-
diff --git a/patches.renesas/0055-ARM-dts-r8a73a4-Remove-unit-addresses-and-regs-from-.patch b/patches.renesas/0055-ARM-dts-r8a73a4-Remove-unit-addresses-and-regs-from-.patch
index 9ce7fbc..928b85b 100644
--- a/patches.renesas/0055-ARM-dts-r8a73a4-Remove-unit-addresses-and-regs-from-.patch
+++ b/patches.renesas/0055-ARM-dts-r8a73a4-Remove-unit-addresses-and-regs-from-.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit cdaf6417b723e380501f46e555abf0c1c3090124)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a73a4.dtsi | 6 ++----
+ arch/arm/boot/dts/r8a73a4.dtsi |    6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
-index 00eb9a7114dc..6fb7eaba9126 100644
 --- a/arch/arm/boot/dts/r8a73a4.dtsi
 +++ b/arch/arm/boot/dts/r8a73a4.dtsi
 @@ -32,18 +32,16 @@
@@ -42,6 +40,3 @@
  			clocks = <&cpg_clocks R8A73A4_CLK_Z2>;
  			power-domains = <&pd_a3km>;
  			cache-unified;
--- 
-2.13.3
-
diff --git a/patches.renesas/0056-ARM-dts-r8a7743-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0056-ARM-dts-r8a7743-Remove-unit-address-and-reg-from-int.patch
index 06e4651..d19ed5b 100644
--- a/patches.renesas/0056-ARM-dts-r8a7743-Remove-unit-address-and-reg-from-int.patch
+++ b/patches.renesas/0056-ARM-dts-r8a7743-Remove-unit-address-and-reg-from-int.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 37f0c804e57ac93ca37a98aa5a210c6b73e6572a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7743.dtsi | 3 +--
+ arch/arm/boot/dts/r8a7743.dtsi |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7743.dtsi b/arch/arm/boot/dts/r8a7743.dtsi
-index c166be2f18e0..cd908796fb3b 100644
 --- a/arch/arm/boot/dts/r8a7743.dtsi
 +++ b/arch/arm/boot/dts/r8a7743.dtsi
 @@ -32,9 +32,8 @@
@@ -32,6 +30,3 @@
  			cache-unified;
  			cache-level = <2>;
  			power-domains = <&sysc R8A7743_PD_CA15_SCU>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0057-ARM-dts-r8a7745-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0057-ARM-dts-r8a7745-Remove-unit-address-and-reg-from-int.patch
index 61b302b..e17c9b2 100644
--- a/patches.renesas/0057-ARM-dts-r8a7745-Remove-unit-address-and-reg-from-int.patch
+++ b/patches.renesas/0057-ARM-dts-r8a7745-Remove-unit-address-and-reg-from-int.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 51c00a9f730dd27da23e9dec593c22c0f9f5a1b1)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7745.dtsi | 3 +--
+ arch/arm/boot/dts/r8a7745.dtsi |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7745.dtsi b/arch/arm/boot/dts/r8a7745.dtsi
-index 25175a74b6b7..bca88715fada 100644
 --- a/arch/arm/boot/dts/r8a7745.dtsi
 +++ b/arch/arm/boot/dts/r8a7745.dtsi
 @@ -32,9 +32,8 @@
@@ -32,6 +30,3 @@
  			cache-unified;
  			cache-level = <2>;
  			power-domains = <&sysc R8A7745_PD_CA7_SCU>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0058-ARM-dts-r8a7790-Remove-unit-addresses-and-regs-from-.patch b/patches.renesas/0058-ARM-dts-r8a7790-Remove-unit-addresses-and-regs-from-.patch
index 8cf21aa..8c0c8da 100644
--- a/patches.renesas/0058-ARM-dts-r8a7790-Remove-unit-addresses-and-regs-from-.patch
+++ b/patches.renesas/0058-ARM-dts-r8a7790-Remove-unit-addresses-and-regs-from-.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit d492909c84b895564d7ac413546ae988945c68db)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi | 6 ++----
+ arch/arm/boot/dts/r8a7790.dtsi |    6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index 6d10450de6d7..20cf191e0852 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
 @@ -129,17 +129,15 @@
@@ -41,6 +39,3 @@
  			power-domains = <&sysc R8A7790_PD_CA7_SCU>;
  			cache-unified;
  			cache-level = <2>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0059-ARM-dts-r8a7791-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0059-ARM-dts-r8a7791-Remove-unit-address-and-reg-from-int.patch
index 92925a4..e697533 100644
--- a/patches.renesas/0059-ARM-dts-r8a7791-Remove-unit-address-and-reg-from-int.patch
+++ b/patches.renesas/0059-ARM-dts-r8a7791-Remove-unit-address-and-reg-from-int.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 5d6a2165abd4635ecf5ece3d02fe8677f00d32c5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791.dtsi | 3 +--
+ arch/arm/boot/dts/r8a7791.dtsi |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index 381b3c513b25..96f5539aede7 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
 @@ -74,9 +74,8 @@
@@ -32,6 +30,3 @@
  			power-domains = <&sysc R8A7791_PD_CA15_SCU>;
  			cache-unified;
  			cache-level = <2>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0060-ARM-dts-r8a7792-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0060-ARM-dts-r8a7792-Remove-unit-address-and-reg-from-int.patch
index 7eafe82..f0fa4b3 100644
--- a/patches.renesas/0060-ARM-dts-r8a7792-Remove-unit-address-and-reg-from-int.patch
+++ b/patches.renesas/0060-ARM-dts-r8a7792-Remove-unit-address-and-reg-from-int.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit a0504f0880c11da301dc2b5a5135bd02376e367e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7792.dtsi | 3 +--
+ arch/arm/boot/dts/r8a7792.dtsi |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
-index 8ecfda7a004e..c762f44f7732 100644
 --- a/arch/arm/boot/dts/r8a7792.dtsi
 +++ b/arch/arm/boot/dts/r8a7792.dtsi
 @@ -60,9 +60,8 @@
@@ -32,6 +30,3 @@
  			cache-unified;
  			cache-level = <2>;
  			power-domains = <&sysc R8A7792_PD_CA15_SCU>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0061-ARM-dts-r8a7793-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0061-ARM-dts-r8a7793-Remove-unit-address-and-reg-from-int.patch
index 9c5a361..6f9810d 100644
--- a/patches.renesas/0061-ARM-dts-r8a7793-Remove-unit-address-and-reg-from-int.patch
+++ b/patches.renesas/0061-ARM-dts-r8a7793-Remove-unit-address-and-reg-from-int.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit beffa8872a3680ef804eb0320ec77037170f4686)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7793.dtsi | 3 +--
+ arch/arm/boot/dts/r8a7793.dtsi |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
-index 48ce21c5e8db..38506f563b2b 100644
 --- a/arch/arm/boot/dts/r8a7793.dtsi
 +++ b/arch/arm/boot/dts/r8a7793.dtsi
 @@ -65,9 +65,8 @@
@@ -32,6 +30,3 @@
  			power-domains = <&sysc R8A7793_PD_CA15_SCU>;
  			cache-unified;
  			cache-level = <2>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0062-ARM-dts-r8a7794-Remove-unit-address-and-reg-from-int.patch b/patches.renesas/0062-ARM-dts-r8a7794-Remove-unit-address-and-reg-from-int.patch
index 96fa885..d578f44 100644
--- a/patches.renesas/0062-ARM-dts-r8a7794-Remove-unit-address-and-reg-from-int.patch
+++ b/patches.renesas/0062-ARM-dts-r8a7794-Remove-unit-address-and-reg-from-int.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 65d0b7ed40f8a3a41a0ac5ed5ca4d1874c6aaf2d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7794.dtsi | 3 +--
+ arch/arm/boot/dts/r8a7794.dtsi |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
-index 319c1069b7ee..cb31cd2232f9 100644
 --- a/arch/arm/boot/dts/r8a7794.dtsi
 +++ b/arch/arm/boot/dts/r8a7794.dtsi
 @@ -56,9 +56,8 @@
@@ -32,6 +30,3 @@
  			power-domains = <&sysc R8A7794_PD_CA7_SCU>;
  			cache-unified;
  			cache-level = <2>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch b/patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch
index cd39459..bf0908f 100644
--- a/patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch
+++ b/patches.renesas/0063-ARM-dts-r8a7790-Tidyup-Audio-DMAC-channel-for-DVC.patch
@@ -33,11 +33,9 @@
 (cherry picked from commit c4a59df9de199426b773a15e0c774ae25f628d5d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi | 4 ++--
+ arch/arm/boot/dts/r8a7790.dtsi |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index 20cf191e0852..495c583054a8 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
 @@ -1738,11 +1738,11 @@
@@ -54,6 +52,3 @@
  				dma-names = "tx";
  			};
  		};
--- 
-2.13.3
-
diff --git a/patches.renesas/0064-ARM-dts-r7s72100-Add-watchdog-timer.patch b/patches.renesas/0064-ARM-dts-r7s72100-Add-watchdog-timer.patch
index c7d54d8..796da2e 100644
--- a/patches.renesas/0064-ARM-dts-r7s72100-Add-watchdog-timer.patch
+++ b/patches.renesas/0064-ARM-dts-r7s72100-Add-watchdog-timer.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 69ed50de582eff6307fd3fa050fdc505731f0a2d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r7s72100.dtsi | 7 +++++++
+ arch/arm/boot/dts/r7s72100.dtsi |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi
-index 614ba79a9774..9b12d73e67dc 100644
 --- a/arch/arm/boot/dts/r7s72100.dtsi
 +++ b/arch/arm/boot/dts/r7s72100.dtsi
 @@ -371,6 +371,13 @@
@@ -35,6 +33,3 @@
  	i2c0: i2c@fcfee000 {
  		#address-cells = <1>;
  		#size-cells = <0>;
--- 
-2.13.3
-
diff --git a/patches.renesas/0065-ARM-dts-r8a73a4-Add-INTC-SYS-clock-to-device-tree.patch b/patches.renesas/0065-ARM-dts-r8a73a4-Add-INTC-SYS-clock-to-device-tree.patch
index e526e23..9d589c0 100644
--- a/patches.renesas/0065-ARM-dts-r8a73a4-Add-INTC-SYS-clock-to-device-tree.patch
+++ b/patches.renesas/0065-ARM-dts-r8a73a4-Add-INTC-SYS-clock-to-device-tree.patch
@@ -14,12 +14,10 @@
 (cherry picked from commit c11333cc2e7ebe41e2aa4fa353abafa1f21a0662)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a73a4.dtsi            | 13 +++++++++----
- include/dt-bindings/clock/r8a73a4-clock.h |  1 +
+ arch/arm/boot/dts/r8a73a4.dtsi            |   13 +++++++++----
+ include/dt-bindings/clock/r8a73a4-clock.h |    1 +
  2 files changed, 10 insertions(+), 4 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
-index 6fb7eaba9126..1f5c9f6dddba 100644
 --- a/arch/arm/boot/dts/r8a73a4.dtsi
 +++ b/arch/arm/boot/dts/r8a73a4.dtsi
 @@ -467,6 +467,9 @@
@@ -55,8 +53,6 @@
  		};
  		mstp5_clks: mstp5_clks@e6150144 {
  			compatible = "renesas,r8a73a4-mstp-clocks", "renesas,cpg-mstp-clocks";
-diff --git a/include/dt-bindings/clock/r8a73a4-clock.h b/include/dt-bindings/clock/r8a73a4-clock.h
-index dd11ecdf837e..4b3668157257 100644
 --- a/include/dt-bindings/clock/r8a73a4-clock.h
 +++ b/include/dt-bindings/clock/r8a73a4-clock.h
 @@ -54,6 +54,7 @@
@@ -67,6 +63,3 @@
  #define R8A73A4_CLK_IRQC	7
  
  /* MSTP5 */
--- 
-2.13.3
-
diff --git a/patches.renesas/0066-ARM-dts-r8a7790-Add-INTC-SYS-clock-to-device-tree.patch b/patches.renesas/0066-ARM-dts-r8a7790-Add-INTC-SYS-clock-to-device-tree.patch
index 19cbc19..f784fc8 100644
--- a/patches.renesas/0066-ARM-dts-r8a7790-Add-INTC-SYS-clock-to-device-tree.patch
+++ b/patches.renesas/0066-ARM-dts-r8a7790-Add-INTC-SYS-clock-to-device-tree.patch
@@ -14,12 +14,10 @@
 (cherry picked from commit 9e58523624fc063ce43ad3ef2bf6d603bda50a5e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790.dtsi            | 9 ++++++---
- include/dt-bindings/clock/r8a7790-clock.h | 1 +
+ arch/arm/boot/dts/r8a7790.dtsi            |    9 ++++++---
+ include/dt-bindings/clock/r8a7790-clock.h |    1 +
  2 files changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
-index 495c583054a8..534525665bb3 100644
 --- a/arch/arm/boot/dts/r8a7790.dtsi
 +++ b/arch/arm/boot/dts/r8a7790.dtsi
 @@ -185,6 +185,9 @@
@@ -46,8 +44,6 @@
  		};
  		mstp5_clks: mstp5_clks@e6150144 {
  			compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
-diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
-index fa5e8da809f2..20641fa68e73 100644
 --- a/include/dt-bindings/clock/r8a7790-clock.h
 +++ b/include/dt-bindings/clock/r8a7790-clock.h
 @@ -82,6 +82,7 @@
@@ -58,6 +54,3 @@
  
  /* MSTP5 */
  #define R8A7790_CLK_AUDIO_DMAC1		1
--- 
-2.13.3
-
diff --git a/patches.renesas/0067-ARM-dts-r8a7791-Add-INTC-SYS-clock-to-device-tree.patch b/patches.renesas/0067-ARM-dts-r8a7791-Add-INTC-SYS-clock-to-device-tree.patch
index e46b407..44dc994 100644
--- a/patches.renesas/0067-ARM-dts-r8a7791-Add-INTC-SYS-clock-to-device-tree.patch
+++ b/patches.renesas/0067-ARM-dts-r8a7791-Add-INTC-SYS-clock-to-device-tree.patch
@@ -14,12 +14,10 @@
 (cherry picked from commit c2f2e266acb39f86bda1461874568ced7eaa6752)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791.dtsi            | 9 ++++++---
- include/dt-bindings/clock/r8a7791-clock.h | 1 +
+ arch/arm/boot/dts/r8a7791.dtsi            |    9 ++++++---
+ include/dt-bindings/clock/r8a7791-clock.h |    1 +
  2 files changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index 96f5539aede7..9e2bceb2f1d6 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
 @@ -117,6 +117,9 @@
@@ -46,8 +44,6 @@
  		};
  		mstp5_clks: mstp5_clks@e6150144 {
  			compatible = "renesas,r8a7791-mstp-clocks", "renesas,cpg-mstp-clocks";
-diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
-index ffa11379b3f0..adc50dc31ab3 100644
 --- a/include/dt-bindings/clock/r8a7791-clock.h
 +++ b/include/dt-bindings/clock/r8a7791-clock.h
 @@ -72,6 +72,7 @@
@@ -58,6 +54,3 @@
  
  /* MSTP5 */
  #define R8A7791_CLK_AUDIO_DMAC1		1
--- 
-2.13.3
-
diff --git a/patches.renesas/0068-ARM-dts-r8a7792-Add-INTC-SYS-clock-to-device-tree.patch b/patches.renesas/0068-ARM-dts-r8a7792-Add-INTC-SYS-clock-to-device-tree.patch
index f072309..b859ef0 100644
--- a/patches.renesas/0068-ARM-dts-r8a7792-Add-INTC-SYS-clock-to-device-tree.patch
+++ b/patches.renesas/0068-ARM-dts-r8a7792-Add-INTC-SYS-clock-to-device-tree.patch
@@ -14,12 +14,10 @@
 (cherry picked from commit 90dce5428ae5499f06d91297ef10b3b613044774)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7792.dtsi            | 11 ++++++++---
- include/dt-bindings/clock/r8a7792-clock.h |  1 +
+ arch/arm/boot/dts/r8a7792.dtsi            |   11 ++++++++---
+ include/dt-bindings/clock/r8a7792-clock.h |    1 +
  2 files changed, 9 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7792.dtsi b/arch/arm/boot/dts/r8a7792.dtsi
-index c762f44f7732..6c0797ebc08f 100644
 --- a/arch/arm/boot/dts/r8a7792.dtsi
 +++ b/arch/arm/boot/dts/r8a7792.dtsi
 @@ -92,6 +92,9 @@
@@ -48,8 +46,6 @@
  		};
  		mstp7_clks: mstp7_clks@e615014c {
  			compatible = "renesas,r8a7792-mstp-clocks",
-diff --git a/include/dt-bindings/clock/r8a7792-clock.h b/include/dt-bindings/clock/r8a7792-clock.h
-index 9a8b392ceb00..94dd16a1e6e6 100644
 --- a/include/dt-bindings/clock/r8a7792-clock.h
 +++ b/include/dt-bindings/clock/r8a7792-clock.h
 @@ -45,6 +45,7 @@
@@ -60,6 +56,3 @@
  
  /* MSTP5 */
  #define R8A7792_CLK_AUDIO_DMAC0		2
--- 
-2.13.3
-
diff --git a/patches.renesas/0069-ARM-dts-r8a7794-Add-INTC-SYS-clock-to-device-tree.patch b/patches.renesas/0069-ARM-dts-r8a7794-Add-INTC-SYS-clock-to-device-tree.patch
index 01e3ba8..f63b126 100644
--- a/patches.renesas/0069-ARM-dts-r8a7794-Add-INTC-SYS-clock-to-device-tree.patch
+++ b/patches.renesas/0069-ARM-dts-r8a7794-Add-INTC-SYS-clock-to-device-tree.patch
@@ -14,12 +14,10 @@
 (cherry picked from commit 133a3f1a19c99218a39e9d3e91e9e5442fa0f191)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7794.dtsi            | 9 ++++++---
- include/dt-bindings/clock/r8a7794-clock.h | 1 +
+ arch/arm/boot/dts/r8a7794.dtsi            |    9 ++++++---
+ include/dt-bindings/clock/r8a7794-clock.h |    1 +
  2 files changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
-index cb31cd2232f9..38bf9ed8e739 100644
 --- a/arch/arm/boot/dts/r8a7794.dtsi
 +++ b/arch/arm/boot/dts/r8a7794.dtsi
 @@ -74,6 +74,9 @@
@@ -46,8 +44,6 @@
  		};
  		mstp5_clks: mstp5_clks@e6150144 {
  			compatible = "renesas,r8a7794-mstp-clocks", "renesas,cpg-mstp-clocks";
-diff --git a/include/dt-bindings/clock/r8a7794-clock.h b/include/dt-bindings/clock/r8a7794-clock.h
-index 88e64846cf37..a26776f7dedd 100644
 --- a/include/dt-bindings/clock/r8a7794-clock.h
 +++ b/include/dt-bindings/clock/r8a7794-clock.h
 @@ -64,6 +64,7 @@
@@ -58,6 +54,3 @@
  
  /* MSTP5 */
  #define R8A7794_CLK_AUDIO_DMAC0		2
--- 
-2.13.3
-
diff --git a/patches.renesas/0070-ARM-dts-r8a7791-Tidyup-Audio-DMAC-channel-for-DVC.patch b/patches.renesas/0070-ARM-dts-r8a7791-Tidyup-Audio-DMAC-channel-for-DVC.patch
index eca0c56..52d1ddf 100644
--- a/patches.renesas/0070-ARM-dts-r8a7791-Tidyup-Audio-DMAC-channel-for-DVC.patch
+++ b/patches.renesas/0070-ARM-dts-r8a7791-Tidyup-Audio-DMAC-channel-for-DVC.patch
@@ -33,11 +33,9 @@
 (cherry picked from commit d49db72b567d6273f41f045b0c146837d3e50f8d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791.dtsi | 4 ++--
+ arch/arm/boot/dts/r8a7791.dtsi |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
-index 9e2bceb2f1d6..4202d474992e 100644
 --- a/arch/arm/boot/dts/r8a7791.dtsi
 +++ b/arch/arm/boot/dts/r8a7791.dtsi
 @@ -1779,11 +1779,11 @@
@@ -54,6 +52,3 @@
  				dma-names = "tx";
  			};
  		};
--- 
-2.13.3
-
diff --git a/patches.renesas/0071-ARM-dts-r8a7793-Tidyup-Audio-DMAC-channel-for-DVC.patch b/patches.renesas/0071-ARM-dts-r8a7793-Tidyup-Audio-DMAC-channel-for-DVC.patch
index ebdeee7..7b3132a 100644
--- a/patches.renesas/0071-ARM-dts-r8a7793-Tidyup-Audio-DMAC-channel-for-DVC.patch
+++ b/patches.renesas/0071-ARM-dts-r8a7793-Tidyup-Audio-DMAC-channel-for-DVC.patch
@@ -33,11 +33,9 @@
 (cherry picked from commit d2b10f99962aa5ec9865a77827931bf20211a39c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7793.dtsi | 4 ++--
+ arch/arm/boot/dts/r8a7793.dtsi |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
-index 38506f563b2b..53c89b47eaf0 100644
 --- a/arch/arm/boot/dts/r8a7793.dtsi
 +++ b/arch/arm/boot/dts/r8a7793.dtsi
 @@ -1425,11 +1425,11 @@
@@ -54,6 +52,3 @@
  				dma-names = "tx";
  			};
  		};
--- 
-2.13.3
-
diff --git a/patches.renesas/0072-ARM-dts-r8a7793-Add-INTC-SYS-clock-to-device-tree.patch b/patches.renesas/0072-ARM-dts-r8a7793-Add-INTC-SYS-clock-to-device-tree.patch
index 800904e..2d78dcf 100644
--- a/patches.renesas/0072-ARM-dts-r8a7793-Add-INTC-SYS-clock-to-device-tree.patch
+++ b/patches.renesas/0072-ARM-dts-r8a7793-Add-INTC-SYS-clock-to-device-tree.patch
@@ -14,12 +14,10 @@
 (cherry picked from commit 2f25c2d1cdf04ab0f247351e286d3fdefbdad09b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7793.dtsi            | 11 ++++++++---
- include/dt-bindings/clock/r8a7793-clock.h |  5 +++--
+ arch/arm/boot/dts/r8a7793.dtsi            |   11 ++++++++---
+ include/dt-bindings/clock/r8a7793-clock.h |    5 +++--
  2 files changed, 11 insertions(+), 5 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
-index 53c89b47eaf0..9fcf3a9ca084 100644
 --- a/arch/arm/boot/dts/r8a7793.dtsi
 +++ b/arch/arm/boot/dts/r8a7793.dtsi
 @@ -108,6 +108,9 @@
@@ -48,8 +46,6 @@
  		};
  		mstp5_clks: mstp5_clks@e6150144 {
  			compatible = "renesas,r8a7793-mstp-clocks", "renesas,cpg-mstp-clocks";
-diff --git a/include/dt-bindings/clock/r8a7793-clock.h b/include/dt-bindings/clock/r8a7793-clock.h
-index efcbc594fe82..7318d45d4e7e 100644
 --- a/include/dt-bindings/clock/r8a7793-clock.h
 +++ b/include/dt-bindings/clock/r8a7793-clock.h
 @@ -77,10 +77,11 @@
@@ -66,6 +62,3 @@
  #define R8A7793_CLK_ADSP_MOD		6
  #define R8A7793_CLK_THERMAL		22
  #define R8A7793_CLK_PWM			23
--- 
-2.13.3
-
diff --git a/patches.renesas/0073-ARM-dts-porter-Always-use-status-okay-to-enable-devi.patch b/patches.renesas/0073-ARM-dts-porter-Always-use-status-okay-to-enable-devi.patch
index 72afc9b..a15771c 100644
--- a/patches.renesas/0073-ARM-dts-porter-Always-use-status-okay-to-enable-devi.patch
+++ b/patches.renesas/0073-ARM-dts-porter-Always-use-status-okay-to-enable-devi.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit d8fc23051a9b6dd66ed0cc3c2a676991493b8112)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791-porter.dts | 4 ++--
+ arch/arm/boot/dts/r8a7791-porter.dts |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
-index 6761d11d3f9e..d9aa2cd6d625 100644
 --- a/arch/arm/boot/dts/r8a7791-porter.dts
 +++ b/arch/arm/boot/dts/r8a7791-porter.dts
 @@ -226,7 +226,7 @@
@@ -37,6 +35,3 @@
  	pinctrl-0 = <&vin0_pins>;
  	pinctrl-names = "default";
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0074-ARM-dts-bockw-Drop-superfluous-status-update-for-fre.patch b/patches.renesas/0074-ARM-dts-bockw-Drop-superfluous-status-update-for-fre.patch
index 2a3ef9e..91bb43a 100644
--- a/patches.renesas/0074-ARM-dts-bockw-Drop-superfluous-status-update-for-fre.patch
+++ b/patches.renesas/0074-ARM-dts-bockw-Drop-superfluous-status-update-for-fre.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit ffbb98d4d1f194e455bae2bc2eab2995188c652e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7778-bockw.dts | 1 -
+ arch/arm/boot/dts/r8a7778-bockw.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
-index 211d239d9041..c79d55eb43c5 100644
 --- a/arch/arm/boot/dts/r8a7778-bockw.dts
 +++ b/arch/arm/boot/dts/r8a7778-bockw.dts
 @@ -229,5 +229,4 @@
@@ -25,6 +23,3 @@
  	clock-frequency = <14745600>;
 -	status = "okay";
  };
--- 
-2.13.3
-
diff --git a/patches.renesas/0075-ARM-dts-marzen-Drop-superfluous-status-update-for-fr.patch b/patches.renesas/0075-ARM-dts-marzen-Drop-superfluous-status-update-for-fr.patch
index 93112d6..0628794 100644
--- a/patches.renesas/0075-ARM-dts-marzen-Drop-superfluous-status-update-for-fr.patch
+++ b/patches.renesas/0075-ARM-dts-marzen-Drop-superfluous-status-update-for-fr.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 2f69fd8cb2187631ad68531a07406ad6b179b122)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7779-marzen.dts | 1 -
+ arch/arm/boot/dts/r8a7779-marzen.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
-index 89c5b24a3d03..9412a86f9b30 100644
 --- a/arch/arm/boot/dts/r8a7779-marzen.dts
 +++ b/arch/arm/boot/dts/r8a7779-marzen.dts
 @@ -236,7 +236,6 @@
@@ -27,6 +25,3 @@
  };
  
  &sdhi0 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0076-ARM-dts-lager-Drop-superfluous-status-update-for-fre.patch b/patches.renesas/0076-ARM-dts-lager-Drop-superfluous-status-update-for-fre.patch
index afea0de..0982b65 100644
--- a/patches.renesas/0076-ARM-dts-lager-Drop-superfluous-status-update-for-fre.patch
+++ b/patches.renesas/0076-ARM-dts-lager-Drop-superfluous-status-update-for-fre.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 2507e3d41a3f0f09e7d756b34e3bb953d6d3b76d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7790-lager.dts | 1 -
+ arch/arm/boot/dts/r8a7790-lager.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
-index bd512c86e852..ba100a6f67ca 100644
 --- a/arch/arm/boot/dts/r8a7790-lager.dts
 +++ b/arch/arm/boot/dts/r8a7790-lager.dts
 @@ -581,7 +581,6 @@
@@ -27,6 +25,3 @@
  };
  
  &msiof1 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0077-ARM-dts-koelsch-Drop-superfluous-status-updates-for-.patch b/patches.renesas/0077-ARM-dts-koelsch-Drop-superfluous-status-updates-for-.patch
index d781885..4aaa6e2 100644
--- a/patches.renesas/0077-ARM-dts-koelsch-Drop-superfluous-status-updates-for-.patch
+++ b/patches.renesas/0077-ARM-dts-koelsch-Drop-superfluous-status-updates-for-.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit b20b1de4b542749a500c426796bb7fa400b03e58)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791-koelsch.dts | 2 --
+ arch/arm/boot/dts/r8a7791-koelsch.dts |    2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
-index 5405d337d744..59beb8402a36 100644
 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts
 +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
 @@ -516,7 +516,6 @@
@@ -35,6 +33,3 @@
  };
  
  &pciec {
--- 
-2.13.3
-
diff --git a/patches.renesas/0078-ARM-dts-porter-Drop-superfluous-status-update-for-fr.patch b/patches.renesas/0078-ARM-dts-porter-Drop-superfluous-status-update-for-fr.patch
index 27078ea..269fbeb 100644
--- a/patches.renesas/0078-ARM-dts-porter-Drop-superfluous-status-update-for-fr.patch
+++ b/patches.renesas/0078-ARM-dts-porter-Drop-superfluous-status-update-for-fr.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit b546d090c8ecca05c83e71d931f6d9ad72a8d730)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7791-porter.dts | 1 -
+ arch/arm/boot/dts/r8a7791-porter.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
-index d9aa2cd6d625..95da5cb9d37a 100644
 --- a/arch/arm/boot/dts/r8a7791-porter.dts
 +++ b/arch/arm/boot/dts/r8a7791-porter.dts
 @@ -401,7 +401,6 @@
@@ -27,6 +25,3 @@
  };
  
  &pciec {
--- 
-2.13.3
-
diff --git a/patches.renesas/0079-ARM-dts-gose-Drop-superfluous-status-update-for-freq.patch b/patches.renesas/0079-ARM-dts-gose-Drop-superfluous-status-update-for-freq.patch
index 47d59e9..997f954 100644
--- a/patches.renesas/0079-ARM-dts-gose-Drop-superfluous-status-update-for-freq.patch
+++ b/patches.renesas/0079-ARM-dts-gose-Drop-superfluous-status-update-for-freq.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit e68f8b428d84c304ca534505eafa98cb02a5bae0)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7793-gose.dts | 1 -
+ arch/arm/boot/dts/r8a7793-gose.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7793-gose.dts b/arch/arm/boot/dts/r8a7793-gose.dts
-index 92fff07c5e2b..806c93f6ae8b 100644
 --- a/arch/arm/boot/dts/r8a7793-gose.dts
 +++ b/arch/arm/boot/dts/r8a7793-gose.dts
 @@ -412,7 +412,6 @@
@@ -27,6 +25,3 @@
  };
  
  &sdhi0 {
--- 
-2.13.3
-
diff --git a/patches.renesas/0080-ARM-dts-alt-Drop-superfluous-status-update-for-frequ.patch b/patches.renesas/0080-ARM-dts-alt-Drop-superfluous-status-update-for-frequ.patch
index d9816ea..1417fd4 100644
--- a/patches.renesas/0080-ARM-dts-alt-Drop-superfluous-status-update-for-frequ.patch
+++ b/patches.renesas/0080-ARM-dts-alt-Drop-superfluous-status-update-for-frequ.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit e5fada0cf2131b901e411bb65c22ddc98b6dcf98)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7794-alt.dts | 1 -
+ arch/arm/boot/dts/r8a7794-alt.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
-index 569e3f0e97a5..3fcf76b8e923 100644
 --- a/arch/arm/boot/dts/r8a7794-alt.dts
 +++ b/arch/arm/boot/dts/r8a7794-alt.dts
 @@ -375,7 +375,6 @@
@@ -27,6 +25,3 @@
  };
  
  &qspi {
--- 
-2.13.3
-
diff --git a/patches.renesas/0081-ARM-dts-silk-Drop-superfluous-status-update-for-freq.patch b/patches.renesas/0081-ARM-dts-silk-Drop-superfluous-status-update-for-freq.patch
index 778bb30..1115ada 100644
--- a/patches.renesas/0081-ARM-dts-silk-Drop-superfluous-status-update-for-freq.patch
+++ b/patches.renesas/0081-ARM-dts-silk-Drop-superfluous-status-update-for-freq.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit d01ff18992218f3a13f45f45a886b3bf8f250f14)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/r8a7794-silk.dts | 1 -
+ arch/arm/boot/dts/r8a7794-silk.dts |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/arch/arm/boot/dts/r8a7794-silk.dts b/arch/arm/boot/dts/r8a7794-silk.dts
-index cf880ac06f4b..c742d80d6dca 100644
 --- a/arch/arm/boot/dts/r8a7794-silk.dts
 +++ b/arch/arm/boot/dts/r8a7794-silk.dts
 @@ -248,7 +248,6 @@
@@ -27,6 +25,3 @@
  };
  
  &ether {
--- 
-2.13.3
-
diff --git a/patches.renesas/0082-ARM-shmobile-Document-RZ-G1H-SoC-DT-binding.patch b/patches.renesas/0082-ARM-shmobile-Document-RZ-G1H-SoC-DT-binding.patch
index 7331ca2..2e12fc9 100644
--- a/patches.renesas/0082-ARM-shmobile-Document-RZ-G1H-SoC-DT-binding.patch
+++ b/patches.renesas/0082-ARM-shmobile-Document-RZ-G1H-SoC-DT-binding.patch
@@ -10,11 +10,9 @@
 (cherry picked from commit 368d03531f39ffaa793a98b9a17c79d660b1cd1a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
+ Documentation/devicetree/bindings/arm/shmobile.txt |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
-index c9502634316d..b8155a209c58 100644
 --- a/Documentation/devicetree/bindings/arm/shmobile.txt
 +++ b/Documentation/devicetree/bindings/arm/shmobile.txt
 @@ -13,6 +13,8 @@ SoCs:
@@ -26,6 +24,3 @@
    - RZ/G1M (R8A77430)
      compatible = "renesas,r8a7743"
    - RZ/G1E (R8A77450)
--- 
-2.13.3
-
diff --git a/patches.renesas/0083-ARM-shmobile-Document-RZ-G1N-SoC-DT-binding.patch b/patches.renesas/0083-ARM-shmobile-Document-RZ-G1N-SoC-DT-binding.patch
index 8b48c8d..3928609 100644
--- a/patches.renesas/0083-ARM-shmobile-Document-RZ-G1N-SoC-DT-binding.patch
+++ b/patches.renesas/0083-ARM-shmobile-Document-RZ-G1N-SoC-DT-binding.patch
@@ -10,11 +10,9 @@
 (cherry picked from commit cfb9f93437eb6663ca99e85c47bb3656ccfe59c5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
+ Documentation/devicetree/bindings/arm/shmobile.txt |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
-index b8155a209c58..170fe0562c63 100644
 --- a/Documentation/devicetree/bindings/arm/shmobile.txt
 +++ b/Documentation/devicetree/bindings/arm/shmobile.txt
 @@ -17,6 +17,8 @@ SoCs:
@@ -26,6 +24,3 @@
    - RZ/G1E (R8A77450)
      compatible = "renesas,r8a7745"
    - R-Car M1A (R8A77781)
--- 
-2.13.3
-
diff --git a/patches.renesas/0084-ARM-8660-1-shmobile-r7s72100-Enable-L2-cache.patch b/patches.renesas/0084-ARM-8660-1-shmobile-r7s72100-Enable-L2-cache.patch
index d8fa195..12fdca6 100644
--- a/patches.renesas/0084-ARM-8660-1-shmobile-r7s72100-Enable-L2-cache.patch
+++ b/patches.renesas/0084-ARM-8660-1-shmobile-r7s72100-Enable-L2-cache.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit a96bb197693eb9e7a7221867bd944ccd6b6e12e6)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/mach-shmobile/setup-r7s72100.c | 2 ++
+ arch/arm/mach-shmobile/setup-r7s72100.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
-index d46639fc6849..319ca9508ec6 100644
 --- a/arch/arm/mach-shmobile/setup-r7s72100.c
 +++ b/arch/arm/mach-shmobile/setup-r7s72100.c
-@@ -26,6 +26,8 @@ static const char *const r7s72100_boards_compat_dt[] __initconst = {
+@@ -26,6 +26,8 @@ static const char *const r7s72100_boards
  };
  
  DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
@@ -29,6 +27,3 @@
  	.init_early	= shmobile_init_delay,
  	.init_late	= shmobile_init_late,
  	.dt_compat	= r7s72100_boards_compat_dt,
--- 
-2.13.3
-
diff --git a/patches.renesas/0085-phy-rcar-gen3-usb2-fix-implementation-for-runtime-PM.patch b/patches.renesas/0085-phy-rcar-gen3-usb2-fix-implementation-for-runtime-PM.patch
index f0579b7..6289d73 100644
--- a/patches.renesas/0085-phy-rcar-gen3-usb2-fix-implementation-for-runtime-PM.patch
+++ b/patches.renesas/0085-phy-rcar-gen3-usb2-fix-implementation-for-runtime-PM.patch
@@ -16,11 +16,9 @@
 (cherry picked from commit 441a681b8843474c9796b50c35794ff102701f37)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/phy/phy-rcar-gen3-usb2.c | 31 ++++++++++++++++++++++++-------
+ drivers/phy/phy-rcar-gen3-usb2.c |   31 ++++++++++++++++++++++++-------
  1 file changed, 24 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c
-index 54a83675f0a8..e35af04301ac 100644
 --- a/drivers/phy/phy-rcar-gen3-usb2.c
 +++ b/drivers/phy/phy-rcar-gen3-usb2.c
 @@ -20,6 +20,7 @@
@@ -31,7 +29,7 @@
  #include <linux/regulator/consumer.h>
  #include <linux/workqueue.h>
  
-@@ -395,7 +396,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
+@@ -395,7 +396,7 @@ static int rcar_gen3_phy_usb2_probe(stru
  	struct rcar_gen3_chan *channel;
  	struct phy_provider *provider;
  	struct resource *res;
@@ -40,7 +38,7 @@
  
  	if (!dev->of_node) {
  		dev_err(dev, "This driver needs device tree\n");
-@@ -434,17 +435,24 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
+@@ -434,17 +435,24 @@ static int rcar_gen3_phy_usb2_probe(stru
  		}
  	}
  
@@ -69,7 +67,7 @@
  		channel->vbus = NULL;
  	}
  
-@@ -454,15 +462,22 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
+@@ -454,15 +462,22 @@ static int rcar_gen3_phy_usb2_probe(stru
  	provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);
  	if (IS_ERR(provider)) {
  		dev_err(dev, "Failed to register PHY provider\n");
@@ -94,7 +92,7 @@
  }
  
  static int rcar_gen3_phy_usb2_remove(struct platform_device *pdev)
-@@ -472,6 +487,8 @@ static int rcar_gen3_phy_usb2_remove(struct platform_device *pdev)
+@@ -472,6 +487,8 @@ static int rcar_gen3_phy_usb2_remove(str
  	if (channel->has_otg)
  		device_remove_file(&pdev->dev, &dev_attr_role);
  
@@ -103,6 +101,3 @@
  	return 0;
  };
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0086-dmaengine-rcar-dmac-enable-descriptor-mode-on-40bit.patch b/patches.renesas/0086-dmaengine-rcar-dmac-enable-descriptor-mode-on-40bit.patch
index 130fd03..f65d006 100644
--- a/patches.renesas/0086-dmaengine-rcar-dmac-enable-descriptor-mode-on-40bit.patch
+++ b/patches.renesas/0086-dmaengine-rcar-dmac-enable-descriptor-mode-on-40bit.patch
@@ -17,14 +17,12 @@
 (cherry picked from commit 1175f83cdb7a321b8b7b061d18846d58490b2654)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/dma/sh/rcar-dmac.c | 52 ++++++++++++++++++++++++++++------------------
+ drivers/dma/sh/rcar-dmac.c |   52 +++++++++++++++++++++++++++------------------
  1 file changed, 32 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
-index 48b22d5c8602..db41795fe42a 100644
 --- a/drivers/dma/sh/rcar-dmac.c
 +++ b/drivers/dma/sh/rcar-dmac.c
-@@ -344,13 +344,19 @@ static void rcar_dmac_chan_start_xfer(struct rcar_dmac_chan *chan)
+@@ -344,13 +344,19 @@ static void rcar_dmac_chan_start_xfer(st
  		rcar_dmac_chan_write(chan, RCAR_DMARS, chan->mid_rid);
  
  	if (desc->hwdescs.use) {
@@ -45,7 +43,7 @@
  		rcar_dmac_chan_write(chan, RCAR_DMAFIXDPBASE,
  				     desc->hwdescs.dma >> 32);
  #endif
-@@ -368,8 +374,6 @@ static void rcar_dmac_chan_start_xfer(struct rcar_dmac_chan *chan)
+@@ -368,8 +374,6 @@ static void rcar_dmac_chan_start_xfer(st
  		 * should. Initialize it manually with the destination address
  		 * of the first chunk.
  		 */
@@ -54,7 +52,7 @@
  		rcar_dmac_chan_write(chan, RCAR_DMADAR,
  				     chunk->dst_addr & 0xffffffff);
  
-@@ -855,8 +859,12 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_chan *chan, struct scatterlist *sgl,
+@@ -855,8 +859,12 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_
  	unsigned int nchunks = 0;
  	unsigned int max_chunk_size;
  	unsigned int full_size = 0;
@@ -68,7 +66,7 @@
  
  	desc = rcar_dmac_desc_get(chan);
  	if (!desc)
-@@ -882,6 +890,16 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_chan *chan, struct scatterlist *sgl,
+@@ -882,6 +890,16 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_
  
  		full_size += len;
  
@@ -85,7 +83,7 @@
  		while (len) {
  			unsigned int size = min(len, max_chunk_size);
  
-@@ -890,18 +908,14 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_chan *chan, struct scatterlist *sgl,
+@@ -890,18 +908,14 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_
  			 * Prevent individual transfers from crossing 4GB
  			 * boundaries.
  			 */
@@ -110,7 +108,7 @@
  #endif
  
  			chunk = rcar_dmac_xfer_chunk_get(chan);
-@@ -943,13 +957,11 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_chan *chan, struct scatterlist *sgl,
+@@ -943,13 +957,11 @@ rcar_dmac_chan_prep_sg(struct rcar_dmac_
  	 * Use hardware descriptor lists if possible when more than one chunk
  	 * needs to be transferred (otherwise they don't make much sense).
  	 *
@@ -128,6 +126,3 @@
  	if (desc->hwdescs.use) {
  		if (rcar_dmac_fill_hwdesc(chan, desc) < 0)
  			desc->hwdescs.use = false;
--- 
-2.13.3
-
diff --git a/patches.renesas/0087-rcar-dmac-fixup-descriptor-pointer-for-descriptor-mo.patch b/patches.renesas/0087-rcar-dmac-fixup-descriptor-pointer-for-descriptor-mo.patch
index 38ccd71..4650053 100644
--- a/patches.renesas/0087-rcar-dmac-fixup-descriptor-pointer-for-descriptor-mo.patch
+++ b/patches.renesas/0087-rcar-dmac-fixup-descriptor-pointer-for-descriptor-mo.patch
@@ -15,14 +15,12 @@
 (cherry picked from commit 56b177055adb246cdeca174331dbf92fc49bfccd)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/dma/sh/rcar-dmac.c | 3 +++
+ drivers/dma/sh/rcar-dmac.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c
-index db41795fe42a..bd261c9e9664 100644
 --- a/drivers/dma/sh/rcar-dmac.c
 +++ b/drivers/dma/sh/rcar-dmac.c
-@@ -1287,6 +1287,9 @@ static unsigned int rcar_dmac_chan_get_residue(struct rcar_dmac_chan *chan,
+@@ -1287,6 +1287,9 @@ static unsigned int rcar_dmac_chan_get_r
  	if (desc->hwdescs.use) {
  		dptr = (rcar_dmac_chan_read(chan, RCAR_DMACHCRB) &
  			RCAR_DMACHCRB_DPTR_MASK) >> RCAR_DMACHCRB_DPTR_SHIFT;
@@ -32,6 +30,3 @@
  		WARN_ON(dptr >= desc->nchunks);
  	} else {
  		running = desc->running;
--- 
-2.13.3
-
diff --git a/patches.renesas/0088-soc-renesas-Provide-dummy-rcar_rst_read_mode_pins-fo.patch b/patches.renesas/0088-soc-renesas-Provide-dummy-rcar_rst_read_mode_pins-fo.patch
index facebba..cb6751f 100644
--- a/patches.renesas/0088-soc-renesas-Provide-dummy-rcar_rst_read_mode_pins-fo.patch
+++ b/patches.renesas/0088-soc-renesas-Provide-dummy-rcar_rst_read_mode_pins-fo.patch
@@ -19,11 +19,9 @@
 (cherry picked from commit 7b4ccb3c466f62bbf2f4dd5d6a143d945a6f3051)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- include/linux/soc/renesas/rcar-rst.h | 5 +++++
+ include/linux/soc/renesas/rcar-rst.h |    5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/include/linux/soc/renesas/rcar-rst.h b/include/linux/soc/renesas/rcar-rst.h
-index a18e0783946b..787e7ad53d45 100644
 --- a/include/linux/soc/renesas/rcar-rst.h
 +++ b/include/linux/soc/renesas/rcar-rst.h
 @@ -1,6 +1,11 @@
@@ -38,6 +36,3 @@
 +#endif
  
  #endif /* __LINUX_SOC_RENESAS_RCAR_RST_H__ */
--- 
-2.13.3
-
diff --git a/patches.renesas/0089-ASoC-rsnd-drop-useles-self-assignments.patch b/patches.renesas/0089-ASoC-rsnd-drop-useles-self-assignments.patch
index d6d1604..83cd9d2 100644
--- a/patches.renesas/0089-ASoC-rsnd-drop-useles-self-assignments.patch
+++ b/patches.renesas/0089-ASoC-rsnd-drop-useles-self-assignments.patch
@@ -11,14 +11,12 @@
 (cherry picked from commit 34157f7bec8276b4296cf2ec172fc13385ac8af7)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/core.c | 2 --
+ sound/soc/sh/rcar/core.c |    2 --
  1 file changed, 2 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 47b370cb2d3b..24adb3cc17aa 100644
 --- a/sound/soc/sh/rcar/core.c
 +++ b/sound/soc/sh/rcar/core.c
-@@ -674,12 +674,10 @@ static int rsnd_soc_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
+@@ -674,12 +674,10 @@ static int rsnd_soc_dai_set_fmt(struct s
  	/* set clock inversion */
  	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
  	case SND_SOC_DAIFMT_NB_IF:
@@ -31,6 +29,3 @@
  		break;
  	case SND_SOC_DAIFMT_IB_IF:
  		rdai->bit_clk_inv = !rdai->bit_clk_inv;
--- 
-2.13.3
-
diff --git a/patches.renesas/0090-ASoC-rsnd-check-return-value-of-init-function.patch b/patches.renesas/0090-ASoC-rsnd-check-return-value-of-init-function.patch
index cbf3e1f..0851c66 100644
--- a/patches.renesas/0090-ASoC-rsnd-check-return-value-of-init-function.patch
+++ b/patches.renesas/0090-ASoC-rsnd-check-return-value-of-init-function.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit 56d2c61d611a50e58dba521be1325dc90f9cc933)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/adg.c | 5 ++++-
+ sound/soc/sh/rcar/adg.c |    5 ++++-
  1 file changed, 4 insertions(+), 1 deletion(-)
 
-diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
-index 85a33ac0a5c4..54146f66538c 100644
 --- a/sound/soc/sh/rcar/adg.c
 +++ b/sound/soc/sh/rcar/adg.c
-@@ -564,6 +564,7 @@ int rsnd_adg_probe(struct rsnd_priv *priv)
+@@ -564,6 +564,7 @@ int rsnd_adg_probe(struct rsnd_priv *pri
  	struct rsnd_adg *adg;
  	struct device *dev = rsnd_priv_to_dev(priv);
  	struct device_node *np = dev->of_node;
@@ -28,7 +26,7 @@
  
  	adg = devm_kzalloc(dev, sizeof(*adg), GFP_KERNEL);
  	if (!adg) {
-@@ -571,8 +572,10 @@ int rsnd_adg_probe(struct rsnd_priv *priv)
+@@ -571,8 +572,10 @@ int rsnd_adg_probe(struct rsnd_priv *pri
  		return -ENOMEM;
  	}
  
@@ -40,6 +38,3 @@
  
  	rsnd_adg_get_clkin(priv, adg);
  	rsnd_adg_get_clkout(priv, adg);
--- 
-2.13.3
-
diff --git a/patches.renesas/0091-ASoC-rcar-enable-PCM-RATE-untile-192000.patch b/patches.renesas/0091-ASoC-rcar-enable-PCM-RATE-untile-192000.patch
index 9797dd8..507d577 100644
--- a/patches.renesas/0091-ASoC-rcar-enable-PCM-RATE-untile-192000.patch
+++ b/patches.renesas/0091-ASoC-rcar-enable-PCM-RATE-untile-192000.patch
@@ -11,11 +11,9 @@
 (cherry picked from commit dc2721564f6da549f6eb29ac5bca28d65beadcb7)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/core.c | 2 +-
+ sound/soc/sh/rcar/core.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 24adb3cc17aa..672783e18711 100644
 --- a/sound/soc/sh/rcar/core.c
 +++ b/sound/soc/sh/rcar/core.c
 @@ -96,7 +96,7 @@
@@ -27,6 +25,3 @@
  #define RSND_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
  
  static const struct of_device_id rsnd_of_match[] = {
--- 
-2.13.3
-
diff --git a/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch b/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch
index 9bfb47e..7e4728a 100644
--- a/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch
+++ b/patches.renesas/0092-ASoC-rcar-ssi-don-t-set-SSICR.CKDV-000-with-SSIWSR.C.patch
@@ -16,14 +16,12 @@
 (cherry picked from commit 6b8530cc056efd4a11b034ca5b1e9f7e9563f553)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/ssi.c | 9 +++++++++
+ sound/soc/sh/rcar/ssi.c |    9 +++++++++
  1 file changed, 9 insertions(+)
 
-diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index 411bda2387ad..135c5669f796 100644
 --- a/sound/soc/sh/rcar/ssi.c
 +++ b/sound/soc/sh/rcar/ssi.c
-@@ -228,6 +228,15 @@ static int rsnd_ssi_master_clk_start(struct rsnd_mod *mod,
+@@ -228,6 +228,15 @@ static int rsnd_ssi_master_clk_start(str
  	for (j = 0; j < ARRAY_SIZE(ssi_clk_mul_table); j++) {
  
  		/*
@@ -39,6 +37,3 @@
  		 * this driver is assuming that
  		 * system word is 32bit x chan
  		 * see rsnd_ssi_init()
--- 
-2.13.3
-
diff --git a/patches.renesas/0093-ASoC-rcar-remove-rsnd_kctrl_remove.patch b/patches.renesas/0093-ASoC-rcar-remove-rsnd_kctrl_remove.patch
index 0451fe3..2ed082f 100644
--- a/patches.renesas/0093-ASoC-rcar-remove-rsnd_kctrl_remove.patch
+++ b/patches.renesas/0093-ASoC-rcar-remove-rsnd_kctrl_remove.patch
@@ -16,16 +16,14 @@
 (cherry picked from commit e0c4211854bfebd5507761a2bfddaa9e37074230)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/core.c |  9 ---------
- sound/soc/sh/rcar/dvc.c  | 16 ----------------
- sound/soc/sh/rcar/rsnd.h |  3 ---
+ sound/soc/sh/rcar/core.c |    9 ---------
+ sound/soc/sh/rcar/dvc.c  |   16 ----------------
+ sound/soc/sh/rcar/rsnd.h |    3 ---
  3 files changed, 28 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 672783e18711..35c96e4bbd64 100644
 --- a/sound/soc/sh/rcar/core.c
 +++ b/sound/soc/sh/rcar/core.c
-@@ -1037,15 +1037,6 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
+@@ -1037,15 +1037,6 @@ static int __rsnd_kctrl_new(struct rsnd_
  	return 0;
  }
  
@@ -41,11 +39,9 @@
  int rsnd_kctrl_new_m(struct rsnd_mod *mod,
  		     struct rsnd_dai_stream *io,
  		     struct snd_soc_pcm_runtime *rtd,
-diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
-index cf8f59cdd8d7..994fdb7d0034 100644
 --- a/sound/soc/sh/rcar/dvc.c
 +++ b/sound/soc/sh/rcar/dvc.c
-@@ -218,21 +218,6 @@ static int rsnd_dvc_probe_(struct rsnd_mod *mod,
+@@ -218,21 +218,6 @@ static int rsnd_dvc_probe_(struct rsnd_m
  	return rsnd_cmd_attach(io, rsnd_mod_id(mod));
  }
  
@@ -67,7 +63,7 @@
  static int rsnd_dvc_init(struct rsnd_mod *mod,
  			 struct rsnd_dai_stream *io,
  			 struct rsnd_priv *priv)
-@@ -332,7 +317,6 @@ static struct rsnd_mod_ops rsnd_dvc_ops = {
+@@ -332,7 +317,6 @@ static struct rsnd_mod_ops rsnd_dvc_ops
  	.name		= DVC_NAME,
  	.dma_req	= rsnd_dvc_dma_req,
  	.probe		= rsnd_dvc_probe_,
@@ -75,8 +71,6 @@
  	.init		= rsnd_dvc_init,
  	.quit		= rsnd_dvc_quit,
  	.pcm_new	= rsnd_dvc_pcm_new,
-diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 7410ec0174db..81ef3f18834a 100644
 --- a/sound/soc/sh/rcar/rsnd.h
 +++ b/sound/soc/sh/rcar/rsnd.h
 @@ -611,9 +611,6 @@ struct rsnd_kctrl_cfg_s {
@@ -89,6 +83,3 @@
  int rsnd_kctrl_new_m(struct rsnd_mod *mod,
  		     struct rsnd_dai_stream *io,
  		     struct snd_soc_pcm_runtime *rtd,
--- 
-2.13.3
-
diff --git a/patches.renesas/0094-ASoC-rcar-fixup-of_clk_add_provider-usage-for-multi-.patch b/patches.renesas/0094-ASoC-rcar-fixup-of_clk_add_provider-usage-for-multi-.patch
index eb6bfe2..665245a 100644
--- a/patches.renesas/0094-ASoC-rcar-fixup-of_clk_add_provider-usage-for-multi-.patch
+++ b/patches.renesas/0094-ASoC-rcar-fixup-of_clk_add_provider-usage-for-multi-.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit d7f298197a22f11b38059f257842dac7c30a564c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/adg.c | 14 ++++++--------
+ sound/soc/sh/rcar/adg.c |   14 ++++++--------
  1 file changed, 6 insertions(+), 8 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
-index 54146f66538c..33378618deeb 100644
 --- a/sound/soc/sh/rcar/adg.c
 +++ b/sound/soc/sh/rcar/adg.c
-@@ -537,16 +537,14 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -537,16 +537,14 @@ static void rsnd_adg_get_clkout(struct r
  			clk = clk_register_fixed_rate(dev, clkout_name[i],
  						      parent_clk_name, 0,
  						      req_rate);
@@ -43,6 +41,3 @@
  	}
  
  	adg->ckr = ckr;
--- 
-2.13.3
-
diff --git a/patches.renesas/0095-ASoC-rcar-call-missing-of_clk_del_provider-when-remo.patch b/patches.renesas/0095-ASoC-rcar-call-missing-of_clk_del_provider-when-remo.patch
index e22ec80..03d6276 100644
--- a/patches.renesas/0095-ASoC-rcar-call-missing-of_clk_del_provider-when-remo.patch
+++ b/patches.renesas/0095-ASoC-rcar-call-missing-of_clk_del_provider-when-remo.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit b5aac5a9adf667f907c34c520e023bc19f8c226c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/adg.c | 5 +++++
+ sound/soc/sh/rcar/adg.c |    5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
-index 33378618deeb..214a9ce90bb4 100644
 --- a/sound/soc/sh/rcar/adg.c
 +++ b/sound/soc/sh/rcar/adg.c
-@@ -590,5 +590,10 @@ int rsnd_adg_probe(struct rsnd_priv *priv)
+@@ -590,5 +590,10 @@ int rsnd_adg_probe(struct rsnd_priv *pri
  
  void rsnd_adg_remove(struct rsnd_priv *priv)
  {
@@ -31,6 +29,3 @@
 +
  	rsnd_adg_clk_disable(priv);
  }
--- 
-2.13.3
-
diff --git a/patches.renesas/0096-ASoC-rsnd-tidyup-src-convert_rate-reset-timing.patch b/patches.renesas/0096-ASoC-rsnd-tidyup-src-convert_rate-reset-timing.patch
index fbaaf62..9e816e8 100644
--- a/patches.renesas/0096-ASoC-rsnd-tidyup-src-convert_rate-reset-timing.patch
+++ b/patches.renesas/0096-ASoC-rsnd-tidyup-src-convert_rate-reset-timing.patch
@@ -23,14 +23,12 @@
 (cherry picked from commit fc99d23f6d3ec6b17772915114018444393e0ad1)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/src.c | 3 +--
+ sound/soc/sh/rcar/src.c |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
-index 42db48db09ba..20b5b2ec625e 100644
 --- a/sound/soc/sh/rcar/src.c
 +++ b/sound/soc/sh/rcar/src.c
-@@ -167,6 +167,7 @@ static int rsnd_src_hw_params(struct rsnd_mod *mod,
+@@ -167,6 +167,7 @@ static int rsnd_src_hw_params(struct rsn
  	 *	dpcm_fe_dai_hw_params()
  	 *	dpcm_be_dai_hw_params()
  	 */
@@ -38,7 +36,7 @@
  	if (fe->dai_link->dynamic) {
  		int stream = substream->stream;
  		struct snd_soc_dpcm *dpcm;
-@@ -414,8 +415,6 @@ static int rsnd_src_quit(struct rsnd_mod *mod,
+@@ -414,8 +415,6 @@ static int rsnd_src_quit(struct rsnd_mod
  
  	rsnd_mod_power_off(mod);
  
@@ -47,6 +45,3 @@
  	/* reset sync convert_rate */
  	src->sync.val = 0;
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0097-ASoC-rsnd-merge-rsnd_kctrl_new_m-s-e-into-rsnd_kctrl.patch b/patches.renesas/0097-ASoC-rsnd-merge-rsnd_kctrl_new_m-s-e-into-rsnd_kctrl.patch
index 42483fc..fd64fd3 100644
--- a/patches.renesas/0097-ASoC-rsnd-merge-rsnd_kctrl_new_m-s-e-into-rsnd_kctrl.patch
+++ b/patches.renesas/0097-ASoC-rsnd-merge-rsnd_kctrl_new_m-s-e-into-rsnd_kctrl.patch
@@ -14,16 +14,14 @@
 (cherry picked from commit 32973dcf71ebee8806a6ee552665c5fad6857e16)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/core.c | 96 +++++++++++++++++-------------------------------
- sound/soc/sh/rcar/dvc.c  |  8 ++--
- sound/soc/sh/rcar/rsnd.h | 50 ++++++++++++-------------
+ sound/soc/sh/rcar/core.c |   96 ++++++++++++++++-------------------------------
+ sound/soc/sh/rcar/dvc.c  |    8 +--
+ sound/soc/sh/rcar/rsnd.h |   50 +++++++++++-------------
  3 files changed, 62 insertions(+), 92 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 35c96e4bbd64..f8eb9d3d1949 100644
 --- a/sound/soc/sh/rcar/core.c
 +++ b/sound/soc/sh/rcar/core.c
-@@ -1000,13 +1000,30 @@ static int rsnd_kctrl_put(struct snd_kcontrol *kctrl,
+@@ -1000,13 +1000,30 @@ static int rsnd_kctrl_put(struct snd_kco
  	return change;
  }
  
@@ -61,7 +59,7 @@
  {
  	struct snd_card *card = rtd->card->snd_card;
  	struct snd_kcontrol *kctrl;
-@@ -1021,6 +1038,9 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
+@@ -1021,6 +1038,9 @@ static int __rsnd_kctrl_new(struct rsnd_
  	};
  	int ret;
  
@@ -71,7 +69,7 @@
  	kctrl = snd_ctl_new1(&knew, mod);
  	if (!kctrl)
  		return -ENOMEM;
-@@ -1029,65 +1049,17 @@ static int __rsnd_kctrl_new(struct rsnd_mod *mod,
+@@ -1029,65 +1049,17 @@ static int __rsnd_kctrl_new(struct rsnd_
  	if (ret < 0)
  		return ret;
  
@@ -144,11 +142,9 @@
  /*
   *		snd_soc_platform
   */
-diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
-index 994fdb7d0034..463de8360985 100644
 --- a/sound/soc/sh/rcar/dvc.c
 +++ b/sound/soc/sh/rcar/dvc.c
-@@ -285,18 +285,18 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
+@@ -285,18 +285,18 @@ static int rsnd_dvc_pcm_new(struct rsnd_
  	ret = rsnd_kctrl_new_e(mod, io, rtd,
  			is_play ?
  			"DVC Out Ramp Up Rate" : "DVC In Ramp Up Rate",
@@ -171,8 +167,6 @@
  
  	if (ret < 0)
  		return ret;
-diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 81ef3f18834a..3dc9e06f5943 100644
 --- a/sound/soc/sh/rcar/rsnd.h
 +++ b/sound/soc/sh/rcar/rsnd.h
 @@ -611,32 +611,30 @@ struct rsnd_kctrl_cfg_s {
@@ -232,6 +226,3 @@
  
  /*
   *	R-Car SSI
--- 
-2.13.3
-
diff --git a/patches.renesas/0098-ASoC-rsnd-rsnd_mod_make_sure-is-not-under-DEBUG.patch b/patches.renesas/0098-ASoC-rsnd-rsnd_mod_make_sure-is-not-under-DEBUG.patch
index 127c777..48254f7 100644
--- a/patches.renesas/0098-ASoC-rsnd-rsnd_mod_make_sure-is-not-under-DEBUG.patch
+++ b/patches.renesas/0098-ASoC-rsnd-rsnd_mod_make_sure-is-not-under-DEBUG.patch
@@ -12,12 +12,10 @@
 (cherry picked from commit 9ca5e57d78446c8bd42adff3dcae693703f91d9c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/core.c | 2 --
- sound/soc/sh/rcar/rsnd.h | 2 +-
+ sound/soc/sh/rcar/core.c |    2 --
+ sound/soc/sh/rcar/rsnd.h |    2 +-
  2 files changed, 1 insertion(+), 3 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index f8eb9d3d1949..1744015408c3 100644
 --- a/sound/soc/sh/rcar/core.c
 +++ b/sound/soc/sh/rcar/core.c
 @@ -110,7 +110,6 @@ MODULE_DEVICE_TABLE(of, rsnd_of_match);
@@ -28,7 +26,7 @@
  void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type)
  {
  	if (mod->type != type) {
-@@ -121,7 +120,6 @@ void rsnd_mod_make_sure(struct rsnd_mod *mod, enum rsnd_mod_type type)
+@@ -121,7 +120,6 @@ void rsnd_mod_make_sure(struct rsnd_mod
  			 rsnd_mod_name(mod), rsnd_mod_id(mod));
  	}
  }
@@ -36,11 +34,9 @@
  
  char *rsnd_mod_name(struct rsnd_mod *mod)
  {
-diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index 3dc9e06f5943..dbf4163427e8 100644
 --- a/sound/soc/sh/rcar/rsnd.h
 +++ b/sound/soc/sh/rcar/rsnd.h
-@@ -727,8 +727,8 @@ void rsnd_cmd_remove(struct rsnd_priv *priv);
+@@ -727,8 +727,8 @@ void rsnd_cmd_remove(struct rsnd_priv *p
  int rsnd_cmd_attach(struct rsnd_dai_stream *io, int id);
  struct rsnd_mod *rsnd_cmd_mod_get(struct rsnd_priv *priv, int id);
  
@@ -50,6 +46,3 @@
  #define rsnd_mod_confirm_ssi(mssi)	rsnd_mod_make_sure(mssi, RSND_MOD_SSI)
  #define rsnd_mod_confirm_src(msrc)	rsnd_mod_make_sure(msrc, RSND_MOD_SRC)
  #define rsnd_mod_confirm_dvc(mdvc)	rsnd_mod_make_sure(mdvc, RSND_MOD_DVC)
--- 
-2.13.3
-
diff --git a/patches.renesas/0099-ASoC-rsnd-enable-clock-frequency-for-both-44.1kHz-48.patch b/patches.renesas/0099-ASoC-rsnd-enable-clock-frequency-for-both-44.1kHz-48.patch
index 7c73bb0..59fcd2c 100644
--- a/patches.renesas/0099-ASoC-rsnd-enable-clock-frequency-for-both-44.1kHz-48.patch
+++ b/patches.renesas/0099-ASoC-rsnd-enable-clock-frequency-for-both-44.1kHz-48.patch
@@ -18,11 +18,9 @@
 (cherry picked from commit 25165f79adc76b812bfb4d8f2ab120aafb28d0e6)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/adg.c | 39 ++++++++++++++++++++++++++-------------
+ sound/soc/sh/rcar/adg.c |   39 ++++++++++++++++++++++++++-------------
  1 file changed, 26 insertions(+), 13 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
-index 214a9ce90bb4..96fef91b480c 100644
 --- a/sound/soc/sh/rcar/adg.c
 +++ b/sound/soc/sh/rcar/adg.c
 @@ -43,6 +43,7 @@ struct rsnd_adg {
@@ -33,7 +31,7 @@
  #define adg_mode_flags(adg)	(adg->flags)
  
  #define for_each_rsnd_clk(pos, adg, i)		\
-@@ -364,7 +365,10 @@ int rsnd_adg_ssi_clk_try_start(struct rsnd_mod *ssi_mod, unsigned int rate)
+@@ -364,7 +365,10 @@ found_clock:
  
  	rsnd_adg_set_ssi_clk(ssi_mod, data);
  
@@ -45,7 +43,7 @@
  		if (0 == (rate % 8000))
  			ckr = 0x80000000;
  	}
-@@ -427,11 +431,14 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -427,11 +431,14 @@ static void rsnd_adg_get_clkout(struct r
  	struct clk *clk;
  	struct device *dev = rsnd_priv_to_dev(priv);
  	struct device_node *np = dev->of_node;
@@ -62,7 +60,7 @@
  	const char *parent_clk_name = NULL;
  	static const char * const clkout_name[] = {
  		[CLKOUT]  = "audio_clkout",
-@@ -452,13 +459,18 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -452,13 +459,18 @@ static void rsnd_adg_get_clkout(struct r
  	 * ADG supports BRRA/BRRB output only
  	 * this means all clkout0/1/2/3 will be same rate
  	 */
@@ -86,7 +84,7 @@
  
  	/*
  	 * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC
-@@ -505,10 +517,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -505,10 +517,8 @@ static void rsnd_adg_get_clkout(struct r
  				rbgb = rbgx;
  				adg->rbgb_rate_for_48khz = rate / div;
  				ckr |= brg_table[i] << 16;
@@ -98,7 +96,7 @@
  			}
  		}
  	}
-@@ -523,7 +533,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -523,7 +533,7 @@ static void rsnd_adg_get_clkout(struct r
  	 */
  	if (!count) {
  		clk = clk_register_fixed_rate(dev, clkout_name[CLKOUT],
@@ -107,7 +105,7 @@
  		if (!IS_ERR(clk)) {
  			adg->clkout[CLKOUT] = clk;
  			of_clk_add_provider(np, of_clk_src_simple_get, clk);
-@@ -536,7 +546,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -536,7 +546,7 @@ static void rsnd_adg_get_clkout(struct r
  		for (i = 0; i < CLKOUTMAX; i++) {
  			clk = clk_register_fixed_rate(dev, clkout_name[i],
  						      parent_clk_name, 0,
@@ -116,7 +114,7 @@
  			adg->clkout[i] = ERR_PTR(-ENOENT);
  			if (!IS_ERR(clk))
  				adg->clkout[i] = clk;
-@@ -551,6 +561,9 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -551,6 +561,9 @@ static void rsnd_adg_get_clkout(struct r
  	adg->rbga = rbga;
  	adg->rbgb = rbgb;
  
@@ -126,6 +124,3 @@
  	for_each_rsnd_clkout(clk, adg, i)
  		dev_dbg(dev, "clkout %d : %p : %ld\n", i, clk, clk_get_rate(clk));
  	dev_dbg(dev, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",
--- 
-2.13.3
-
diff --git a/patches.renesas/0100-ASoC-rsnd-fix-semicolon.cocci-warnings.patch b/patches.renesas/0100-ASoC-rsnd-fix-semicolon.cocci-warnings.patch
index 4e0a759..124b8e1 100644
--- a/patches.renesas/0100-ASoC-rsnd-fix-semicolon.cocci-warnings.patch
+++ b/patches.renesas/0100-ASoC-rsnd-fix-semicolon.cocci-warnings.patch
@@ -15,14 +15,12 @@
 (cherry picked from commit 75f9e4adb56fbb8ffaab7d316f0c02df00e4b755)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/adg.c | 2 +-
+ sound/soc/sh/rcar/adg.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
-index 96fef91b480c..faa1a4f09766 100644
 --- a/sound/soc/sh/rcar/adg.c
 +++ b/sound/soc/sh/rcar/adg.c
-@@ -459,7 +459,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -459,7 +459,7 @@ static void rsnd_adg_get_clkout(struct r
  	 * ADG supports BRRA/BRRB output only
  	 * this means all clkout0/1/2/3 will be same rate
  	 */
@@ -31,6 +29,3 @@
  	req_size = prop->length / sizeof(u32);
  
  	of_property_read_u32_array(np, "clock-frequency", req_rate, req_size);
--- 
-2.13.3
-
diff --git a/patches.renesas/0101-ASoC-rsnd-Fix-possible-NULL-pointer-dereference.patch b/patches.renesas/0101-ASoC-rsnd-Fix-possible-NULL-pointer-dereference.patch
index 22dcdef..6bd5868 100644
--- a/patches.renesas/0101-ASoC-rsnd-Fix-possible-NULL-pointer-dereference.patch
+++ b/patches.renesas/0101-ASoC-rsnd-Fix-possible-NULL-pointer-dereference.patch
@@ -21,14 +21,12 @@
 (cherry picked from commit e8dffe6c2004278c588b3bb441a3dbe998a3f2e4)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/adg.c | 18 +++++++++++-------
+ sound/soc/sh/rcar/adg.c |   18 +++++++++++-------
  1 file changed, 11 insertions(+), 7 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
-index faa1a4f09766..66203d107a11 100644
 --- a/sound/soc/sh/rcar/adg.c
 +++ b/sound/soc/sh/rcar/adg.c
-@@ -453,13 +453,18 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -453,13 +453,18 @@ static void rsnd_adg_get_clkout(struct r
  		[CLKI] = 0x2,
  	};
  
@@ -48,7 +46,7 @@
  	req_size = prop->length / sizeof(u32);
  
  	of_property_read_u32_array(np, "clock-frequency", req_rate, req_size);
-@@ -472,6 +477,9 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -472,6 +477,9 @@ static void rsnd_adg_get_clkout(struct r
  			req_48kHz_rate = req_rate[i];
  	}
  
@@ -58,7 +56,7 @@
  	/*
  	 * This driver is assuming that AUDIO_CLKA/AUDIO_CLKB/AUDIO_CLKC
  	 * have 44.1kHz or 48kHz base clocks for now.
-@@ -481,9 +489,6 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -481,9 +489,6 @@ static void rsnd_adg_get_clkout(struct r
  	 *	rsnd_adg_ssi_clk_try_start()
  	 *	rsnd_ssi_master_clk_start()
  	 */
@@ -68,7 +66,7 @@
  	adg->rbga_rate_for_441khz	= 0;
  	adg->rbgb_rate_for_48khz	= 0;
  	for_each_rsnd_clk(clk, adg, i) {
-@@ -528,6 +533,7 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -528,6 +533,7 @@ static void rsnd_adg_get_clkout(struct r
  	 * this means all clkout0/1/2/3 will be * same rate
  	 */
  
@@ -76,7 +74,7 @@
  	/*
  	 * for clkout
  	 */
-@@ -557,13 +563,11 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -557,13 +563,11 @@ static void rsnd_adg_get_clkout(struct r
  				    &adg->onecell);
  	}
  
@@ -91,6 +89,3 @@
  	for_each_rsnd_clkout(clk, adg, i)
  		dev_dbg(dev, "clkout %d : %p : %ld\n", i, clk, clk_get_rate(clk));
  	dev_dbg(dev, "BRGCKR = 0x%08x, BRRA/BRRB = 0x%x/0x%x\n",
--- 
-2.13.3
-
diff --git a/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch b/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch
index 1467ed1..3443f28 100644
--- a/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch
+++ b/patches.renesas/0102-ASoC-rsnd-don-t-use-PDTA-bit-for-24bit-on-SSI.patch
@@ -17,20 +17,18 @@
 (cherry picked from commit 90431eb49bff6d79814cbf0c96e13597ad53095c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/cmd.c  |  1 +
- sound/soc/sh/rcar/core.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++
- sound/soc/sh/rcar/gen.c  |  1 +
- sound/soc/sh/rcar/rsnd.h |  2 ++
- sound/soc/sh/rcar/src.c  | 12 ++++++++++--
- sound/soc/sh/rcar/ssi.c  |  2 +-
- sound/soc/sh/rcar/ssiu.c |  3 ++-
+ sound/soc/sh/rcar/cmd.c  |    1 
+ sound/soc/sh/rcar/core.c |   51 +++++++++++++++++++++++++++++++++++++++++++++++
+ sound/soc/sh/rcar/gen.c  |    1 
+ sound/soc/sh/rcar/rsnd.h |    2 +
+ sound/soc/sh/rcar/src.c  |   12 +++++++++--
+ sound/soc/sh/rcar/ssi.c  |    2 -
+ sound/soc/sh/rcar/ssiu.c |    3 +-
  7 files changed, 68 insertions(+), 4 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c
-index 7d92a24b7cfa..d879c010cf03 100644
 --- a/sound/soc/sh/rcar/cmd.c
 +++ b/sound/soc/sh/rcar/cmd.c
-@@ -89,6 +89,7 @@ static int rsnd_cmd_init(struct rsnd_mod *mod,
+@@ -89,6 +89,7 @@ static int rsnd_cmd_init(struct rsnd_mod
  	dev_dbg(dev, "ctu/mix path = 0x%08x", data);
  
  	rsnd_mod_write(mod, CMD_ROUTE_SLCT, data);
@@ -38,11 +36,9 @@
  	rsnd_mod_write(mod, CMD_BUSIF_DALIGN, rsnd_get_dalign(mod, io));
  
  	rsnd_adg_set_cmd_timsel_gen2(mod, io);
-diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
-index 1744015408c3..8c1f4e2e0c4f 100644
 --- a/sound/soc/sh/rcar/core.c
 +++ b/sound/soc/sh/rcar/core.c
-@@ -343,6 +343,57 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io)
+@@ -343,6 +343,57 @@ u32 rsnd_get_dalign(struct rsnd_mod *mod
  		return 0x76543210;
  }
  
@@ -100,11 +96,9 @@
  /*
   *	rsnd_dai functions
   */
-diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c
-index 63b6d3c28021..4b0980728e13 100644
 --- a/sound/soc/sh/rcar/gen.c
 +++ b/sound/soc/sh/rcar/gen.c
-@@ -236,6 +236,7 @@ static int rsnd_gen2_probe(struct rsnd_priv *priv)
+@@ -236,6 +236,7 @@ static int rsnd_gen2_probe(struct rsnd_p
  		RSND_GEN_M_REG(SRC_ROUTE_MODE0,	0xc,	0x20),
  		RSND_GEN_M_REG(SRC_CTRL,	0x10,	0x20),
  		RSND_GEN_M_REG(SRC_INT_ENABLE0,	0x18,	0x20),
@@ -112,8 +106,6 @@
  		RSND_GEN_M_REG(CMD_BUSIF_DALIGN,0x188,	0x20),
  		RSND_GEN_M_REG(CMD_ROUTE_SLCT,	0x18c,	0x20),
  		RSND_GEN_M_REG(CMD_CTRL,	0x190,	0x20),
-diff --git a/sound/soc/sh/rcar/rsnd.h b/sound/soc/sh/rcar/rsnd.h
-index dbf4163427e8..323af41ecfcb 100644
 --- a/sound/soc/sh/rcar/rsnd.h
 +++ b/sound/soc/sh/rcar/rsnd.h
 @@ -73,6 +73,7 @@ enum rsnd_reg {
@@ -124,7 +116,7 @@
  	RSND_REG_CMD_BUSIF_DALIGN,
  	RSND_REG_CMD_ROUTE_SLCT,
  	RSND_REG_CMDOUT_TIMSEL,
-@@ -204,6 +205,7 @@ void rsnd_bset(struct rsnd_priv *priv, struct rsnd_mod *mod, enum rsnd_reg reg,
+@@ -204,6 +205,7 @@ void rsnd_bset(struct rsnd_priv *priv, s
  		    u32 mask, u32 data);
  u32 rsnd_get_adinr_bit(struct rsnd_mod *mod, struct rsnd_dai_stream *io);
  u32 rsnd_get_dalign(struct rsnd_mod *mod, struct rsnd_dai_stream *io);
@@ -132,11 +124,9 @@
  
  /*
   *	R-Car DMA
-diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
-index 20b5b2ec625e..76a477a3ccb5 100644
 --- a/sound/soc/sh/rcar/src.c
 +++ b/sound/soc/sh/rcar/src.c
-@@ -190,11 +190,13 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
+@@ -190,11 +190,13 @@ static void rsnd_src_set_convert_rate(st
  	struct rsnd_priv *priv = rsnd_mod_to_priv(mod);
  	struct device *dev = rsnd_priv_to_dev(priv);
  	struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
@@ -150,7 +140,7 @@
  	uint ratio;
  
  	if (!runtime)
-@@ -270,6 +272,11 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
+@@ -270,6 +272,11 @@ static void rsnd_src_set_convert_rate(st
  		break;
  	}
  
@@ -162,7 +152,7 @@
  	rsnd_mod_write(mod, SRC_ROUTE_MODE0, route);
  
  	rsnd_mod_write(mod, SRC_SRCIR, 1);	/* initialize */
-@@ -281,8 +288,9 @@ static void rsnd_src_set_convert_rate(struct rsnd_dai_stream *io,
+@@ -281,8 +288,9 @@ static void rsnd_src_set_convert_rate(st
  	rsnd_mod_write(mod, SRC_BSISR, bsisr);
  	rsnd_mod_write(mod, SRC_SRCIR, 0);	/* cancel initialize */
  
@@ -174,11 +164,9 @@
  	rsnd_mod_write(mod, SRC_BUSIF_DALIGN, rsnd_get_dalign(mod, io));
  
  	rsnd_adg_set_src_timesel_gen2(mod, io, fin, fout);
-diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index 135c5669f796..e43277a5068c 100644
 --- a/sound/soc/sh/rcar/ssi.c
 +++ b/sound/soc/sh/rcar/ssi.c
-@@ -302,7 +302,7 @@ static void rsnd_ssi_config_init(struct rsnd_mod *mod,
+@@ -302,7 +302,7 @@ static void rsnd_ssi_config_init(struct
  	 * always use 32bit system word.
  	 * see also rsnd_ssi_master_clk_enable()
  	 */
@@ -187,11 +175,9 @@
  
  	if (rdai->bit_clk_inv)
  		cr_own |= SCKP;
-diff --git a/sound/soc/sh/rcar/ssiu.c b/sound/soc/sh/rcar/ssiu.c
-index 14fafdaf1395..512d238b79e2 100644
 --- a/sound/soc/sh/rcar/ssiu.c
 +++ b/sound/soc/sh/rcar/ssiu.c
-@@ -144,7 +144,8 @@ static int rsnd_ssiu_init_gen2(struct rsnd_mod *mod,
+@@ -144,7 +144,8 @@ static int rsnd_ssiu_init_gen2(struct rs
  			       (rsnd_io_is_play(io) ?
  				rsnd_runtime_channel_after_ctu(io) :
  				rsnd_runtime_channel_original(io)));
@@ -201,6 +187,3 @@
  		rsnd_mod_write(mod, SSI_BUSIF_DALIGN,
  			       rsnd_get_dalign(mod, io));
  	}
--- 
-2.13.3
-
diff --git a/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch b/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch
index 9fda8cc..e367d71 100644
--- a/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch
+++ b/patches.renesas/0103-ASoC-rsnd-don-t-call-free_irq-on-Parent-SSI.patch
@@ -16,14 +16,12 @@
 (cherry picked from commit 1f8754d4daea5f257370a52a30fcb22798c54516)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/ssi.c | 5 +++++
+ sound/soc/sh/rcar/ssi.c |    5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index e43277a5068c..c224695c1484 100644
 --- a/sound/soc/sh/rcar/ssi.c
 +++ b/sound/soc/sh/rcar/ssi.c
-@@ -709,6 +709,11 @@ static int rsnd_ssi_dma_remove(struct rsnd_mod *mod,
+@@ -709,6 +709,11 @@ static int rsnd_ssi_dma_remove(struct rs
  			       struct rsnd_priv *priv)
  {
  	struct rsnd_ssi *ssi = rsnd_mod_to_ssi(mod);
@@ -35,6 +33,3 @@
  
  	/* PIO will request IRQ again */
  	free_irq(ssi->irq, mod);
--- 
-2.13.3
-
diff --git a/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch b/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch
index e12d561..30787ee 100644
--- a/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch
+++ b/patches.renesas/0104-ASoC-rsnd-SSI-PIO-adjust-to-24bit-mode.patch
@@ -12,14 +12,12 @@
 (cherry picked from commit 7819a942de7b993771bd9377babc80485fe7606b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/ssi.c | 11 +++++++++--
+ sound/soc/sh/rcar/ssi.c |   11 +++++++++--
  1 file changed, 9 insertions(+), 2 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c
-index c224695c1484..91e5c07911b4 100644
 --- a/sound/soc/sh/rcar/ssi.c
 +++ b/sound/soc/sh/rcar/ssi.c
-@@ -550,6 +550,13 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
+@@ -550,6 +550,13 @@ static void __rsnd_ssi_interrupt(struct
  		struct snd_pcm_runtime *runtime = rsnd_io_to_runtime(io);
  		u32 *buf = (u32 *)(runtime->dma_area +
  				   rsnd_dai_pointer_offset(io, 0));
@@ -33,7 +31,7 @@
  
  		/*
  		 * 8/16/32 data can be assesse to TDR/RDR register
-@@ -557,9 +564,9 @@ static void __rsnd_ssi_interrupt(struct rsnd_mod *mod,
+@@ -557,9 +564,9 @@ static void __rsnd_ssi_interrupt(struct
  		 * see rsnd_ssi_init()
  		 */
  		if (rsnd_io_is_play(io))
@@ -45,6 +43,3 @@
  
  		elapsed = rsnd_dai_pointer_update(io, sizeof(*buf));
  	}
--- 
-2.13.3
-
diff --git a/patches.renesas/0105-ASoC-rsnd-fixup-parent_clk_name-of-AUDIO_CLKOUTx.patch b/patches.renesas/0105-ASoC-rsnd-fixup-parent_clk_name-of-AUDIO_CLKOUTx.patch
index f3dcada..ff09170 100644
--- a/patches.renesas/0105-ASoC-rsnd-fixup-parent_clk_name-of-AUDIO_CLKOUTx.patch
+++ b/patches.renesas/0105-ASoC-rsnd-fixup-parent_clk_name-of-AUDIO_CLKOUTx.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit e8a3ce1130134046e9da132aa4d043566df8237d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/sh/rcar/adg.c | 6 ++++--
+ sound/soc/sh/rcar/adg.c |    6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
-diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c
-index 66203d107a11..d3b0dc145a56 100644
 --- a/sound/soc/sh/rcar/adg.c
 +++ b/sound/soc/sh/rcar/adg.c
-@@ -507,7 +507,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -507,7 +507,8 @@ static void rsnd_adg_get_clkout(struct r
  				rbga = rbgx;
  				adg->rbga_rate_for_441khz = rate / div;
  				ckr |= brg_table[i] << 20;
@@ -30,7 +28,7 @@
  					parent_clk_name = __clk_get_name(clk);
  			}
  		}
-@@ -522,7 +523,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv,
+@@ -522,7 +523,8 @@ static void rsnd_adg_get_clkout(struct r
  				rbgb = rbgx;
  				adg->rbgb_rate_for_48khz = rate / div;
  				ckr |= brg_table[i] << 16;
@@ -40,6 +38,3 @@
  					parent_clk_name = __clk_get_name(clk);
  			}
  		}
--- 
-2.13.3
-
diff --git a/patches.renesas/0106-soc-renesas-Identify-RZ-G1H.patch b/patches.renesas/0106-soc-renesas-Identify-RZ-G1H.patch
index 8564c90..547db7f 100644
--- a/patches.renesas/0106-soc-renesas-Identify-RZ-G1H.patch
+++ b/patches.renesas/0106-soc-renesas-Identify-RZ-G1H.patch
@@ -10,14 +10,12 @@
 (cherry picked from commit 8848e1b14231a40ed66229fb3ee98519b32f2ae7)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/soc/renesas/renesas-soc.c | 8 ++++++++
+ drivers/soc/renesas/renesas-soc.c |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
-index 330960312296..f0172e59c040 100644
 --- a/drivers/soc/renesas/renesas-soc.c
 +++ b/drivers/soc/renesas/renesas-soc.c
-@@ -80,6 +80,11 @@ static const struct renesas_soc soc_rmobile_a1 __initconst __maybe_unused = {
+@@ -80,6 +80,11 @@ static const struct renesas_soc soc_rmob
  	.id	= 0x40,
  };
  
@@ -29,7 +27,7 @@
  static const struct renesas_soc soc_rz_g1m __initconst __maybe_unused = {
  	.family	= &fam_rzg,
  	.id	= 0x47,
-@@ -150,6 +155,9 @@ static const struct of_device_id renesas_socs[] __initconst = {
+@@ -150,6 +155,9 @@ static const struct of_device_id renesas
  #ifdef CONFIG_ARCH_R8A7740
  	{ .compatible = "renesas,r8a7740",	.data = &soc_rmobile_a1 },
  #endif
@@ -39,6 +37,3 @@
  #ifdef CONFIG_ARCH_R8A7743
  	{ .compatible = "renesas,r8a7743",	.data = &soc_rz_g1m },
  #endif
--- 
-2.13.3
-
diff --git a/patches.renesas/0107-soc-renesas-Identify-RZ-G1N.patch b/patches.renesas/0107-soc-renesas-Identify-RZ-G1N.patch
index 894cefc..87de90d 100644
--- a/patches.renesas/0107-soc-renesas-Identify-RZ-G1N.patch
+++ b/patches.renesas/0107-soc-renesas-Identify-RZ-G1N.patch
@@ -10,14 +10,12 @@
 (cherry picked from commit cd59de80dd34dd2d1a3ca97d7a6e712c048b135a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/soc/renesas/renesas-soc.c | 8 ++++++++
+ drivers/soc/renesas/renesas-soc.c |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
-index f0172e59c040..b894cf64225b 100644
 --- a/drivers/soc/renesas/renesas-soc.c
 +++ b/drivers/soc/renesas/renesas-soc.c
-@@ -90,6 +90,11 @@ static const struct renesas_soc soc_rz_g1m __initconst __maybe_unused = {
+@@ -90,6 +90,11 @@ static const struct renesas_soc soc_rz_g
  	.id	= 0x47,
  };
  
@@ -29,7 +27,7 @@
  static const struct renesas_soc soc_rz_g1e __initconst __maybe_unused = {
  	.family	= &fam_rzg,
  	.id	= 0x4c,
-@@ -161,6 +166,9 @@ static const struct of_device_id renesas_socs[] __initconst = {
+@@ -161,6 +166,9 @@ static const struct of_device_id renesas
  #ifdef CONFIG_ARCH_R8A7743
  	{ .compatible = "renesas,r8a7743",	.data = &soc_rz_g1m },
  #endif
@@ -39,6 +37,3 @@
  #ifdef CONFIG_ARCH_R8A7745
  	{ .compatible = "renesas,r8a7745",	.data = &soc_rz_g1e },
  #endif
--- 
-2.13.3
-
diff --git a/patches.renesas/0108-soc-renesas-Register-SoC-device-early.patch b/patches.renesas/0108-soc-renesas-Register-SoC-device-early.patch
index 2a8c3d4..d8820f9 100644
--- a/patches.renesas/0108-soc-renesas-Register-SoC-device-early.patch
+++ b/patches.renesas/0108-soc-renesas-Register-SoC-device-early.patch
@@ -15,11 +15,9 @@
 (cherry picked from commit b1d134ba9de2b7a136406530e34fc8b110ba6efd)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/soc/renesas/renesas-soc.c | 2 +-
+ drivers/soc/renesas/renesas-soc.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
-index b894cf64225b..ca26f13d399c 100644
 --- a/drivers/soc/renesas/renesas-soc.c
 +++ b/drivers/soc/renesas/renesas-soc.c
 @@ -270,4 +270,4 @@ static int __init renesas_soc_init(void)
@@ -28,6 +26,3 @@
  }
 -core_initcall(renesas_soc_init);
 +early_initcall(renesas_soc_init);
--- 
-2.13.3
-
diff --git a/patches.renesas/0109-ata-sata_rcar-Handle-return-value-of-clk_prepare_ena.patch b/patches.renesas/0109-ata-sata_rcar-Handle-return-value-of-clk_prepare_ena.patch
index ec80bcc..340010d 100644
--- a/patches.renesas/0109-ata-sata_rcar-Handle-return-value-of-clk_prepare_ena.patch
+++ b/patches.renesas/0109-ata-sata_rcar-Handle-return-value-of-clk_prepare_ena.patch
@@ -14,14 +14,12 @@
 (cherry picked from commit 5dc63fdcc09f47fb226b8bc7d83a61feb787d817)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/ata/sata_rcar.c | 15 ++++++++++++---
+ drivers/ata/sata_rcar.c |   15 ++++++++++++---
  1 file changed, 12 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/ata/sata_rcar.c b/drivers/ata/sata_rcar.c
-index 5d38245a7a73..b7939a2c1fab 100644
 --- a/drivers/ata/sata_rcar.c
 +++ b/drivers/ata/sata_rcar.c
-@@ -890,7 +890,10 @@ static int sata_rcar_probe(struct platform_device *pdev)
+@@ -890,7 +890,10 @@ static int sata_rcar_probe(struct platfo
  		dev_err(&pdev->dev, "failed to get access to sata clock\n");
  		return PTR_ERR(priv->clk);
  	}
@@ -33,7 +31,7 @@
  
  	host = ata_host_alloc(&pdev->dev, 1);
  	if (!host) {
-@@ -970,8 +973,11 @@ static int sata_rcar_resume(struct device *dev)
+@@ -970,8 +973,11 @@ static int sata_rcar_resume(struct devic
  	struct ata_host *host = dev_get_drvdata(dev);
  	struct sata_rcar_priv *priv = host->private_data;
  	void __iomem *base = priv->base;
@@ -46,7 +44,7 @@
  
  	/* ack and mask */
  	iowrite32(0, base + SATAINTSTAT_REG);
-@@ -988,8 +994,11 @@ static int sata_rcar_restore(struct device *dev)
+@@ -988,8 +994,11 @@ static int sata_rcar_restore(struct devi
  {
  	struct ata_host *host = dev_get_drvdata(dev);
  	struct sata_rcar_priv *priv = host->private_data;
@@ -59,6 +57,3 @@
  
  	sata_rcar_setup_port(host);
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0110-clocksource-sh_cmt-Compute-rate-before-registration-.patch b/patches.renesas/0110-clocksource-sh_cmt-Compute-rate-before-registration-.patch
index ff593c0..61e69e2 100644
--- a/patches.renesas/0110-clocksource-sh_cmt-Compute-rate-before-registration-.patch
+++ b/patches.renesas/0110-clocksource-sh_cmt-Compute-rate-before-registration-.patch
@@ -54,11 +54,9 @@
 (cherry picked from commit 890f423b266623e1cfb3a97b864f3e5039bdfbb9)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clocksource/sh_cmt.c | 45 ++++++++++++++++++++++++--------------------
+ drivers/clocksource/sh_cmt.c |   45 +++++++++++++++++++++++--------------------
  1 file changed, 25 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
-index 103c49362c68..3038885d4180 100644
 --- a/drivers/clocksource/sh_cmt.c
 +++ b/drivers/clocksource/sh_cmt.c
 @@ -103,7 +103,6 @@ struct sh_cmt_channel {
@@ -77,7 +75,7 @@
  
  	raw_spinlock_t lock; /* Protect the shared start/stop register */
  
-@@ -320,7 +320,7 @@ static void sh_cmt_start_stop_ch(struct sh_cmt_channel *ch, int start)
+@@ -320,7 +320,7 @@ static void sh_cmt_start_stop_ch(struct
  	raw_spin_unlock_irqrestore(&ch->cmt->lock, flags);
  }
  
@@ -86,7 +84,7 @@
  {
  	int k, ret;
  
-@@ -340,11 +340,9 @@ static int sh_cmt_enable(struct sh_cmt_channel *ch, unsigned long *rate)
+@@ -340,11 +340,9 @@ static int sh_cmt_enable(struct sh_cmt_c
  
  	/* configure channel, periodic mode and maximum timeout */
  	if (ch->cmt->info->width == 16) {
@@ -98,7 +96,7 @@
  		sh_cmt_write_cmcsr(ch, SH_CMT32_CMCSR_CMM |
  				   SH_CMT32_CMCSR_CMTOUT_IE |
  				   SH_CMT32_CMCSR_CMR_IRQ |
-@@ -572,7 +570,7 @@ static int sh_cmt_start(struct sh_cmt_channel *ch, unsigned long flag)
+@@ -572,7 +570,7 @@ static int sh_cmt_start(struct sh_cmt_ch
  	raw_spin_lock_irqsave(&ch->lock, flags);
  
  	if (!(ch->flags & (FLAG_CLOCKEVENT | FLAG_CLOCKSOURCE)))
@@ -107,7 +105,7 @@
  
  	if (ret)
  		goto out;
-@@ -640,10 +638,9 @@ static int sh_cmt_clocksource_enable(struct clocksource *cs)
+@@ -640,10 +638,9 @@ static int sh_cmt_clocksource_enable(str
  	ch->total_cycles = 0;
  
  	ret = sh_cmt_start(ch, FLAG_CLOCKSOURCE);
@@ -120,7 +118,7 @@
  	return ret;
  }
  
-@@ -697,8 +694,7 @@ static int sh_cmt_register_clocksource(struct sh_cmt_channel *ch,
+@@ -697,8 +694,7 @@ static int sh_cmt_register_clocksource(s
  	dev_info(&ch->cmt->pdev->dev, "ch%u: used as clock source\n",
  		 ch->index);
  
@@ -130,7 +128,7 @@
  	return 0;
  }
  
-@@ -709,19 +705,10 @@ static struct sh_cmt_channel *ced_to_sh_cmt(struct clock_event_device *ced)
+@@ -709,19 +705,10 @@ static struct sh_cmt_channel *ced_to_sh_
  
  static void sh_cmt_clock_event_start(struct sh_cmt_channel *ch, int periodic)
  {
@@ -151,7 +149,7 @@
  	else
  		sh_cmt_set_next(ch, ch->max_match_value);
  }
-@@ -824,6 +811,12 @@ static int sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
+@@ -824,6 +811,12 @@ static int sh_cmt_register_clockevent(st
  	ced->suspend = sh_cmt_clock_event_suspend;
  	ced->resume = sh_cmt_clock_event_resume;
  
@@ -164,7 +162,7 @@
  	dev_info(&ch->cmt->pdev->dev, "ch%u: used for clock events\n",
  		 ch->index);
  	clockevents_register_device(ced);
-@@ -996,6 +989,18 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev)
+@@ -996,6 +989,18 @@ static int sh_cmt_setup(struct sh_cmt_de
  	if (ret < 0)
  		goto err_clk_put;
  
@@ -183,6 +181,3 @@
  	/* Map the memory resource(s). */
  	ret = sh_cmt_map_memory(cmt);
  	if (ret < 0)
--- 
-2.13.3
-
diff --git a/patches.renesas/0111-clockevents-drivers-sh_cmt-Set-min_delta_ticks-and-m.patch b/patches.renesas/0111-clockevents-drivers-sh_cmt-Set-min_delta_ticks-and-m.patch
index b4c133e..6eee213 100644
--- a/patches.renesas/0111-clockevents-drivers-sh_cmt-Set-min_delta_ticks-and-m.patch
+++ b/patches.renesas/0111-clockevents-drivers-sh_cmt-Set-min_delta_ticks-and-m.patch
@@ -30,14 +30,12 @@
 (cherry picked from commit bb2e94ac0cf4628f5e5f778c8de4a376dac43558)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clocksource/sh_cmt.c | 2 ++
+ drivers/clocksource/sh_cmt.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
-index 3038885d4180..97ce6bf27f7c 100644
 --- a/drivers/clocksource/sh_cmt.c
 +++ b/drivers/clocksource/sh_cmt.c
-@@ -815,7 +815,9 @@ static int sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
+@@ -815,7 +815,9 @@ static int sh_cmt_register_clockevent(st
  	ced->shift = 32;
  	ced->mult = div_sc(ch->cmt->rate, NSEC_PER_SEC, ced->shift);
  	ced->max_delta_ns = clockevent_delta2ns(ch->max_match_value, ced);
@@ -47,6 +45,3 @@
  
  	dev_info(&ch->cmt->pdev->dev, "ch%u: used for clock events\n",
  		 ch->index);
--- 
-2.13.3
-
diff --git a/patches.renesas/0112-sh_eth-Use-platform-device-for-printing-before-regis.patch b/patches.renesas/0112-sh_eth-Use-platform-device-for-printing-before-regis.patch
index 39bff78..f1c99dc 100644
--- a/patches.renesas/0112-sh_eth-Use-platform-device-for-printing-before-regis.patch
+++ b/patches.renesas/0112-sh_eth-Use-platform-device-for-printing-before-regis.patch
@@ -20,14 +20,12 @@
 (cherry picked from commit 5f5c5449acad0cd3322e53e1ac68c044483b0aa5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 2 +-
+ drivers/net/ethernet/renesas/sh_eth.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index b1e9f3f412e0..07e8fce2b9a4 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -3222,7 +3222,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -3222,7 +3222,7 @@ static int sh_eth_drv_probe(struct platf
  	/* MDIO bus init */
  	ret = sh_mdio_init(mdp, pd);
  	if (ret) {
@@ -36,6 +34,3 @@
  		goto out_release;
  	}
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch b/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch
index 8849ef7..09fd689 100644
--- a/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch
+++ b/patches.renesas/0113-sh_eth-Do-not-print-an-error-message-for-probe-defer.patch
@@ -19,14 +19,12 @@
 (cherry picked from commit b7ce520e9f71ff65d0aa0ad86223f94ae4095fae)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 3 ++-
+ drivers/net/ethernet/renesas/sh_eth.c |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 07e8fce2b9a4..30ce538e92dd 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -3222,7 +3222,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -3222,7 +3222,8 @@ static int sh_eth_drv_probe(struct platf
  	/* MDIO bus init */
  	ret = sh_mdio_init(mdp, pd);
  	if (ret) {
@@ -36,6 +34,3 @@
  		goto out_release;
  	}
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0114-mmc-sh_mmcif-Document-r7s72100-DT-bindings.patch b/patches.renesas/0114-mmc-sh_mmcif-Document-r7s72100-DT-bindings.patch
index 9393a7e..0e61322 100644
--- a/patches.renesas/0114-mmc-sh_mmcif-Document-r7s72100-DT-bindings.patch
+++ b/patches.renesas/0114-mmc-sh_mmcif-Document-r7s72100-DT-bindings.patch
@@ -11,11 +11,9 @@
 (cherry picked from commit 474e25e15f508889d4f8c672ab54323743ee595b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/mmc/renesas,mmcif.txt | 8 ++++++++
+ Documentation/devicetree/bindings/mmc/renesas,mmcif.txt |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt b/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt
-index e4ba92aa035e..c32dc5a9dbe6 100644
 --- a/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt
 +++ b/Documentation/devicetree/bindings/mmc/renesas,mmcif.txt
 @@ -8,6 +8,7 @@ Required properties:
@@ -40,6 +38,3 @@
  - clocks: reference to the functional clock
  
  - dmas: reference to the DMA channels, one per channel name listed in the
--- 
-2.13.3
-
diff --git a/patches.renesas/0115-media-sh_mobile_ceu_camera-use-module_platform_drive.patch b/patches.renesas/0115-media-sh_mobile_ceu_camera-use-module_platform_drive.patch
index 3f22c32..96df464 100644
--- a/patches.renesas/0115-media-sh_mobile_ceu_camera-use-module_platform_drive.patch
+++ b/patches.renesas/0115-media-sh_mobile_ceu_camera-use-module_platform_drive.patch
@@ -12,14 +12,12 @@
 (cherry picked from commit 855749a75609122b57b2d4ebd872944836388a14)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c | 13 +------------
+ drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c |   13 +------------
  1 file changed, 1 insertion(+), 12 deletions(-)
 
-diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
-index a15bfb5aea47..96dc01750bc0 100644
 --- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
 +++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
-@@ -1801,18 +1801,7 @@ static struct platform_driver sh_mobile_ceu_driver = {
+@@ -1801,18 +1801,7 @@ static struct platform_driver sh_mobile_
  	.remove		= sh_mobile_ceu_remove,
  };
  
@@ -39,6 +37,3 @@
  
  MODULE_DESCRIPTION("SuperH Mobile CEU driver");
  MODULE_AUTHOR("Magnus Damm");
--- 
-2.13.3
-
diff --git a/patches.renesas/0116-mmc-tmio-ensure-end-of-DMA-and-SD-access-are-in-sync.patch b/patches.renesas/0116-mmc-tmio-ensure-end-of-DMA-and-SD-access-are-in-sync.patch
index 94a8071..be85fe7 100644
--- a/patches.renesas/0116-mmc-tmio-ensure-end-of-DMA-and-SD-access-are-in-sync.patch
+++ b/patches.renesas/0116-mmc-tmio-ensure-end-of-DMA-and-SD-access-are-in-sync.patch
@@ -26,13 +26,11 @@
 (cherry picked from commit 52ad9a8e854ca13151f4af8140297f73d49e318a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/host/tmio_mmc.h     |  2 +-
- drivers/mmc/host/tmio_mmc_dma.c | 58 ++++++++++++++++++++++++-----------------
- drivers/mmc/host/tmio_mmc_pio.c |  4 +--
+ drivers/mmc/host/tmio_mmc.h     |    2 -
+ drivers/mmc/host/tmio_mmc_dma.c |   58 +++++++++++++++++++++++-----------------
+ drivers/mmc/host/tmio_mmc_pio.c |    4 +-
  3 files changed, 37 insertions(+), 27 deletions(-)
 
-diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
-index 26eb9401b3f3..3f25984cf184 100644
 --- a/drivers/mmc/host/tmio_mmc.h
 +++ b/drivers/mmc/host/tmio_mmc.h
 @@ -136,7 +136,7 @@ struct tmio_mmc_host {
@@ -44,11 +42,9 @@
  	struct tasklet_struct	dma_issue;
  	struct scatterlist	bounce_sg;
  	u8			*bounce_buf;
-diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c
-index fa8a936a3d9b..c7684fa91f1f 100644
 --- a/drivers/mmc/host/tmio_mmc_dma.c
 +++ b/drivers/mmc/host/tmio_mmc_dma.c
-@@ -43,6 +43,31 @@ void tmio_mmc_abort_dma(struct tmio_mmc_host *host)
+@@ -43,6 +43,31 @@ void tmio_mmc_abort_dma(struct tmio_mmc_
  	tmio_mmc_enable_dma(host, true);
  }
  
@@ -80,7 +76,7 @@
  static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
  {
  	struct scatterlist *sg = host->sg_ptr, *sg_tmp;
-@@ -88,6 +113,10 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
+@@ -88,6 +113,10 @@ static void tmio_mmc_start_dma_rx(struct
  			DMA_DEV_TO_MEM, DMA_CTRL_ACK);
  
  	if (desc) {
@@ -91,7 +87,7 @@
  		cookie = dmaengine_submit(desc);
  		if (cookie < 0) {
  			desc = NULL;
-@@ -162,6 +191,10 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)
+@@ -162,6 +191,10 @@ static void tmio_mmc_start_dma_tx(struct
  			DMA_MEM_TO_DEV, DMA_CTRL_ACK);
  
  	if (desc) {
@@ -102,7 +98,7 @@
  		cookie = dmaengine_submit(desc);
  		if (cookie < 0) {
  			desc = NULL;
-@@ -221,29 +254,6 @@ static void tmio_mmc_issue_tasklet_fn(unsigned long priv)
+@@ -221,29 +254,6 @@ static void tmio_mmc_issue_tasklet_fn(un
  		dma_async_issue_pending(chan);
  }
  
@@ -132,7 +128,7 @@
  void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdata)
  {
  	/* We can only either use DMA for both Tx and Rx or not use it at all */
-@@ -306,7 +316,7 @@ void tmio_mmc_request_dma(struct tmio_mmc_host *host, struct tmio_mmc_data *pdat
+@@ -306,7 +316,7 @@ void tmio_mmc_request_dma(struct tmio_mm
  		if (!host->bounce_buf)
  			goto ebouncebuf;
  
@@ -141,11 +137,9 @@
  		tasklet_init(&host->dma_issue, tmio_mmc_issue_tasklet_fn, (unsigned long)host);
  	}
  
-diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
-index 6b789a739d4d..c41f2252945e 100644
 --- a/drivers/mmc/host/tmio_mmc_pio.c
 +++ b/drivers/mmc/host/tmio_mmc_pio.c
-@@ -596,11 +596,11 @@ static void tmio_mmc_data_irq(struct tmio_mmc_host *host, unsigned int stat)
+@@ -596,11 +596,11 @@ static void tmio_mmc_data_irq(struct tmi
  
  		if (done) {
  			tmio_mmc_disable_mmc_irqs(host, TMIO_STAT_DATAEND);
@@ -159,6 +153,3 @@
  	} else {
  		tmio_mmc_do_data_irq(host);
  		tmio_mmc_disable_mmc_irqs(host, TMIO_MASK_READOP | TMIO_MASK_WRITEOP);
--- 
-2.13.3
-
diff --git a/patches.renesas/0117-mmc-host-tmio-use-defines-for-CTL_STOP_INTERNAL_ACTI.patch b/patches.renesas/0117-mmc-host-tmio-use-defines-for-CTL_STOP_INTERNAL_ACTI.patch
index 930a949..0703cc8 100644
--- a/patches.renesas/0117-mmc-host-tmio-use-defines-for-CTL_STOP_INTERNAL_ACTI.patch
+++ b/patches.renesas/0117-mmc-host-tmio-use-defines-for-CTL_STOP_INTERNAL_ACTI.patch
@@ -10,12 +10,10 @@
 (cherry picked from commit 9afcbf4a6f1995f3b47088764eaef7b56154beb9)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/host/tmio_mmc.h     | 4 ++++
- drivers/mmc/host/tmio_mmc_pio.c | 6 +++---
+ drivers/mmc/host/tmio_mmc.h     |    4 ++++
+ drivers/mmc/host/tmio_mmc_pio.c |    6 +++---
  2 files changed, 7 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
-index 3f25984cf184..eb913c8c4e6e 100644
 --- a/drivers/mmc/host/tmio_mmc.h
 +++ b/drivers/mmc/host/tmio_mmc.h
 @@ -49,6 +49,10 @@
@@ -29,11 +27,9 @@
  /* Definitions for values the CTRL_STATUS register can take. */
  #define TMIO_STAT_CMDRESPEND    BIT(0)
  #define TMIO_STAT_DATAEND       BIT(2)
-diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
-index c41f2252945e..c655c9de1dde 100644
 --- a/drivers/mmc/host/tmio_mmc_pio.c
 +++ b/drivers/mmc/host/tmio_mmc_pio.c
-@@ -340,7 +340,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command
+@@ -340,7 +340,7 @@ static int tmio_mmc_start_command(struct
  
  	/* CMD12 is handled by hardware */
  	if (cmd->opcode == MMC_STOP_TRANSMISSION && !cmd->arg) {
@@ -42,7 +38,7 @@
  		return 0;
  	}
  
-@@ -367,7 +367,7 @@ static int tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command
+@@ -367,7 +367,7 @@ static int tmio_mmc_start_command(struct
  	if (data) {
  		c |= DATA_PRESENT;
  		if (data->blocks > 1) {
@@ -51,7 +47,7 @@
  			c |= TRANSFER_MULTI;
  
  			/*
-@@ -554,7 +554,7 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host)
+@@ -554,7 +554,7 @@ void tmio_mmc_do_data_irq(struct tmio_mm
  
  	if (stop) {
  		if (stop->opcode == MMC_STOP_TRANSMISSION && !stop->arg)
@@ -60,6 +56,3 @@
  		else
  			BUG();
  	}
--- 
-2.13.3
-
diff --git a/patches.renesas/0118-mmc-host-tmio-fix-minor-typos-in-comments.patch b/patches.renesas/0118-mmc-host-tmio-fix-minor-typos-in-comments.patch
index d69e6c1..e7c18f7 100644
--- a/patches.renesas/0118-mmc-host-tmio-fix-minor-typos-in-comments.patch
+++ b/patches.renesas/0118-mmc-host-tmio-fix-minor-typos-in-comments.patch
@@ -11,11 +11,9 @@
 (cherry picked from commit d8acd16c84c32a65a291e8f16ba4cb3b6d182e30)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/host/tmio_mmc.h | 6 +++---
+ drivers/mmc/host/tmio_mmc.h |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
-index eb913c8c4e6e..900258350b65 100644
 --- a/drivers/mmc/host/tmio_mmc.h
 +++ b/drivers/mmc/host/tmio_mmc.h
 @@ -53,7 +53,7 @@
@@ -45,6 +43,3 @@
  #define TMIO_SDIO_STAT_IOIRQ	0x0001
  #define TMIO_SDIO_STAT_EXPUB52	0x4000
  #define TMIO_SDIO_STAT_EXWT	0x8000
--- 
-2.13.3
-
diff --git a/patches.renesas/0119-mmc-host-tmio-don-t-BUG-on-unsupported-stop-commands.patch b/patches.renesas/0119-mmc-host-tmio-don-t-BUG-on-unsupported-stop-commands.patch
index 70a4b48..42bb2be 100644
--- a/patches.renesas/0119-mmc-host-tmio-don-t-BUG-on-unsupported-stop-commands.patch
+++ b/patches.renesas/0119-mmc-host-tmio-don-t-BUG-on-unsupported-stop-commands.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit 022f731e03d190d0e4f52f2b1bd90fae0eadd56d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/host/tmio_mmc_pio.c | 9 +++++----
+ drivers/mmc/host/tmio_mmc_pio.c |    9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
-index c655c9de1dde..42a912a3de67 100644
 --- a/drivers/mmc/host/tmio_mmc_pio.c
 +++ b/drivers/mmc/host/tmio_mmc_pio.c
-@@ -553,10 +553,11 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host)
+@@ -553,10 +553,11 @@ void tmio_mmc_do_data_irq(struct tmio_mm
  	}
  
  	if (stop) {
@@ -36,6 +34,3 @@
  	}
  
  	schedule_work(&host->done);
--- 
-2.13.3
-
diff --git a/patches.renesas/0120-mmc-host-tmio-fill-in-response-from-auto-cmd12.patch b/patches.renesas/0120-mmc-host-tmio-fill-in-response-from-auto-cmd12.patch
index f7665f1..88c0215 100644
--- a/patches.renesas/0120-mmc-host-tmio-fill-in-response-from-auto-cmd12.patch
+++ b/patches.renesas/0120-mmc-host-tmio-fill-in-response-from-auto-cmd12.patch
@@ -15,14 +15,12 @@
 (cherry picked from commit eb7c00e1461124ad0e85f1a9a3954d7164809c13)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/host/tmio_mmc_pio.c | 3 +++
+ drivers/mmc/host/tmio_mmc_pio.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
-index 42a912a3de67..5b01d22932cd 100644
 --- a/drivers/mmc/host/tmio_mmc_pio.c
 +++ b/drivers/mmc/host/tmio_mmc_pio.c
-@@ -557,6 +557,9 @@ void tmio_mmc_do_data_irq(struct tmio_mmc_host *host)
+@@ -557,6 +557,9 @@ void tmio_mmc_do_data_irq(struct tmio_mm
  			dev_err(&host->pdev->dev, "unsupported stop: CMD%u,0x%x. We did CMD12,0\n",
  				stop->opcode, stop->arg);
  
@@ -32,6 +30,3 @@
  		sd_ctrl_write16(host, CTL_STOP_INTERNAL_ACTION, 0);
  	}
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0121-mmc-tmio-always-unmap-DMA-before-waiting-for-interru.patch b/patches.renesas/0121-mmc-tmio-always-unmap-DMA-before-waiting-for-interru.patch
index d6018d9..4a3e7ea 100644
--- a/patches.renesas/0121-mmc-tmio-always-unmap-DMA-before-waiting-for-interru.patch
+++ b/patches.renesas/0121-mmc-tmio-always-unmap-DMA-before-waiting-for-interru.patch
@@ -16,14 +16,12 @@
 (cherry picked from commit 5f07ef8f603ace496ca8c20eef446c5ae7a10474)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/host/tmio_mmc_dma.c | 7 +++++--
+ drivers/mmc/host/tmio_mmc_dma.c |    7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/mmc/host/tmio_mmc_dma.c b/drivers/mmc/host/tmio_mmc_dma.c
-index c7684fa91f1f..e2093db2b7ff 100644
 --- a/drivers/mmc/host/tmio_mmc_dma.c
 +++ b/drivers/mmc/host/tmio_mmc_dma.c
-@@ -47,8 +47,6 @@ static void tmio_mmc_dma_callback(void *arg)
+@@ -47,8 +47,6 @@ static void tmio_mmc_dma_callback(void *
  {
  	struct tmio_mmc_host *host = arg;
  
@@ -32,7 +30,7 @@
  	spin_lock_irq(&host->lock);
  
  	if (!host->data)
-@@ -63,6 +61,11 @@ static void tmio_mmc_dma_callback(void *arg)
+@@ -63,6 +61,11 @@ static void tmio_mmc_dma_callback(void *
  			     host->sg_ptr, host->sg_len,
  			     DMA_TO_DEVICE);
  
@@ -44,6 +42,3 @@
  	tmio_mmc_do_data_irq(host);
  out:
  	spin_unlock_irq(&host->lock);
--- 
-2.13.3
-
diff --git a/patches.renesas/0122-mmc-tmio-always-get-number-of-taps.patch b/patches.renesas/0122-mmc-tmio-always-get-number-of-taps.patch
index 7cf1621..2649afe 100644
--- a/patches.renesas/0122-mmc-tmio-always-get-number-of-taps.patch
+++ b/patches.renesas/0122-mmc-tmio-always-get-number-of-taps.patch
@@ -16,14 +16,12 @@
 (cherry picked from commit 43b0b361b0170030603cf76f70b099f3323edcf3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/host/tmio_mmc_pio.c | 16 +++++++---------
+ drivers/mmc/host/tmio_mmc_pio.c |   16 +++++++---------
  1 file changed, 7 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c
-index 5b01d22932cd..a2d92f10501b 100644
 --- a/drivers/mmc/host/tmio_mmc_pio.c
 +++ b/drivers/mmc/host/tmio_mmc_pio.c
-@@ -815,16 +815,14 @@ static int tmio_mmc_execute_tuning(struct mmc_host *mmc, u32 opcode)
+@@ -815,16 +815,14 @@ static int tmio_mmc_execute_tuning(struc
  	struct tmio_mmc_host *host = mmc_priv(mmc);
  	int i, ret = 0;
  
@@ -47,6 +45,3 @@
  
  	if (host->tap_num * 2 >= sizeof(host->taps) * BITS_PER_BYTE) {
  		dev_warn_once(&host->pdev->dev,
--- 
-2.13.3
-
diff --git a/patches.renesas/0123-rtc-sh-add-support-for-rza-series.patch b/patches.renesas/0123-rtc-sh-add-support-for-rza-series.patch
index 4382f39..796571d 100644
--- a/patches.renesas/0123-rtc-sh-add-support-for-rza-series.patch
+++ b/patches.renesas/0123-rtc-sh-add-support-for-rza-series.patch
@@ -13,12 +13,10 @@
 (cherry picked from commit dab5aec64bf5907f65926675807e4ebe83b3b10e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/rtc/Kconfig  |  4 ++--
- drivers/rtc/rtc-sh.c | 33 ++++++++++++++++++++++++++++-----
- 2 files changed, 30 insertions(+), 7 deletions(-)
+ drivers/rtc/Kconfig  |    4 ++--
+ drivers/rtc/rtc-sh.c |   35 +++++++++++++++++++++++++++++------
+ 2 files changed, 31 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
-index 0723c97ebea3..ca7e07043468 100644
 --- a/drivers/rtc/Kconfig
 +++ b/drivers/rtc/Kconfig
 @@ -1301,10 +1301,10 @@ config RTC_DRV_SA1100
@@ -34,8 +32,6 @@
  
  	  To compile this driver as a module, choose M here: the
  	  module will be called rtc-sh.
-diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
-index 17b6235d67a5..9c45b5216b5f 100644
 --- a/drivers/rtc/rtc-sh.c
 +++ b/drivers/rtc/rtc-sh.c
 @@ -27,7 +27,15 @@
@@ -54,7 +50,7 @@
  
  #define DRV_NAME	"sh-rtc"
  
-@@ -570,6 +578,8 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
+@@ -570,6 +578,8 @@ static int __init sh_rtc_probe(struct pl
  	rtc->alarm_irq = platform_get_irq(pdev, 2);
  
  	res = platform_get_resource(pdev, IORESOURCE_IO, 0);
@@ -63,7 +59,7 @@
  	if (unlikely(res == NULL)) {
  		dev_err(&pdev->dev, "No IO resource\n");
  		return -ENOENT;
-@@ -587,12 +597,15 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
+@@ -587,12 +597,15 @@ static int __init sh_rtc_probe(struct pl
  	if (unlikely(!rtc->regbase))
  		return -EINVAL;
  
@@ -71,20 +67,21 @@
 -	/* With a single device, the clock id is still "rtc0" */
 -	if (clk_id < 0)
 -		clk_id = 0;
+-
+-	snprintf(clk_name, sizeof(clk_name), "rtc%d", clk_id);
 +	if (!pdev->dev.of_node) {
 +		clk_id = pdev->id;
 +		/* With a single device, the clock id is still "rtc0" */
 +		if (clk_id < 0)
 +			clk_id = 0;
- 
--	snprintf(clk_name, sizeof(clk_name), "rtc%d", clk_id);
++
 +		snprintf(clk_name, sizeof(clk_name), "rtc%d", clk_id);
 +	} else
 +		snprintf(clk_name, sizeof(clk_name), "fck");
  
  	rtc->clk = devm_clk_get(&pdev->dev, clk_name);
  	if (IS_ERR(rtc->clk)) {
-@@ -608,6 +621,8 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
+@@ -608,6 +621,8 @@ static int __init sh_rtc_probe(struct pl
  	clk_enable(rtc->clk);
  
  	rtc->capabilities = RTC_DEF_CAPABILITIES;
@@ -93,7 +90,7 @@
  	if (dev_get_platdata(&pdev->dev)) {
  		struct sh_rtc_platform_info *pinfo =
  			dev_get_platdata(&pdev->dev);
-@@ -618,6 +633,7 @@ static int __init sh_rtc_probe(struct platform_device *pdev)
+@@ -618,6 +633,7 @@ static int __init sh_rtc_probe(struct pl
  		 */
  		rtc->capabilities |= pinfo->capabilities;
  	}
@@ -101,7 +98,7 @@
  
  	if (rtc->carry_irq <= 0) {
  		/* register shared periodic/carry/alarm irq */
-@@ -738,10 +754,17 @@ static int sh_rtc_resume(struct device *dev)
+@@ -738,10 +754,17 @@ static int sh_rtc_resume(struct device *
  
  static SIMPLE_DEV_PM_OPS(sh_rtc_pm_ops, sh_rtc_suspend, sh_rtc_resume);
  
@@ -119,6 +116,3 @@
  	},
  	.remove		= __exit_p(sh_rtc_remove),
  };
--- 
-2.13.3
-
diff --git a/patches.renesas/0124-dt-bindings-rtc-document-the-rtc-sh-bindings.patch b/patches.renesas/0124-dt-bindings-rtc-document-the-rtc-sh-bindings.patch
index 48146ec..54fd7ae 100644
--- a/patches.renesas/0124-dt-bindings-rtc-document-the-rtc-sh-bindings.patch
+++ b/patches.renesas/0124-dt-bindings-rtc-document-the-rtc-sh-bindings.patch
@@ -12,13 +12,10 @@
 (cherry picked from commit 04767b9fc2315c90a1e4bfdee883c0cbc122f30f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/rtc/rtc-sh.txt | 28 ++++++++++++++++++++++++
+ Documentation/devicetree/bindings/rtc/rtc-sh.txt |   28 +++++++++++++++++++++++
  1 file changed, 28 insertions(+)
  create mode 100644 Documentation/devicetree/bindings/rtc/rtc-sh.txt
 
-diff --git a/Documentation/devicetree/bindings/rtc/rtc-sh.txt b/Documentation/devicetree/bindings/rtc/rtc-sh.txt
-new file mode 100644
-index 000000000000..7676c7d28874
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/rtc/rtc-sh.txt
 @@ -0,0 +1,28 @@
@@ -50,6 +47,3 @@
 +		 <&rtc_x3_clk>, <&extal_clk>;
 +	clock-names = "fck", "rtc_x1", "rtc_x3", "extal";
 +};
--- 
-2.13.3
-
diff --git a/patches.renesas/0125-rtc-sh-mark-PM-functions-as-unused.patch b/patches.renesas/0125-rtc-sh-mark-PM-functions-as-unused.patch
index c537c60..e2ff000 100644
--- a/patches.renesas/0125-rtc-sh-mark-PM-functions-as-unused.patch
+++ b/patches.renesas/0125-rtc-sh-mark-PM-functions-as-unused.patch
@@ -19,14 +19,12 @@
 (cherry picked from commit 5d05e81516cfe7606ee0cd8278fe225314dccfbe)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/rtc/rtc-sh.c | 6 ++----
+ drivers/rtc/rtc-sh.c |    6 ++----
  1 file changed, 2 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c
-index 9c45b5216b5f..fc2c3cdedbf9 100644
 --- a/drivers/rtc/rtc-sh.c
 +++ b/drivers/rtc/rtc-sh.c
-@@ -734,8 +734,7 @@ static void sh_rtc_set_irq_wake(struct device *dev, int enabled)
+@@ -734,8 +734,7 @@ static void sh_rtc_set_irq_wake(struct d
  	}
  }
  
@@ -36,7 +34,7 @@
  {
  	if (device_may_wakeup(dev))
  		sh_rtc_set_irq_wake(dev, 1);
-@@ -743,14 +742,13 @@ static int sh_rtc_suspend(struct device *dev)
+@@ -743,14 +742,13 @@ static int sh_rtc_suspend(struct device
  	return 0;
  }
  
@@ -52,6 +50,3 @@
  
  static SIMPLE_DEV_PM_OPS(sh_rtc_pm_ops, sh_rtc_suspend, sh_rtc_resume);
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0126-serial-sh-sci-Fix-hang-in-sci_reset.patch b/patches.renesas/0126-serial-sh-sci-Fix-hang-in-sci_reset.patch
index 367c3f9..734a0c0 100644
--- a/patches.renesas/0126-serial-sh-sci-Fix-hang-in-sci_reset.patch
+++ b/patches.renesas/0126-serial-sh-sci-Fix-hang-in-sci_reset.patch
@@ -31,14 +31,12 @@
 (cherry picked from commit e37f712f760478a3bce8a68b8d85b5b0bf6642eb)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 4 ----
+ drivers/tty/serial/sh-sci.c |    4 ----
  1 file changed, 4 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index a08272553439..be09431e46f5 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -2159,10 +2159,6 @@ static void sci_reset(struct uart_port *port)
+@@ -2159,10 +2159,6 @@ static void sci_reset(struct uart_port *
  	unsigned int status;
  	struct sci_port *s = to_sci_port(port);
  
@@ -49,6 +47,3 @@
  	serial_port_out(port, SCSCR, 0x00);	/* TE=0, RE=0, CKE1=0 */
  
  	reg = sci_getreg(port, SCFCR);
--- 
-2.13.3
-
diff --git a/patches.renesas/0127-serial-sh-sci-Fix-late-enablement-of-AUTORTS.patch b/patches.renesas/0127-serial-sh-sci-Fix-late-enablement-of-AUTORTS.patch
index 5a57c96..a6e2f13 100644
--- a/patches.renesas/0127-serial-sh-sci-Fix-late-enablement-of-AUTORTS.patch
+++ b/patches.renesas/0127-serial-sh-sci-Fix-late-enablement-of-AUTORTS.patch
@@ -23,14 +23,12 @@
 (cherry picked from commit 5f76895e4c712b1b5af450cf344389b8c53ac2c2)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 4 ++++
+ drivers/tty/serial/sh-sci.c |    4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index be09431e46f5..a8b4bea3925b 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -2372,6 +2372,10 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -2372,6 +2372,10 @@ done:
  
  		serial_port_out(port, SCFCR, ctrl);
  	}
@@ -41,6 +39,3 @@
  
  	scr_val |= SCSCR_RE | SCSCR_TE |
  		   (s->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0));
--- 
-2.13.3
-
diff --git a/patches.renesas/0128-serial-sh-sci-Fix-AUTO-RTS-in-sci_init_pins.patch b/patches.renesas/0128-serial-sh-sci-Fix-AUTO-RTS-in-sci_init_pins.patch
index cf0e953..e2e3491 100644
--- a/patches.renesas/0128-serial-sh-sci-Fix-AUTO-RTS-in-sci_init_pins.patch
+++ b/patches.renesas/0128-serial-sh-sci-Fix-AUTO-RTS-in-sci_init_pins.patch
@@ -19,14 +19,12 @@
 (cherry picked from commit cfa6eb239154315e6efcdda1d929e024097f927b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 25 +++++++++++++++++++------
+ drivers/tty/serial/sh-sci.c |   25 +++++++++++++++++++------
  1 file changed, 19 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index a8b4bea3925b..66b459e8a4ac 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -683,24 +683,37 @@ static void sci_init_pins(struct uart_port *port, unsigned int cflag)
+@@ -683,24 +683,37 @@ static void sci_init_pins(struct uart_po
  	}
  
  	if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
@@ -70,6 +68,3 @@
  		/* CTS# and SCK are inputs */
  		status &= ~(SCSPTR_CTSIO | SCSPTR_SCKIO);
  		serial_port_out(port, SCSPTR, status);
--- 
-2.13.3
-
diff --git a/patches.renesas/0129-clocksource-sh_tmu-Compute-rate-before-registration-.patch b/patches.renesas/0129-clocksource-sh_tmu-Compute-rate-before-registration-.patch
index 08bd3a4..d4fd838 100644
--- a/patches.renesas/0129-clocksource-sh_tmu-Compute-rate-before-registration-.patch
+++ b/patches.renesas/0129-clocksource-sh_tmu-Compute-rate-before-registration-.patch
@@ -53,11 +53,9 @@
 (cherry picked from commit c3c0a20df9fc55e2243a31f91a943b3e8ba61289)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clocksource/sh_tmu.c | 26 +++++++++++++-------------
+ drivers/clocksource/sh_tmu.c |   26 +++++++++++++-------------
  1 file changed, 13 insertions(+), 13 deletions(-)
 
-diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c
-index 469e776ec17a..820004297dec 100644
 --- a/drivers/clocksource/sh_tmu.c
 +++ b/drivers/clocksource/sh_tmu.c
 @@ -46,7 +46,6 @@ struct sh_tmu_channel {
@@ -76,7 +74,7 @@
  
  	enum sh_tmu_model model;
  
-@@ -165,7 +165,6 @@ static int __sh_tmu_enable(struct sh_tmu_channel *ch)
+@@ -165,7 +165,6 @@ static int __sh_tmu_enable(struct sh_tmu
  	sh_tmu_write(ch, TCNT, 0xffffffff);
  
  	/* configure channel to parent clock / 4, irq off */
@@ -84,7 +82,7 @@
  	sh_tmu_write(ch, TCR, TCR_TPSC_CLK4);
  
  	/* enable channel */
-@@ -271,10 +270,8 @@ static int sh_tmu_clocksource_enable(struct clocksource *cs)
+@@ -271,10 +270,8 @@ static int sh_tmu_clocksource_enable(str
  		return 0;
  
  	ret = sh_tmu_enable(ch);
@@ -96,7 +94,7 @@
  
  	return ret;
  }
-@@ -334,8 +331,7 @@ static int sh_tmu_register_clocksource(struct sh_tmu_channel *ch,
+@@ -334,8 +331,7 @@ static int sh_tmu_register_clocksource(s
  	dev_info(&ch->tmu->pdev->dev, "ch%u: used as clock source\n",
  		 ch->index);
  
@@ -106,7 +104,7 @@
  	return 0;
  }
  
-@@ -346,14 +342,10 @@ static struct sh_tmu_channel *ced_to_sh_tmu(struct clock_event_device *ced)
+@@ -346,14 +342,10 @@ static struct sh_tmu_channel *ced_to_sh_
  
  static void sh_tmu_clock_event_start(struct sh_tmu_channel *ch, int periodic)
  {
@@ -122,7 +120,7 @@
  		sh_tmu_set_next(ch, ch->periodic, 1);
  	}
  }
-@@ -435,7 +427,7 @@ static void sh_tmu_register_clockevent(struct sh_tmu_channel *ch,
+@@ -435,7 +427,7 @@ static void sh_tmu_register_clockevent(s
  	dev_info(&ch->tmu->pdev->dev, "ch%u: used for clock events\n",
  		 ch->index);
  
@@ -131,7 +129,7 @@
  
  	ret = request_irq(ch->irq, sh_tmu_interrupt,
  			  IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,
-@@ -561,6 +553,14 @@ static int sh_tmu_setup(struct sh_tmu_device *tmu, struct platform_device *pdev)
+@@ -561,6 +553,14 @@ static int sh_tmu_setup(struct sh_tmu_de
  	if (ret < 0)
  		goto err_clk_put;
  
@@ -146,6 +144,3 @@
  	/* Map the memory resource. */
  	ret = sh_tmu_map_memory(tmu);
  	if (ret < 0) {
--- 
-2.13.3
-
diff --git a/patches.renesas/0130-ASoC-simple-scu-card-use-defined-dev-on-probe.patch b/patches.renesas/0130-ASoC-simple-scu-card-use-defined-dev-on-probe.patch
index f2078c6..3c649fc 100644
--- a/patches.renesas/0130-ASoC-simple-scu-card-use-defined-dev-on-probe.patch
+++ b/patches.renesas/0130-ASoC-simple-scu-card-use-defined-dev-on-probe.patch
@@ -11,14 +11,12 @@
 (cherry picked from commit 40b68dac75a1d16266d3c89244ccf7b899afac3e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/generic/simple-scu-card.c | 4 ++--
+ sound/soc/generic/simple-scu-card.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
-index 308ff4c11a8d..420b1c50b850 100644
 --- a/sound/soc/generic/simple-scu-card.c
 +++ b/sound/soc/generic/simple-scu-card.c
-@@ -257,7 +257,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
+@@ -257,7 +257,7 @@ static int asoc_simple_card_probe(struct
  	struct snd_soc_dai_link *dai_link;
  	struct asoc_simple_dai *dai_props;
  	struct device *dev = &pdev->dev;
@@ -27,7 +25,7 @@
  	int num, ret;
  
  	/* Allocate the private data */
-@@ -292,7 +292,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
+@@ -292,7 +292,7 @@ static int asoc_simple_card_probe(struct
  
  	snd_soc_card_set_drvdata(&priv->snd_card, priv);
  
@@ -36,6 +34,3 @@
  	if (ret >= 0)
  		return ret;
  err:
--- 
-2.13.3
-
diff --git a/patches.renesas/0131-ASoC-simple-scu-card-add-new-simple_priv_to_card-mac.patch b/patches.renesas/0131-ASoC-simple-scu-card-add-new-simple_priv_to_card-mac.patch
index fca3ad3..85da83e 100644
--- a/patches.renesas/0131-ASoC-simple-scu-card-add-new-simple_priv_to_card-mac.patch
+++ b/patches.renesas/0131-ASoC-simple-scu-card-add-new-simple_priv_to_card-mac.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit d27f3b4a2d81e873de4d11899e510a1a507da8e3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/generic/simple-scu-card.c | 35 ++++++++++++++++++++---------------
+ sound/soc/generic/simple-scu-card.c |   35 ++++++++++++++++++++---------------
  1 file changed, 20 insertions(+), 15 deletions(-)
 
-diff --git a/sound/soc/generic/simple-scu-card.c b/sound/soc/generic/simple-scu-card.c
-index 420b1c50b850..dcbcab230d1b 100644
 --- a/sound/soc/generic/simple-scu-card.c
 +++ b/sound/soc/generic/simple-scu-card.c
 @@ -31,9 +31,10 @@ struct simple_card_data {
@@ -33,7 +31,7 @@
  
  #define DAI	"sound-dai"
  #define CELL	"#sound-dai-cells"
-@@ -109,6 +110,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np,
+@@ -109,6 +110,7 @@ static int asoc_simple_card_dai_link_of(
  	struct device *dev = simple_priv_to_dev(priv);
  	struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, idx);
  	struct asoc_simple_dai *dai_props = simple_priv_to_props(priv, idx);
@@ -41,7 +39,7 @@
  	int ret;
  
  	if (is_fe) {
-@@ -163,7 +165,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *np,
+@@ -163,7 +165,7 @@ static int asoc_simple_card_dai_link_of(
  		if (ret < 0)
  			return ret;
  
@@ -50,7 +48,7 @@
  					      &priv->codec_conf,
  					      dai_link->codec_of_node,
  					      PREFIX "prefix");
-@@ -201,6 +203,7 @@ static int asoc_simple_card_parse_of(struct device_node *node,
+@@ -201,6 +203,7 @@ static int asoc_simple_card_parse_of(str
  {
  	struct device *dev = simple_priv_to_dev(priv);
  	struct device_node *np;
@@ -58,7 +56,7 @@
  	unsigned int daifmt = 0;
  	bool is_fe;
  	int ret, i;
-@@ -208,7 +211,7 @@ static int asoc_simple_card_parse_of(struct device_node *node,
+@@ -208,7 +211,7 @@ static int asoc_simple_card_parse_of(str
  	if (!node)
  		return -EINVAL;
  
@@ -67,7 +65,7 @@
  	if (ret < 0)
  		return ret;
  
-@@ -239,12 +242,12 @@ static int asoc_simple_card_parse_of(struct device_node *node,
+@@ -239,12 +242,12 @@ static int asoc_simple_card_parse_of(str
  		i++;
  	}
  
@@ -82,7 +80,7 @@
  	dev_dbg(dev, "convert_rate     %d\n", priv->convert_rate);
  	dev_dbg(dev, "convert_channels %d\n", priv->convert_channels);
  
-@@ -256,6 +259,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
+@@ -256,6 +259,7 @@ static int asoc_simple_card_probe(struct
  	struct simple_card_data *priv;
  	struct snd_soc_dai_link *dai_link;
  	struct asoc_simple_dai *dai_props;
@@ -90,7 +88,7 @@
  	struct device *dev = &pdev->dev;
  	struct device_node *np = dev->of_node;
  	int num, ret;
-@@ -276,12 +280,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
+@@ -276,12 +280,13 @@ static int asoc_simple_card_probe(struct
  	priv->dai_link				= dai_link;
  
  	/* Init snd_soc_card */
@@ -110,7 +108,7 @@
  
  	ret = asoc_simple_card_parse_of(np, priv);
  	if (ret < 0) {
-@@ -290,13 +295,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
+@@ -290,13 +295,13 @@ static int asoc_simple_card_probe(struct
  		goto err;
  	}
  
@@ -127,6 +125,3 @@
  
  	return ret;
  }
--- 
-2.13.3
-
diff --git a/patches.renesas/0132-smsc911x-Adding-support-for-Micochip-LAN9250-Etherne.patch b/patches.renesas/0132-smsc911x-Adding-support-for-Micochip-LAN9250-Etherne.patch
index ecfd882..8feb47d 100644
--- a/patches.renesas/0132-smsc911x-Adding-support-for-Micochip-LAN9250-Etherne.patch
+++ b/patches.renesas/0132-smsc911x-Adding-support-for-Micochip-LAN9250-Etherne.patch
@@ -12,12 +12,10 @@
 (cherry picked from commit f6fec61eb555e47e87234e8915ad726ba6c2d3f8)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/smsc/smsc911x.c | 49 ++++++++++++++++++++++--------------
- drivers/net/ethernet/smsc/smsc911x.h | 19 ++++++++++++++
+ drivers/net/ethernet/smsc/smsc911x.c |   49 +++++++++++++++++++++--------------
+ drivers/net/ethernet/smsc/smsc911x.h |   19 +++++++++++++
  2 files changed, 49 insertions(+), 19 deletions(-)
 
-diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
-index 6fb2d15b5351..d0e9f6530580 100644
 --- a/drivers/net/ethernet/smsc/smsc911x.c
 +++ b/drivers/net/ethernet/smsc/smsc911x.c
 @@ -25,7 +25,7 @@
@@ -29,7 +27,7 @@
   *
   */
  
-@@ -1450,6 +1450,8 @@ static int smsc911x_soft_reset(struct smsc911x_data *pdata)
+@@ -1450,6 +1450,8 @@ static int smsc911x_soft_reset(struct sm
  	unsigned int timeout;
  	unsigned int temp;
  	int ret;
@@ -38,7 +36,7 @@
  
  	/*
  	 * Make sure to power-up the PHY chip before doing a reset, otherwise
-@@ -1476,15 +1478,23 @@ static int smsc911x_soft_reset(struct smsc911x_data *pdata)
+@@ -1476,15 +1478,23 @@ static int smsc911x_soft_reset(struct sm
  		}
  	}
  
@@ -66,7 +64,7 @@
  		SMSC_WARN(pdata, drv, "Failed to complete reset");
  		return -EIO;
  	}
-@@ -2259,28 +2269,29 @@ static int smsc911x_init(struct net_device *dev)
+@@ -2259,28 +2269,29 @@ static int smsc911x_init(struct net_devi
  
  	pdata->idrev = smsc911x_reg_read(pdata, ID_REV);
  	switch (pdata->idrev & 0xFFFF0000) {
@@ -110,8 +108,6 @@
  		pdata->generation = 4;
  		break;
  
-diff --git a/drivers/net/ethernet/smsc/smsc911x.h b/drivers/net/ethernet/smsc/smsc911x.h
-index 54d648920a1b..8d75508acd2b 100644
 --- a/drivers/net/ethernet/smsc/smsc911x.h
 +++ b/drivers/net/ethernet/smsc/smsc911x.h
 @@ -20,6 +20,22 @@
@@ -147,6 +143,3 @@
  /*
   * MAC Control and Status Register (Indirect Address)
   * Offset (through the MAC_CSR CMD and DATA port)
--- 
-2.13.3
-
diff --git a/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch b/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch
index 2e2ccfd..3844a64 100644
--- a/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch
+++ b/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit 77172a1f886a696bab5b4d3006ccf55ee4b1bfe5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/gadget/udc/renesas_usb3.c | 67 ++++++++++++++++++++++++++++++++---
+ drivers/usb/gadget/udc/renesas_usb3.c |   67 +++++++++++++++++++++++++++++++---
  1 file changed, 63 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index ba78e3f7aea8..898e2d1b681e 100644
 --- a/drivers/usb/gadget/udc/renesas_usb3.c
 +++ b/drivers/usb/gadget/udc/renesas_usb3.c
 @@ -37,6 +37,9 @@
@@ -41,7 +39,7 @@
  /* P0_MOD */
  #define P0_MOD_DIR		BIT(6)
  
-@@ -362,10 +368,6 @@ static void usb3_init_axi_bridge(struct renesas_usb3 *usb3)
+@@ -362,10 +368,6 @@ static void usb3_init_axi_bridge(struct
  
  static void usb3_init_epc_registers(struct renesas_usb3 *usb3)
  {
@@ -52,7 +50,7 @@
  	usb3_write(usb3, ~0, USB3_USB_INT_STA_1);
  	usb3_enable_irq_1(usb3, USB_INT_1_VBUS_CNG);
  }
-@@ -538,11 +540,49 @@ static void usb3_check_vbus(struct renesas_usb3 *usb3)
+@@ -538,11 +540,49 @@ static void usb3_check_vbus(struct renes
  	}
  }
  
@@ -102,7 +100,7 @@
  	usb3_check_vbus(usb3);
  }
  
-@@ -551,6 +591,7 @@ static void renesas_usb3_stop_controller(struct renesas_usb3 *usb3)
+@@ -551,6 +591,7 @@ static void renesas_usb3_stop_controller
  	usb3_disconnect(usb3);
  	usb3_write(usb3, 0, USB3_P0_INT_ENA);
  	usb3_write(usb3, 0, USB3_PN_INT_ENA);
@@ -110,7 +108,7 @@
  	usb3_write(usb3, 0, USB3_USB_INT_ENA_1);
  	usb3_write(usb3, 0, USB3_USB_INT_ENA_2);
  	usb3_write(usb3, 0, USB3_AXI_INT_ENA);
-@@ -1496,10 +1537,22 @@ static void usb3_irq_epc_int_2(struct renesas_usb3 *usb3, u32 int_sta_2)
+@@ -1496,10 +1537,22 @@ static void usb3_irq_epc_int_2(struct re
  	}
  }
  
@@ -133,7 +131,7 @@
  
  	int_sta_1 &= usb3_read(usb3, USB3_USB_INT_ENA_1);
  	if (int_sta_1) {
-@@ -1510,6 +1563,12 @@ static void usb3_irq_epc(struct renesas_usb3 *usb3)
+@@ -1510,6 +1563,12 @@ static void usb3_irq_epc(struct renesas_
  	int_sta_2 &= usb3_read(usb3, USB3_USB_INT_ENA_2);
  	if (int_sta_2)
  		usb3_irq_epc_int_2(usb3, int_sta_2);
@@ -146,6 +144,3 @@
  }
  
  static irqreturn_t renesas_usb3_irq(int irq, void *_usb3)
--- 
-2.13.3
-
diff --git a/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch b/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch
index 35d0263..517fc7f 100644
--- a/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch
+++ b/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch
@@ -10,12 +10,10 @@
 (cherry picked from commit 3b68e7ca388815459ef4466e17ed6661d0d67a5b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/gadget/udc/Kconfig        |  1 +
- drivers/usb/gadget/udc/renesas_usb3.c | 43 +++++++++++++++++++++++++++++++++--
+ drivers/usb/gadget/udc/Kconfig        |    1 
+ drivers/usb/gadget/udc/renesas_usb3.c |   43 ++++++++++++++++++++++++++++++++--
  2 files changed, 42 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig
-index 658b8da60915..ef7cf8dbf38c 100644
 --- a/drivers/usb/gadget/udc/Kconfig
 +++ b/drivers/usb/gadget/udc/Kconfig
 @@ -177,6 +177,7 @@ config USB_RENESAS_USBHS_UDC
@@ -26,8 +24,6 @@
  	help
  	   Renesas USB3.0 Peripheral controller is a USB peripheral controller
  	   that supports super, high, and full speed USB 3.0 data transfers.
-diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 898e2d1b681e..55f8a966b3ae 100644
 --- a/drivers/usb/gadget/udc/renesas_usb3.c
 +++ b/drivers/usb/gadget/udc/renesas_usb3.c
 @@ -10,6 +10,7 @@
@@ -56,7 +52,7 @@
  };
  
  #define gadget_to_renesas_usb3(_gadget)	\
-@@ -338,6 +343,15 @@ static int usb3_wait(struct renesas_usb3 *usb3, u32 reg, u32 mask,
+@@ -338,6 +343,15 @@ static int usb3_wait(struct renesas_usb3
  	return -EBUSY;
  }
  
@@ -72,7 +68,7 @@
  static void usb3_enable_irq_1(struct renesas_usb3 *usb3, u32 bits)
  {
  	usb3_set_bit(usb3, bits, USB3_USB_INT_ENA_1);
-@@ -533,10 +547,14 @@ static void usb3_check_vbus(struct renesas_usb3 *usb3)
+@@ -533,10 +547,14 @@ static void usb3_check_vbus(struct renes
  	if (usb3->workaround_for_vbus) {
  		usb3_connect(usb3);
  	} else {
@@ -88,7 +84,7 @@
  	}
  }
  
-@@ -569,10 +587,14 @@ static bool usb3_is_a_device(struct renesas_usb3 *usb3)
+@@ -569,10 +587,14 @@ static bool usb3_is_a_device(struct rene
  
  static void usb3_check_id(struct renesas_usb3 *usb3)
  {
@@ -104,7 +100,7 @@
  }
  
  static void renesas_usb3_init_controller(struct renesas_usb3 *usb3)
-@@ -1975,6 +1997,12 @@ static const struct of_device_id usb3_of_match[] = {
+@@ -1975,6 +1997,12 @@ static const struct of_device_id usb3_of
  };
  MODULE_DEVICE_TABLE(of, usb3_of_match);
  
@@ -117,7 +113,7 @@
  static int renesas_usb3_probe(struct platform_device *pdev)
  {
  	struct renesas_usb3 *usb3;
-@@ -2018,6 +2046,17 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2018,6 +2046,17 @@ static int renesas_usb3_probe(struct pla
  	if (ret < 0)
  		return ret;
  
@@ -135,6 +131,3 @@
  	/* for ep0 handling */
  	usb3->ep0_req = __renesas_usb3_ep_alloc_request(GFP_KERNEL);
  	if (!usb3->ep0_req)
--- 
-2.13.3
-
diff --git a/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch b/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch
index e3415ca..8329a8e 100644
--- a/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch
+++ b/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch
@@ -28,14 +28,11 @@
 Conflicts:
 	drivers/usb/gadget/udc/renesas_usb3.c
 ---
- .../ABI/testing/sysfs-platform-renesas_usb3        | 15 ++++++
- drivers/usb/gadget/udc/renesas_usb3.c              | 56 ++++++++++++++++++++++
+ Documentation/ABI/testing/sysfs-platform-renesas_usb3 |   15 ++++
+ drivers/usb/gadget/udc/renesas_usb3.c                 |   56 ++++++++++++++++++
  2 files changed, 71 insertions(+)
  create mode 100644 Documentation/ABI/testing/sysfs-platform-renesas_usb3
 
-diff --git a/Documentation/ABI/testing/sysfs-platform-renesas_usb3 b/Documentation/ABI/testing/sysfs-platform-renesas_usb3
-new file mode 100644
-index 000000000000..5621c15d5dc0
 --- /dev/null
 +++ b/Documentation/ABI/testing/sysfs-platform-renesas_usb3
 @@ -0,0 +1,15 @@
@@ -54,11 +51,9 @@
 +		Read the file, then it shows the following strings:
 +		 "host" - The mode is host now.
 +		 "peripheral" - The mode is peripheral now.
-diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 55f8a966b3ae..f16649c6d76e 100644
 --- a/drivers/usb/gadget/udc/renesas_usb3.c
 +++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -372,6 +372,11 @@ static void usb3_disable_pipe_irq(struct renesas_usb3 *usb3, int num)
+@@ -372,6 +372,11 @@ static void usb3_disable_pipe_irq(struct
  	usb3_clear_bit(usb3, USB_INT_2_PIPE(num), USB3_USB_INT_ENA_2);
  }
  
@@ -70,7 +65,7 @@
  static void usb3_init_axi_bridge(struct renesas_usb3 *usb3)
  {
  	/* Set AXI_INT */
-@@ -576,8 +581,14 @@ static void usb3_vbus_out(struct renesas_usb3 *usb3, bool enable)
+@@ -576,8 +581,14 @@ static void usb3_vbus_out(struct renesas
  
  static void usb3_mode_config(struct renesas_usb3 *usb3, bool host, bool a_dev)
  {
@@ -85,7 +80,7 @@
  }
  
  static bool usb3_is_a_device(struct renesas_usb3 *usb3)
-@@ -1862,11 +1873,49 @@ static const struct usb_gadget_ops renesas_usb3_gadget_ops = {
+@@ -1862,11 +1873,49 @@ static const struct usb_gadget_ops renes
  	.set_selfpowered	= renesas_usb3_set_selfpowered,
  };
  
@@ -135,7 +130,7 @@
  	usb_del_gadget_udc(&usb3->gadget);
  
  	__renesas_usb3_ep_free_request(usb3->ep0_req);
-@@ -2066,12 +2115,19 @@ static int renesas_usb3_probe(struct platform_device *pdev)
+@@ -2066,12 +2115,19 @@ static int renesas_usb3_probe(struct pla
  	if (ret < 0)
  		goto err_add_udc;
  
@@ -155,6 +150,3 @@
  err_add_udc:
  	__renesas_usb3_ep_free_request(usb3->ep0_req);
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch b/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch
index 86c82b4..592f71f 100644
--- a/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch
+++ b/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch
@@ -16,14 +16,12 @@
 (cherry picked from commit cdc876877ebc3f0677b267756d4564e2a429e730)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/gadget/udc/renesas_usb3.c | 3 +++
+ drivers/usb/gadget/udc/renesas_usb3.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index f16649c6d76e..401ba92f15db 100644
 --- a/drivers/usb/gadget/udc/renesas_usb3.c
 +++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -1841,6 +1841,9 @@ static int renesas_usb3_stop(struct usb_gadget *gadget)
+@@ -1841,6 +1841,9 @@ static int renesas_usb3_stop(struct usb_
  	pm_runtime_put(usb3_to_dev(usb3));
  	pm_runtime_disable(usb3_to_dev(usb3));
  
@@ -33,6 +31,3 @@
  	return 0;
  }
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch b/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch
index fb38b7e..5df0c40 100644
--- a/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch
+++ b/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch
@@ -18,14 +18,12 @@
 Conflicts:
 	drivers/usb/gadget/udc/renesas_usb3.c
 ---
- drivers/usb/gadget/udc/renesas_usb3.c | 3 ---
+ drivers/usb/gadget/udc/renesas_usb3.c |    3 ---
  1 file changed, 3 deletions(-)
 
-diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index 401ba92f15db..f16649c6d76e 100644
 --- a/drivers/usb/gadget/udc/renesas_usb3.c
 +++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -1841,9 +1841,6 @@ static int renesas_usb3_stop(struct usb_gadget *gadget)
+@@ -1841,9 +1841,6 @@ static int renesas_usb3_stop(struct usb_
  	pm_runtime_put(usb3_to_dev(usb3));
  	pm_runtime_disable(usb3_to_dev(usb3));
  
@@ -35,6 +33,3 @@
  	return 0;
  }
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch b/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch
index 49eaf3d..2f42bea 100644
--- a/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch
+++ b/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch
@@ -14,14 +14,12 @@
 (cherry picked from commit afbbc7913a288c29616bd31ae612548f6475151a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/gadget/udc/renesas_usb3.c | 2 +-
+ drivers/usb/gadget/udc/renesas_usb3.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c
-index f16649c6d76e..cba129376001 100644
 --- a/drivers/usb/gadget/udc/renesas_usb3.c
 +++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -623,7 +623,6 @@ static void renesas_usb3_stop_controller(struct renesas_usb3 *usb3)
+@@ -623,7 +623,6 @@ static void renesas_usb3_stop_controller
  {
  	usb3_disconnect(usb3);
  	usb3_write(usb3, 0, USB3_P0_INT_ENA);
@@ -29,7 +27,7 @@
  	usb3_write(usb3, 0, USB3_USB_OTG_INT_ENA);
  	usb3_write(usb3, 0, USB3_USB_INT_ENA_1);
  	usb3_write(usb3, 0, USB3_USB_INT_ENA_2);
-@@ -1682,6 +1681,7 @@ static int usb3_disable_pipe_n(struct renesas_usb3_ep *usb3_ep)
+@@ -1682,6 +1681,7 @@ static int usb3_disable_pipe_n(struct re
  
  	spin_lock_irqsave(&usb3->lock, flags);
  	if (!usb3_pn_change(usb3, usb3_ep->num)) {
@@ -37,6 +35,3 @@
  		usb3_write(usb3, 0, USB3_PN_RAMMAP);
  		usb3_clear_bit(usb3, PN_CON_EN, USB3_PN_CON);
  	}
--- 
-2.13.3
-
diff --git a/patches.renesas/0139-media-v4l-vsp1-Fix-format-info-documentation.patch b/patches.renesas/0139-media-v4l-vsp1-Fix-format-info-documentation.patch
index 300d1af..3e8eaab 100644
--- a/patches.renesas/0139-media-v4l-vsp1-Fix-format-info-documentation.patch
+++ b/patches.renesas/0139-media-v4l-vsp1-Fix-format-info-documentation.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit f1450162544f5c4dc801c85bb28f64c0fa6146e7)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_pipe.h | 5 +++--
+ drivers/media/platform/vsp1/vsp1_pipe.h |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_pipe.h b/drivers/media/platform/vsp1/vsp1_pipe.h
-index ac4ad2655551..1144bf1e671a 100644
 --- a/drivers/media/platform/vsp1/vsp1_pipe.h
 +++ b/drivers/media/platform/vsp1/vsp1_pipe.h
 @@ -25,11 +25,12 @@ struct vsp1_rwpf;
@@ -35,6 +33,3 @@
   * @swap_yc: the Y and C components are swapped (Y comes before C)
   * @swap_uv: the U and V components are swapped (V comes before U)
   * @hsub: horizontal subsampling factor
--- 
-2.13.3
-
diff --git a/patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch b/patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch
index 6e4071b..2db49b9 100644
--- a/patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch
+++ b/patches.renesas/0140-media-v4l-vsp1-Clean-up-file-handle-in-open-error-pa.patch
@@ -14,14 +14,12 @@
 (cherry picked from commit dadc3be66c282d4c2c917186447494ae79f7b79f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_video.c | 1 +
+ drivers/media/platform/vsp1/vsp1_video.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
-index 3319277c026a..0113a55b19c9 100644
 --- a/drivers/media/platform/vsp1/vsp1_video.c
 +++ b/drivers/media/platform/vsp1/vsp1_video.c
-@@ -1050,6 +1050,7 @@ static int vsp1_video_open(struct file *file)
+@@ -1050,6 +1050,7 @@ static int vsp1_video_open(struct file *
  	ret = vsp1_device_get(video->vsp1);
  	if (ret < 0) {
  		v4l2_fh_del(vfh);
@@ -29,6 +27,3 @@
  		kfree(vfh);
  	}
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0141-media-v4l-vsp1-Fix-RPF-WPF-U-V-order-in-3-planar-for.patch b/patches.renesas/0141-media-v4l-vsp1-Fix-RPF-WPF-U-V-order-in-3-planar-for.patch
index 19bcf23..b6edaac 100644
--- a/patches.renesas/0141-media-v4l-vsp1-Fix-RPF-WPF-U-V-order-in-3-planar-for.patch
+++ b/patches.renesas/0141-media-v4l-vsp1-Fix-RPF-WPF-U-V-order-in-3-planar-for.patch
@@ -16,15 +16,13 @@
 (cherry picked from commit 3425382288fbd13b60581f20076aebd0ef414282)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_rpf.c | 43 ++++++++++++++++++++--------------
- drivers/media/platform/vsp1/vsp1_wpf.c |  9 +++++++
- 2 files changed, 35 insertions(+), 17 deletions(-)
+ drivers/media/platform/vsp1/vsp1_rpf.c |   41 ++++++++++++++++++++-------------
+ drivers/media/platform/vsp1/vsp1_wpf.c |    9 +++++++
+ 2 files changed, 34 insertions(+), 16 deletions(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
-index b2e34a800ffa..1d0944f308ae 100644
 --- a/drivers/media/platform/vsp1/vsp1_rpf.c
 +++ b/drivers/media/platform/vsp1/vsp1_rpf.c
-@@ -72,7 +72,8 @@ static void rpf_configure(struct vsp1_entity *entity,
+@@ -72,7 +72,8 @@ static void rpf_configure(struct vsp1_en
  	}
  
  	if (params == VSP1_ENTITY_PARAMS_PARTITION) {
@@ -34,13 +32,15 @@
  		struct v4l2_rect crop;
  
  		/*
-@@ -120,22 +121,30 @@ static void rpf_configure(struct vsp1_entity *entity,
+@@ -120,22 +121,30 @@ static void rpf_configure(struct vsp1_en
  			       (crop.width << VI6_RPF_SRC_ESIZE_EHSIZE_SHIFT) |
  			       (crop.height << VI6_RPF_SRC_ESIZE_EVSIZE_SHIFT));
  
 -		offsets[0] = crop.top * format->plane_fmt[0].bytesperline
 -			   + crop.left * fmtinfo->bpp[0] / 8;
--
++		mem.addr[0] += crop.top * format->plane_fmt[0].bytesperline
++			     + crop.left * fmtinfo->bpp[0] / 8;
+ 
 -		if (format->num_planes > 1)
 -			offsets[1] = crop.top * format->plane_fmt[1].bytesperline
 -				   + crop.left / fmtinfo->hsub
@@ -54,9 +54,6 @@
 -			       rpf->mem.addr[1] + offsets[1]);
 -		vsp1_rpf_write(rpf, dl, VI6_RPF_SRCM_ADDR_C1,
 -			       rpf->mem.addr[2] + offsets[1]);
-+		mem.addr[0] += crop.top * format->plane_fmt[0].bytesperline
-+			     + crop.left * fmtinfo->bpp[0] / 8;
-+
 +		if (format->num_planes > 1) {
 +			unsigned int offset;
 +
@@ -81,11 +78,9 @@
  		return;
  	}
  
-diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
-index 7c48f81cd5c1..052a83e2d489 100644
 --- a/drivers/media/platform/vsp1/vsp1_wpf.c
 +++ b/drivers/media/platform/vsp1/vsp1_wpf.c
-@@ -216,6 +216,7 @@ static void wpf_configure(struct vsp1_entity *entity,
+@@ -216,6 +216,7 @@ static void wpf_configure(struct vsp1_en
  
  	if (params == VSP1_ENTITY_PARAMS_PARTITION) {
  		const struct v4l2_pix_format_mplane *format = &wpf->format;
@@ -93,7 +88,7 @@
  		struct vsp1_rwpf_memory mem = wpf->mem;
  		unsigned int flip = wpf->flip.active;
  		unsigned int width = source_format->width;
-@@ -281,6 +282,14 @@ static void wpf_configure(struct vsp1_entity *entity,
+@@ -281,6 +282,14 @@ static void wpf_configure(struct vsp1_en
  			}
  		}
  
@@ -108,6 +103,3 @@
  		vsp1_wpf_write(wpf, dl, VI6_WPF_DSTM_ADDR_Y, mem.addr[0]);
  		vsp1_wpf_write(wpf, dl, VI6_WPF_DSTM_ADDR_C0, mem.addr[1]);
  		vsp1_wpf_write(wpf, dl, VI6_WPF_DSTM_ADDR_C1, mem.addr[2]);
--- 
-2.13.3
-
diff --git a/patches.renesas/0142-media-v4l-vsp1-Prevent-multiple-streamon-race-commen.patch b/patches.renesas/0142-media-v4l-vsp1-Prevent-multiple-streamon-race-commen.patch
index b9e90a1..e8cd34d 100644
--- a/patches.renesas/0142-media-v4l-vsp1-Prevent-multiple-streamon-race-commen.patch
+++ b/patches.renesas/0142-media-v4l-vsp1-Prevent-multiple-streamon-race-commen.patch
@@ -30,14 +30,12 @@
 (cherry picked from commit 4461c84b52b4a952c657505ef7e4e06b016783df)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_video.c | 13 +++++++++++++
+ drivers/media/platform/vsp1/vsp1_video.c |   13 +++++++++++++
  1 file changed, 13 insertions(+)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
-index 0113a55b19c9..eb422c150847 100644
 --- a/drivers/media/platform/vsp1/vsp1_video.c
 +++ b/drivers/media/platform/vsp1/vsp1_video.c
-@@ -797,6 +797,7 @@ static int vsp1_video_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -797,6 +797,7 @@ static int vsp1_video_start_streaming(st
  {
  	struct vsp1_video *video = vb2_get_drv_priv(vq);
  	struct vsp1_pipeline *pipe = video->rwpf->pipe;
@@ -45,7 +43,7 @@
  	unsigned long flags;
  	int ret;
  
-@@ -807,11 +808,23 @@ static int vsp1_video_start_streaming(struct vb2_queue *vq, unsigned int count)
+@@ -807,11 +808,23 @@ static int vsp1_video_start_streaming(st
  			mutex_unlock(&pipe->lock);
  			return ret;
  		}
@@ -69,6 +67,3 @@
  	spin_lock_irqsave(&pipe->irqlock, flags);
  	if (vsp1_pipeline_ready(pipe))
  		vsp1_video_pipeline_run(pipe);
--- 
-2.13.3
-
diff --git a/patches.renesas/0143-media-v4l-vsp1-Remove-redundant-pipe-dl-usage-from-d.patch b/patches.renesas/0143-media-v4l-vsp1-Remove-redundant-pipe-dl-usage-from-d.patch
index 3fe15d4..a9fa3a4 100644
--- a/patches.renesas/0143-media-v4l-vsp1-Remove-redundant-pipe-dl-usage-from-d.patch
+++ b/patches.renesas/0143-media-v4l-vsp1-Remove-redundant-pipe-dl-usage-from-d.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit f2074708ee07848f86105b68bdce062de4e6685d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_drm.c | 20 ++++++++++----------
+ drivers/media/platform/vsp1/vsp1_drm.c |   20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
-index 10287be5606f..afcb754579fc 100644
 --- a/drivers/media/platform/vsp1/vsp1_drm.c
 +++ b/drivers/media/platform/vsp1/vsp1_drm.c
-@@ -219,9 +219,6 @@ void vsp1_du_atomic_begin(struct device *dev)
+@@ -219,9 +219,6 @@ void vsp1_du_atomic_begin(struct device
  	struct vsp1_pipeline *pipe = &vsp1->drm->pipe;
  
  	vsp1->drm->num_inputs = pipe->num_inputs;
@@ -30,7 +28,7 @@
  }
  EXPORT_SYMBOL_GPL(vsp1_du_atomic_begin);
  
-@@ -425,10 +422,14 @@ void vsp1_du_atomic_flush(struct device *dev)
+@@ -425,10 +422,14 @@ void vsp1_du_atomic_flush(struct device
  	struct vsp1_pipeline *pipe = &vsp1->drm->pipe;
  	struct vsp1_rwpf *inputs[VSP1_MAX_RPF] = { NULL, };
  	struct vsp1_entity *entity;
@@ -45,7 +43,7 @@
  	/* Count the number of enabled inputs and sort them by Z-order. */
  	pipe->num_inputs = 0;
  
-@@ -483,26 +484,25 @@ void vsp1_du_atomic_flush(struct device *dev)
+@@ -483,26 +484,25 @@ void vsp1_du_atomic_flush(struct device
  			struct vsp1_rwpf *rpf = to_rwpf(&entity->subdev);
  
  			if (!pipe->inputs[rpf->entity.index]) {
@@ -78,6 +76,3 @@
  
  	/* Start or stop the pipeline if needed. */
  	if (!vsp1->drm->num_inputs && pipe->num_inputs) {
--- 
-2.13.3
-
diff --git a/patches.renesas/0144-media-v4l-vsp1-Fix-multi-line-comment-style.patch b/patches.renesas/0144-media-v4l-vsp1-Fix-multi-line-comment-style.patch
index ff61084..9aeb513 100644
--- a/patches.renesas/0144-media-v4l-vsp1-Fix-multi-line-comment-style.patch
+++ b/patches.renesas/0144-media-v4l-vsp1-Fix-multi-line-comment-style.patch
@@ -10,27 +10,25 @@
 (cherry picked from commit 9dbed95ba640c1b4fb2d069814924811bdeb0de6)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_bru.c    | 27 ++++++++++++++++---------
- drivers/media/platform/vsp1/vsp1_dl.c     | 27 ++++++++++++++++---------
- drivers/media/platform/vsp1/vsp1_drm.c    | 21 +++++++++++++-------
- drivers/media/platform/vsp1/vsp1_drv.c    | 12 +++++++----
- drivers/media/platform/vsp1/vsp1_entity.c |  9 ++++++---
- drivers/media/platform/vsp1/vsp1_hsit.c   |  3 ++-
- drivers/media/platform/vsp1/vsp1_lif.c    |  6 ++++--
- drivers/media/platform/vsp1/vsp1_pipe.c   |  9 ++++++---
- drivers/media/platform/vsp1/vsp1_rpf.c    |  9 ++++++---
- drivers/media/platform/vsp1/vsp1_rwpf.c   |  6 ++++--
- drivers/media/platform/vsp1/vsp1_sru.c    |  3 ++-
- drivers/media/platform/vsp1/vsp1_uds.c    |  3 ++-
- drivers/media/platform/vsp1/vsp1_video.c  | 33 ++++++++++++++++++++-----------
- drivers/media/platform/vsp1/vsp1_wpf.c    | 12 +++++++----
+ drivers/media/platform/vsp1/vsp1_bru.c    |   27 ++++++++++++++++--------
+ drivers/media/platform/vsp1/vsp1_dl.c     |   27 ++++++++++++++++--------
+ drivers/media/platform/vsp1/vsp1_drm.c    |   21 ++++++++++++-------
+ drivers/media/platform/vsp1/vsp1_drv.c    |   12 +++++++---
+ drivers/media/platform/vsp1/vsp1_entity.c |    9 +++++---
+ drivers/media/platform/vsp1/vsp1_hsit.c   |    3 +-
+ drivers/media/platform/vsp1/vsp1_lif.c    |    6 +++--
+ drivers/media/platform/vsp1/vsp1_pipe.c   |    9 +++++---
+ drivers/media/platform/vsp1/vsp1_rpf.c    |    9 +++++---
+ drivers/media/platform/vsp1/vsp1_rwpf.c   |    6 +++--
+ drivers/media/platform/vsp1/vsp1_sru.c    |    3 +-
+ drivers/media/platform/vsp1/vsp1_uds.c    |    3 +-
+ drivers/media/platform/vsp1/vsp1_video.c  |   33 ++++++++++++++++++++----------
+ drivers/media/platform/vsp1/vsp1_wpf.c    |   12 +++++++---
  14 files changed, 120 insertions(+), 60 deletions(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_bru.c b/drivers/media/platform/vsp1/vsp1_bru.c
-index ee8355c28f94..85362c5ef57a 100644
 --- a/drivers/media/platform/vsp1/vsp1_bru.c
 +++ b/drivers/media/platform/vsp1/vsp1_bru.c
-@@ -251,7 +251,8 @@ static int bru_set_selection(struct v4l2_subdev *subdev,
+@@ -251,7 +251,8 @@ static int bru_set_selection(struct v4l2
  	sel->r.left = clamp_t(unsigned int, sel->r.left, 0, format->width - 1);
  	sel->r.top = clamp_t(unsigned int, sel->r.top, 0, format->height - 1);
  
@@ -40,7 +38,7 @@
  	 * to the sink format size.
  	 */
  	format = vsp1_entity_get_pad_format(&bru->entity, config, sel->pad);
-@@ -300,13 +301,15 @@ static void bru_configure(struct vsp1_entity *entity,
+@@ -300,13 +301,15 @@ static void bru_configure(struct vsp1_en
  	format = vsp1_entity_get_pad_format(&bru->entity, bru->entity.config,
  					    bru->entity.source_pad);
  
@@ -58,7 +56,7 @@
  	 * format at the pipeline output is premultiplied.
  	 */
  	flags = pipe->output ? pipe->output->format.flags : 0;
-@@ -314,7 +317,8 @@ static void bru_configure(struct vsp1_entity *entity,
+@@ -314,7 +317,8 @@ static void bru_configure(struct vsp1_en
  		       flags & V4L2_PIX_FMT_FLAG_PREMUL_ALPHA ?
  		       0 : VI6_BRU_INCTRL_NRM);
  
@@ -68,7 +66,7 @@
  	 * configure its color.
  	 */
  	vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_SIZE,
-@@ -325,7 +329,8 @@ static void bru_configure(struct vsp1_entity *entity,
+@@ -325,7 +329,8 @@ static void bru_configure(struct vsp1_en
  	vsp1_bru_write(bru, dl, VI6_BRU_VIRRPF_COL, bru->bgcolor |
  		       (0xff << VI6_BRU_VIRRPF_COL_A_SHIFT));
  
@@ -78,7 +76,7 @@
  	 * unit with a NOP operation to make BRU input 1 available as the
  	 * Blend/ROP unit B SRC input.
  	 */
-@@ -337,7 +342,8 @@ static void bru_configure(struct vsp1_entity *entity,
+@@ -337,7 +342,8 @@ static void bru_configure(struct vsp1_en
  		bool premultiplied = false;
  		u32 ctrl = 0;
  
@@ -88,7 +86,7 @@
  		 * input for alpha blending. Blend/ROP units corresponding to
  		 * disabled BRU inputs are used in ROP NOP mode to ignore the
  		 * SRC input.
-@@ -352,13 +358,15 @@ static void bru_configure(struct vsp1_entity *entity,
+@@ -352,13 +358,15 @@ static void bru_configure(struct vsp1_en
  			     |  VI6_BRU_CTRL_AROP(VI6_ROP_NOP);
  		}
  
@@ -106,7 +104,7 @@
  		 * D in that order. The Blend/ROP unit B SRC is hardwired to the
  		 * ROP unit output, the corresponding register bits must be set
  		 * to 0.
-@@ -368,7 +376,8 @@ static void bru_configure(struct vsp1_entity *entity,
+@@ -368,7 +376,8 @@ static void bru_configure(struct vsp1_en
  
  		vsp1_bru_write(bru, dl, VI6_BRU_CTRL(i), ctrl);
  
@@ -116,11 +114,9 @@
  		 *
  		 *	DSTc = DSTc * (1 - SRCa) + SRCc * SRCa
  		 *	DSTa = DSTa * (1 - SRCa) + SRCa
-diff --git a/drivers/media/platform/vsp1/vsp1_dl.c b/drivers/media/platform/vsp1/vsp1_dl.c
-index ad545aff4e35..7d8f37772b56 100644
 --- a/drivers/media/platform/vsp1/vsp1_dl.c
 +++ b/drivers/media/platform/vsp1/vsp1_dl.c
-@@ -240,7 +240,8 @@ static struct vsp1_dl_list *vsp1_dl_list_alloc(struct vsp1_dl_manager *dlm)
+@@ -240,7 +240,8 @@ static struct vsp1_dl_list *vsp1_dl_list
  	INIT_LIST_HEAD(&dl->fragments);
  	dl->dlm = dlm;
  
@@ -130,7 +126,7 @@
  	 * and the optional header. Both are allocated together to avoid memory
  	 * fragmentation, with the header located right after the body in
  	 * memory.
-@@ -511,7 +512,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_list *dl)
+@@ -511,7 +512,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_
  		goto done;
  	}
  
@@ -140,7 +136,7 @@
  	 * display list at any time and we can't touch the address and size
  	 * registers. In that case mark the update as pending, it will be
  	 * queued up to the hardware by the frame end interrupt handler.
-@@ -523,7 +525,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_list *dl)
+@@ -523,7 +525,8 @@ void vsp1_dl_list_commit(struct vsp1_dl_
  		goto done;
  	}
  
@@ -150,7 +146,7 @@
  	 * The UPD bit will be cleared by the device when the display list is
  	 * processed.
  	 */
-@@ -547,7 +550,8 @@ void vsp1_dlm_irq_display_start(struct vsp1_dl_manager *dlm)
+@@ -547,7 +550,8 @@ void vsp1_dlm_irq_display_start(struct v
  {
  	spin_lock(&dlm->lock);
  
@@ -160,7 +156,7 @@
  	 * processing by the device. The active display list, if any, won't be
  	 * accessed anymore and can be reused.
  	 */
-@@ -566,14 +570,16 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
+@@ -566,14 +570,16 @@ void vsp1_dlm_irq_frame_end(struct vsp1_
  	__vsp1_dl_list_put(dlm->active);
  	dlm->active = NULL;
  
@@ -179,7 +175,7 @@
  	 * interrupt and occurred after the frame end event and UPD clear but
  	 * before interrupt processing. The hardware hasn't taken the update
  	 * into account yet, we'll thus skip one frame and retry.
-@@ -581,7 +587,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
+@@ -581,7 +587,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_
  	if (vsp1_read(vsp1, VI6_DL_BODY_SIZE) & VI6_DL_BODY_SIZE_UPD)
  		goto done;
  
@@ -189,7 +185,7 @@
  	 * frame end interrupt. The display list thus becomes active.
  	 */
  	if (dlm->queued) {
-@@ -589,7 +596,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_dl_manager *dlm)
+@@ -589,7 +596,8 @@ void vsp1_dlm_irq_frame_end(struct vsp1_
  		dlm->queued = NULL;
  	}
  
@@ -199,7 +195,7 @@
  	 * list to the hardware if one has been prepared.
  	 */
  	if (dlm->pending) {
-@@ -615,7 +623,8 @@ void vsp1_dlm_setup(struct vsp1_device *vsp1)
+@@ -615,7 +623,8 @@ void vsp1_dlm_setup(struct vsp1_device *
  		 | VI6_DL_CTRL_DC2 | VI6_DL_CTRL_DC1 | VI6_DL_CTRL_DC0
  		 | VI6_DL_CTRL_DLE;
  
@@ -209,11 +205,9 @@
  	 * Mode, all other pipelines use manual start.
  	 */
  	if (vsp1->drm)
-diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
-index afcb754579fc..8cd88547da2c 100644
 --- a/drivers/media/platform/vsp1/vsp1_drm.c
 +++ b/drivers/media/platform/vsp1/vsp1_drm.c
-@@ -78,7 +78,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg)
+@@ -78,7 +78,8 @@ int vsp1_du_setup_lif(struct device *dev
  	int ret;
  
  	if (!cfg) {
@@ -223,7 +217,7 @@
  		 * the pipeline and turn the light off.
  		 */
  		ret = vsp1_pipeline_stop(pipe);
-@@ -106,7 +107,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg)
+@@ -106,7 +107,8 @@ int vsp1_du_setup_lif(struct device *dev
  	dev_dbg(vsp1->dev, "%s: configuring LIF with format %ux%u\n",
  		__func__, cfg->width, cfg->height);
  
@@ -233,7 +227,7 @@
  	 * pipeline.
  	 */
  	memset(&format, 0, sizeof(format));
-@@ -175,7 +177,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg)
+@@ -175,7 +177,8 @@ int vsp1_du_setup_lif(struct device *dev
  		__func__, format.format.width, format.format.height,
  		format.format.code);
  
@@ -243,7 +237,7 @@
  	 * requested frame size and media bus code.
  	 */
  	if (format.format.width != cfg->width ||
-@@ -185,7 +188,8 @@ int vsp1_du_setup_lif(struct device *dev, const struct vsp1_du_lif_config *cfg)
+@@ -185,7 +188,8 @@ int vsp1_du_setup_lif(struct device *dev
  		return -EPIPE;
  	}
  
@@ -253,7 +247,7 @@
  	 * the pipeline pointer in all entities, which the s_stream handlers
  	 * will need. We don't start the entities themselves right at this point
  	 * as there's no plane configured yet, so we can't start processing
-@@ -317,7 +321,8 @@ static int vsp1_du_setup_rpf_pipe(struct vsp1_device *vsp1,
+@@ -317,7 +321,8 @@ static int vsp1_du_setup_rpf_pipe(struct
  	const struct v4l2_rect *crop;
  	int ret;
  
@@ -263,7 +257,7 @@
  	 * BRU sink pad.
  	 */
  	crop = &vsp1->drm->inputs[rpf->entity.index].crop;
-@@ -356,7 +361,8 @@ static int vsp1_du_setup_rpf_pipe(struct vsp1_device *vsp1,
+@@ -356,7 +361,8 @@ static int vsp1_du_setup_rpf_pipe(struct
  		__func__, sel.r.left, sel.r.top, sel.r.width, sel.r.height,
  		rpf->entity.index);
  
@@ -273,7 +267,7 @@
  	 * conversion if needed.
  	 */
  	format.pad = RWPF_PAD_SOURCE;
-@@ -528,7 +534,8 @@ int vsp1_drm_create_links(struct vsp1_device *vsp1)
+@@ -528,7 +534,8 @@ int vsp1_drm_create_links(struct vsp1_de
  	unsigned int i;
  	int ret;
  
@@ -283,11 +277,9 @@
  	 * output to the DU.
  	 */
  	if (!vsp1->bru || !vsp1->lif)
-diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
-index aa237b48ad55..8d1e61b353bb 100644
 --- a/drivers/media/platform/vsp1/vsp1_drv.c
 +++ b/drivers/media/platform/vsp1/vsp1_drv.c
-@@ -170,7 +170,8 @@ static int vsp1_uapi_create_links(struct vsp1_device *vsp1)
+@@ -170,7 +170,8 @@ static int vsp1_uapi_create_links(struct
  	}
  
  	for (i = 0; i < vsp1->info->wpf_count; ++i) {
@@ -297,7 +289,7 @@
  		 * immutable.
  		 */
  		struct vsp1_rwpf *wpf = vsp1->wpf[i];
-@@ -227,7 +228,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
+@@ -227,7 +228,8 @@ static int vsp1_create_entities(struct v
  	media_device_init(mdev);
  
  	vsp1->media_ops.link_setup = vsp1_entity_link_setup;
@@ -307,7 +299,7 @@
  	 * the pipeline is configured internally by the driver in that case, and
  	 * its configuration can thus be trusted.
  	 */
-@@ -279,7 +281,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
+@@ -279,7 +281,8 @@ static int vsp1_create_entities(struct v
  
  	list_add_tail(&vsp1->hst->entity.list_dev, &vsp1->entities);
  
@@ -317,7 +309,7 @@
  	 * which case the userspace API is disabled. If the userspace API is
  	 * enabled skip the LIF, even when present.
  	 */
-@@ -391,7 +394,8 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
+@@ -391,7 +394,8 @@ static int vsp1_create_entities(struct v
  	if (ret < 0)
  		goto done;
  
@@ -327,11 +319,9 @@
  	 * the DRM pipeline otherwise.
  	 */
  	if (vsp1->info->uapi) {
-diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/platform/vsp1/vsp1_entity.c
-index da673495c222..12eca5660d6e 100644
 --- a/drivers/media/platform/vsp1/vsp1_entity.c
 +++ b/drivers/media/platform/vsp1/vsp1_entity.c
-@@ -199,7 +199,8 @@ int vsp1_subdev_enum_mbus_code(struct v4l2_subdev *subdev,
+@@ -199,7 +199,8 @@ int vsp1_subdev_enum_mbus_code(struct v4
  		struct v4l2_subdev_pad_config *config;
  		struct v4l2_mbus_framefmt *format;
  
@@ -341,7 +331,7 @@
  		 * is always identical to the source format.
  		 */
  		if (code->index)
-@@ -263,7 +264,8 @@ int vsp1_subdev_enum_frame_size(struct v4l2_subdev *subdev,
+@@ -263,7 +264,8 @@ int vsp1_subdev_enum_frame_size(struct v
  		fse->min_height = min_height;
  		fse->max_height = max_height;
  	} else {
@@ -351,7 +341,7 @@
  		 * the size on the sink pad.
  		 */
  		fse->min_width = format->width;
-@@ -407,7 +409,8 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
+@@ -407,7 +409,8 @@ int vsp1_entity_init(struct vsp1_device
  
  	vsp1_entity_init_cfg(subdev, NULL);
  
@@ -361,11 +351,9 @@
  	 * rectangles.
  	 */
  	entity->config = v4l2_subdev_alloc_pad_config(&entity->subdev);
-diff --git a/drivers/media/platform/vsp1/vsp1_hsit.c b/drivers/media/platform/vsp1/vsp1_hsit.c
-index 94316afc54ff..764d405345ee 100644
 --- a/drivers/media/platform/vsp1/vsp1_hsit.c
 +++ b/drivers/media/platform/vsp1/vsp1_hsit.c
-@@ -84,7 +84,8 @@ static int hsit_set_format(struct v4l2_subdev *subdev,
+@@ -84,7 +84,8 @@ static int hsit_set_format(struct v4l2_s
  	format = vsp1_entity_get_pad_format(&hsit->entity, config, fmt->pad);
  
  	if (fmt->pad == HSIT_PAD_SOURCE) {
@@ -375,11 +363,9 @@
  		 * modified.
  		 */
  		fmt->format = *format;
-diff --git a/drivers/media/platform/vsp1/vsp1_lif.c b/drivers/media/platform/vsp1/vsp1_lif.c
-index e32acae1fc6e..702487f895b3 100644
 --- a/drivers/media/platform/vsp1/vsp1_lif.c
 +++ b/drivers/media/platform/vsp1/vsp1_lif.c
-@@ -84,7 +84,8 @@ static int lif_set_format(struct v4l2_subdev *subdev,
+@@ -84,7 +84,8 @@ static int lif_set_format(struct v4l2_su
  	format = vsp1_entity_get_pad_format(&lif->entity, config, fmt->pad);
  
  	if (fmt->pad == LIF_PAD_SOURCE) {
@@ -389,7 +375,7 @@
  		 * format.
  		 */
  		fmt->format = *format;
-@@ -176,7 +177,8 @@ struct vsp1_lif *vsp1_lif_create(struct vsp1_device *vsp1)
+@@ -176,7 +177,8 @@ struct vsp1_lif *vsp1_lif_create(struct
  	lif->entity.ops = &lif_entity_ops;
  	lif->entity.type = VSP1_ENTITY_LIF;
  
@@ -399,11 +385,9 @@
  	 * requires a function to be set. Use PROC_VIDEO_PIXEL_FORMATTER just to
  	 * avoid triggering a WARN_ON(), the value won't be seen anywhere.
  	 */
-diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c
-index 280ba0804699..3f1acf68dc6e 100644
 --- a/drivers/media/platform/vsp1/vsp1_pipe.c
 +++ b/drivers/media/platform/vsp1/vsp1_pipe.c
-@@ -251,7 +251,8 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
+@@ -251,7 +251,8 @@ int vsp1_pipeline_stop(struct vsp1_pipel
  	int ret;
  
  	if (pipe->lif) {
@@ -413,7 +397,7 @@
  		 * way to stop the pipeline is to reset the hardware.
  		 */
  		ret = vsp1_reset_wpf(pipe->output->entity.vsp1,
-@@ -322,7 +323,8 @@ void vsp1_pipeline_propagate_alpha(struct vsp1_pipeline *pipe,
+@@ -322,7 +323,8 @@ void vsp1_pipeline_propagate_alpha(struc
  	if (!pipe->uds)
  		return;
  
@@ -423,7 +407,7 @@
  	 * output alpha value is thus always equal to 255.
  	 */
  	if (pipe->uds_input->type == VSP1_ENTITY_BRU)
-@@ -337,7 +339,8 @@ void vsp1_pipelines_suspend(struct vsp1_device *vsp1)
+@@ -337,7 +339,8 @@ void vsp1_pipelines_suspend(struct vsp1_
  	unsigned int i;
  	int ret;
  
@@ -433,11 +417,9 @@
  	 * pipelines twice, first to set them all to the stopping state, and
  	 * then to wait for the stop to complete.
  	 */
-diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
-index 1d0944f308ae..f5a9a4c8c74d 100644
 --- a/drivers/media/platform/vsp1/vsp1_rpf.c
 +++ b/drivers/media/platform/vsp1/vsp1_rpf.c
-@@ -195,7 +195,8 @@ static void rpf_configure(struct vsp1_entity *entity,
+@@ -195,7 +195,8 @@ static void rpf_configure(struct vsp1_en
  		       (left << VI6_RPF_LOC_HCOORD_SHIFT) |
  		       (top << VI6_RPF_LOC_VCOORD_SHIFT));
  
@@ -447,7 +429,7 @@
  	 * a fixed alpha value set through the V4L2_CID_ALPHA_COMPONENT control
  	 * otherwise.
  	 *
-@@ -225,7 +226,8 @@ static void rpf_configure(struct vsp1_entity *entity,
+@@ -225,7 +226,8 @@ static void rpf_configure(struct vsp1_en
  		u32 mult;
  
  		if (fmtinfo->alpha) {
@@ -457,7 +439,7 @@
  			 * alpha multiplier. If the input is premultiplied we
  			 * need to multiply both the alpha channel and the pixel
  			 * components by the global alpha value to keep them
-@@ -240,7 +242,8 @@ static void rpf_configure(struct vsp1_entity *entity,
+@@ -240,7 +242,8 @@ static void rpf_configure(struct vsp1_en
  				VI6_RPF_MULT_ALPHA_P_MMD_RATIO :
  				VI6_RPF_MULT_ALPHA_P_MMD_NONE);
  		} else {
@@ -467,11 +449,9 @@
  			 * global alpha value is applied in the unpacking unit,
  			 * the alpha multiplier isn't needed and must be
  			 * disabled.
-diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.c b/drivers/media/platform/vsp1/vsp1_rwpf.c
-index 04104ef28fb5..7d52c88a583e 100644
 --- a/drivers/media/platform/vsp1/vsp1_rwpf.c
 +++ b/drivers/media/platform/vsp1/vsp1_rwpf.c
-@@ -86,7 +86,8 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,
+@@ -86,7 +86,8 @@ static int vsp1_rwpf_set_format(struct v
  	format = vsp1_entity_get_pad_format(&rwpf->entity, config, fmt->pad);
  
  	if (fmt->pad == RWPF_PAD_SOURCE) {
@@ -481,7 +461,7 @@
  		 * format code can be changed on the source pad.
  		 */
  		format->code = fmt->format.code;
-@@ -205,7 +206,8 @@ static int vsp1_rwpf_set_selection(struct v4l2_subdev *subdev,
+@@ -205,7 +206,8 @@ static int vsp1_rwpf_set_selection(struc
  	format = vsp1_entity_get_pad_format(&rwpf->entity, config,
  					    RWPF_PAD_SINK);
  
@@ -491,11 +471,9 @@
  	 * shifting the color plane.
  	 */
  	if (format->code == MEDIA_BUS_FMT_AYUV8_1X32) {
-diff --git a/drivers/media/platform/vsp1/vsp1_sru.c b/drivers/media/platform/vsp1/vsp1_sru.c
-index b4e568a3b4ed..30142793dfcd 100644
 --- a/drivers/media/platform/vsp1/vsp1_sru.c
 +++ b/drivers/media/platform/vsp1/vsp1_sru.c
-@@ -191,7 +191,8 @@ static void sru_try_format(struct vsp1_sru *sru,
+@@ -191,7 +191,8 @@ static void sru_try_format(struct vsp1_s
  						    SRU_PAD_SINK);
  		fmt->code = format->code;
  
@@ -505,11 +483,9 @@
  		 * Compare the input and output rectangles areas (avoiding
  		 * integer overflows on the output): if the requested output
  		 * area is larger than 1.5^2 the input area upscale by two,
-diff --git a/drivers/media/platform/vsp1/vsp1_uds.c b/drivers/media/platform/vsp1/vsp1_uds.c
-index da8f89a31ea4..4226403ad235 100644
 --- a/drivers/media/platform/vsp1/vsp1_uds.c
 +++ b/drivers/media/platform/vsp1/vsp1_uds.c
-@@ -293,7 +293,8 @@ static void uds_configure(struct vsp1_entity *entity,
+@@ -293,7 +293,8 @@ static void uds_configure(struct vsp1_en
  
  	dev_dbg(uds->entity.vsp1->dev, "hscale %u vscale %u\n", hscale, vscale);
  
@@ -519,11 +495,9 @@
  	 * scaling down with a factor lower than or equal to 1/2 in either
  	 * direction.
  	 */
-diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
-index eb422c150847..620beb21dd14 100644
 --- a/drivers/media/platform/vsp1/vsp1_video.c
 +++ b/drivers/media/platform/vsp1/vsp1_video.c
-@@ -103,7 +103,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
+@@ -103,7 +103,8 @@ static int __vsp1_video_try_format(struc
  	unsigned int height = pix->height;
  	unsigned int i;
  
@@ -533,7 +507,7 @@
  	 * equivalent. This selects the format older userspace applications want
  	 * while still exposing the new format.
  	 */
-@@ -114,7 +115,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
+@@ -114,7 +115,8 @@ static int __vsp1_video_try_format(struc
  		}
  	}
  
@@ -543,7 +517,7 @@
  	 * requested format isn't supported.
  	 */
  	info = vsp1_get_format_info(video->vsp1, pix->pixelformat);
-@@ -140,7 +142,8 @@ static int __vsp1_video_try_format(struct vsp1_video *video,
+@@ -140,7 +142,8 @@ static int __vsp1_video_try_format(struc
  	pix->height = clamp(height, VSP1_VIDEO_MIN_HEIGHT,
  			    VSP1_VIDEO_MAX_HEIGHT);
  
@@ -553,7 +527,7 @@
  	 * the datasheet, strides not aligned to a multiple of 128 bytes result
  	 * in image corruption.
  	 */
-@@ -449,7 +452,8 @@ static void vsp1_video_pipeline_frame_end(struct vsp1_pipeline *pipe)
+@@ -449,7 +452,8 @@ static void vsp1_video_pipeline_frame_en
  	state = pipe->state;
  	pipe->state = VSP1_PIPELINE_STOPPED;
  
@@ -563,7 +537,7 @@
  	 * return. Otherwise restart the pipeline if ready.
  	 */
  	if (state == VSP1_PIPELINE_STOPPING)
-@@ -491,7 +495,8 @@ static int vsp1_video_pipeline_build_branch(struct vsp1_pipeline *pipe,
+@@ -491,7 +495,8 @@ static int vsp1_video_pipeline_build_bra
  		entity = to_vsp1_entity(
  			media_entity_to_v4l2_subdev(pad->entity));
  
@@ -573,7 +547,7 @@
  		 * number in the input RPF for use when configuring the RPF.
  		 */
  		if (entity->type == VSP1_ENTITY_BRU) {
-@@ -526,7 +531,8 @@ static int vsp1_video_pipeline_build_branch(struct vsp1_pipeline *pipe,
+@@ -526,7 +531,8 @@ static int vsp1_video_pipeline_build_bra
  					: &input->entity;
  		}
  
@@ -583,7 +557,7 @@
  		 * that the output fan-out can't be more than one, there is thus
  		 * no need to verify here that only a single source link is
  		 * activated.
-@@ -596,7 +602,8 @@ static int vsp1_video_pipeline_build(struct vsp1_pipeline *pipe,
+@@ -596,7 +602,8 @@ static int vsp1_video_pipeline_build(str
  	if (pipe->num_inputs == 0 || !pipe->output)
  		return -EPIPE;
  
@@ -593,7 +567,7 @@
  	 * contains no loop and that all branches end at the output WPF.
  	 */
  	for (i = 0; i < video->vsp1->info->rpf_count; ++i) {
-@@ -627,7 +634,8 @@ static struct vsp1_pipeline *vsp1_video_pipeline_get(struct vsp1_video *video)
+@@ -627,7 +634,8 @@ static struct vsp1_pipeline *vsp1_video_
  	struct vsp1_pipeline *pipe;
  	int ret;
  
@@ -603,7 +577,7 @@
  	 * been allocated just increment its reference count and return it.
  	 * Otherwise allocate a new pipeline and initialize it, it will be freed
  	 * when the last reference is released.
-@@ -767,7 +775,8 @@ static int vsp1_video_setup_pipeline(struct vsp1_pipeline *pipe)
+@@ -767,7 +775,8 @@ static int vsp1_video_setup_pipeline(str
  	if (pipe->uds) {
  		struct vsp1_uds *uds = to_uds(&pipe->uds->subdev);
  
@@ -613,7 +587,7 @@
  		 * component doesn't need to be scaled as the BRU output alpha
  		 * value is fixed to 255. Otherwise we need to scale the alpha
  		 * component only when available at the input RPF.
-@@ -981,7 +990,8 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
+@@ -981,7 +990,8 @@ vsp1_video_streamon(struct file *file, v
  	if (video->queue.owner && video->queue.owner != file->private_data)
  		return -EBUSY;
  
@@ -623,7 +597,7 @@
  	 * touching an entity in the pipeline can be activated or deactivated
  	 * once streaming is started.
  	 */
-@@ -1001,7 +1011,8 @@ vsp1_video_streamon(struct file *file, void *fh, enum v4l2_buf_type type)
+@@ -1001,7 +1011,8 @@ vsp1_video_streamon(struct file *file, v
  
  	mutex_unlock(&mdev->graph_mutex);
  
@@ -633,11 +607,9 @@
  	 * subdev.
  	 */
  	ret = vsp1_video_verify_format(video);
-diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
-index 052a83e2d489..25a2ed6e2e18 100644
 --- a/drivers/media/platform/vsp1/vsp1_wpf.c
 +++ b/drivers/media/platform/vsp1/vsp1_wpf.c
-@@ -88,12 +88,14 @@ static int wpf_init_controls(struct vsp1_rwpf *wpf)
+@@ -88,12 +88,14 @@ static int wpf_init_controls(struct vsp1
  		/* Only WPF0 supports flipping. */
  		num_flip_ctrls = 0;
  	} else if (vsp1->info->features & VSP1_HAS_WPF_HFLIP) {
@@ -654,7 +626,7 @@
  		 * single control (vertical flip).
  		 */
  		num_flip_ctrls = 1;
-@@ -139,7 +141,8 @@ static int wpf_s_stream(struct v4l2_subdev *subdev, int enable)
+@@ -139,7 +141,8 @@ static int wpf_s_stream(struct v4l2_subd
  	if (enable)
  		return 0;
  
@@ -664,7 +636,7 @@
  	 * no pipeline run to apply the display list.
  	 */
  	vsp1_write(vsp1, VI6_WPF_IRQ_ENB(wpf->entity.index), 0);
-@@ -336,7 +339,8 @@ static void wpf_configure(struct vsp1_entity *entity,
+@@ -336,7 +339,8 @@ static void wpf_configure(struct vsp1_en
  
  	vsp1_dl_list_write(dl, VI6_WPF_WRBCK_CTRL, 0);
  
@@ -674,6 +646,3 @@
  	 * configure it as the master layer. Otherwise configure all
  	 * inputs as sub-layers and select the virtual RPF as the master
  	 * layer.
--- 
-2.13.3
-
diff --git a/patches.renesas/0145-media-v4l-vsp1-Disable-HSV-formats-on-Gen3-hardware.patch b/patches.renesas/0145-media-v4l-vsp1-Disable-HSV-formats-on-Gen3-hardware.patch
index 8eb2d97..277aa24 100644
--- a/patches.renesas/0145-media-v4l-vsp1-Disable-HSV-formats-on-Gen3-hardware.patch
+++ b/patches.renesas/0145-media-v4l-vsp1-Disable-HSV-formats-on-Gen3-hardware.patch
@@ -14,14 +14,12 @@
 (cherry picked from commit 40ad34d8ebe7abd0d4df35a3364bf446e10f5c52)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_pipe.c | 12 +++++++++---
+ drivers/media/platform/vsp1/vsp1_pipe.c |   12 +++++++++---
  1 file changed, 9 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c
-index 3f1acf68dc6e..35364f594e19 100644
 --- a/drivers/media/platform/vsp1/vsp1_pipe.c
 +++ b/drivers/media/platform/vsp1/vsp1_pipe.c
-@@ -157,9 +157,15 @@ const struct vsp1_format_info *vsp1_get_format_info(struct vsp1_device *vsp1,
+@@ -157,9 +157,15 @@ const struct vsp1_format_info *vsp1_get_
  {
  	unsigned int i;
  
@@ -40,6 +38,3 @@
  
  	for (i = 0; i < ARRAY_SIZE(vsp1_video_formats); ++i) {
  		const struct vsp1_format_info *info = &vsp1_video_formats[i];
--- 
-2.13.3
-
diff --git a/patches.renesas/0146-media-v4l-vsp1-Fix-struct-vsp1_drm-documentation.patch b/patches.renesas/0146-media-v4l-vsp1-Fix-struct-vsp1_drm-documentation.patch
index aca0ef0..a583138 100644
--- a/patches.renesas/0146-media-v4l-vsp1-Fix-struct-vsp1_drm-documentation.patch
+++ b/patches.renesas/0146-media-v4l-vsp1-Fix-struct-vsp1_drm-documentation.patch
@@ -13,11 +13,9 @@
 (cherry picked from commit 1b8ce4060b02c9ebfcb75a9d91cf85fb1fb1bc1b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_drm.h | 2 +-
+ drivers/media/platform/vsp1/vsp1_drm.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_drm.h b/drivers/media/platform/vsp1/vsp1_drm.h
-index 9e28ab9254ba..c8d2f88fc483 100644
 --- a/drivers/media/platform/vsp1/vsp1_drm.h
 +++ b/drivers/media/platform/vsp1/vsp1_drm.h
 @@ -21,7 +21,7 @@
@@ -29,6 +27,3 @@
   *	position for every input
   */
  struct vsp1_drm {
--- 
-2.13.3
-
diff --git a/patches.renesas/0147-media-v4l-vsp1-Register-pipe-with-output-WPF.patch b/patches.renesas/0147-media-v4l-vsp1-Register-pipe-with-output-WPF.patch
index c400703..8533440 100644
--- a/patches.renesas/0147-media-v4l-vsp1-Register-pipe-with-output-WPF.patch
+++ b/patches.renesas/0147-media-v4l-vsp1-Register-pipe-with-output-WPF.patch
@@ -20,14 +20,12 @@
 (cherry picked from commit 1531a208ed861e4bd287444f9466ffcf98383de2)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_drm.c | 1 +
+ drivers/media/platform/vsp1/vsp1_drm.c |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
-index 8cd88547da2c..6e161347088e 100644
 --- a/drivers/media/platform/vsp1/vsp1_drm.c
 +++ b/drivers/media/platform/vsp1/vsp1_drm.c
-@@ -602,6 +602,7 @@ int vsp1_drm_init(struct vsp1_device *vsp1)
+@@ -602,6 +602,7 @@ int vsp1_drm_init(struct vsp1_device *vs
  	pipe->bru = &vsp1->bru->entity;
  	pipe->lif = &vsp1->lif->entity;
  	pipe->output = vsp1->wpf[0];
@@ -35,6 +33,3 @@
  
  	return 0;
  }
--- 
-2.13.3
-
diff --git a/patches.renesas/0148-media-v4l-vsp1-wpf-Implement-rotation-support.patch b/patches.renesas/0148-media-v4l-vsp1-wpf-Implement-rotation-support.patch
index 954942f..c81d8e6 100644
--- a/patches.renesas/0148-media-v4l-vsp1-wpf-Implement-rotation-support.patch
+++ b/patches.renesas/0148-media-v4l-vsp1-wpf-Implement-rotation-support.patch
@@ -15,18 +15,16 @@
 (cherry picked from commit 3e9a0e0bfafdf6c28c520d43fd64c5775d04662f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_rpf.c   |   2 +-
- drivers/media/platform/vsp1/vsp1_rwpf.c  |   5 +
- drivers/media/platform/vsp1/vsp1_rwpf.h  |   7 +-
- drivers/media/platform/vsp1/vsp1_video.c |  12 +-
- drivers/media/platform/vsp1/vsp1_wpf.c   | 205 +++++++++++++++++++++++--------
+ drivers/media/platform/vsp1/vsp1_rpf.c   |    2 
+ drivers/media/platform/vsp1/vsp1_rwpf.c  |    5 
+ drivers/media/platform/vsp1/vsp1_rwpf.h  |    7 -
+ drivers/media/platform/vsp1/vsp1_video.c |   12 +
+ drivers/media/platform/vsp1/vsp1_wpf.c   |  205 +++++++++++++++++++++++--------
  5 files changed, 177 insertions(+), 54 deletions(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_rpf.c b/drivers/media/platform/vsp1/vsp1_rpf.c
-index f5a9a4c8c74d..8feddd59cf8d 100644
 --- a/drivers/media/platform/vsp1/vsp1_rpf.c
 +++ b/drivers/media/platform/vsp1/vsp1_rpf.c
-@@ -106,7 +106,7 @@ static void rpf_configure(struct vsp1_entity *entity,
+@@ -106,7 +106,7 @@ static void rpf_configure(struct vsp1_en
  			 * of the pipeline.
  			 */
  			output = vsp1_entity_get_pad_format(wpf, wpf->config,
@@ -35,11 +33,9 @@
  
  			crop.width = pipe->partition.width * input_width
  				   / output->width;
-diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.c b/drivers/media/platform/vsp1/vsp1_rwpf.c
-index 7d52c88a583e..cfd8f1904fa6 100644
 --- a/drivers/media/platform/vsp1/vsp1_rwpf.c
 +++ b/drivers/media/platform/vsp1/vsp1_rwpf.c
-@@ -121,6 +121,11 @@ static int vsp1_rwpf_set_format(struct v4l2_subdev *subdev,
+@@ -121,6 +121,11 @@ static int vsp1_rwpf_set_format(struct v
  					    RWPF_PAD_SOURCE);
  	*format = fmt->format;
  
@@ -51,8 +47,6 @@
  done:
  	mutex_unlock(&rwpf->entity.lock);
  	return ret;
-diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.h b/drivers/media/platform/vsp1/vsp1_rwpf.h
-index 1c98aff3da5d..58215a7ab631 100644
 --- a/drivers/media/platform/vsp1/vsp1_rwpf.h
 +++ b/drivers/media/platform/vsp1/vsp1_rwpf.h
 @@ -56,9 +56,14 @@ struct vsp1_rwpf {
@@ -71,11 +65,9 @@
  	} flip;
  
  	struct vsp1_rwpf_memory mem;
-diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
-index 620beb21dd14..79f48a025546 100644
 --- a/drivers/media/platform/vsp1/vsp1_video.c
 +++ b/drivers/media/platform/vsp1/vsp1_video.c
-@@ -187,9 +187,13 @@ static void vsp1_video_pipeline_setup_partitions(struct vsp1_pipeline *pipe)
+@@ -187,9 +187,13 @@ static void vsp1_video_pipeline_setup_pa
  	struct vsp1_entity *entity;
  	unsigned int div_size;
  
@@ -90,7 +82,7 @@
  	div_size = format->width;
  
  	/* Gen2 hardware doesn't require image partitioning. */
-@@ -229,9 +233,13 @@ static struct v4l2_rect vsp1_video_partition(struct vsp1_pipeline *pipe,
+@@ -229,9 +233,13 @@ static struct v4l2_rect vsp1_video_parti
  	struct v4l2_rect partition;
  	unsigned int modulus;
  
@@ -105,11 +97,9 @@
  
  	/* A single partition simply processes the output size in full. */
  	if (pipe->partitions <= 1) {
-diff --git a/drivers/media/platform/vsp1/vsp1_wpf.c b/drivers/media/platform/vsp1/vsp1_wpf.c
-index 25a2ed6e2e18..32df109b119f 100644
 --- a/drivers/media/platform/vsp1/vsp1_wpf.c
 +++ b/drivers/media/platform/vsp1/vsp1_wpf.c
-@@ -43,32 +43,90 @@ static inline void vsp1_wpf_write(struct vsp1_rwpf *wpf,
+@@ -43,32 +43,90 @@ static inline void vsp1_wpf_write(struct
  enum wpf_flip_ctrl {
  	WPF_CTRL_VFLIP = 0,
  	WPF_CTRL_HFLIP = 1,
@@ -216,7 +206,7 @@
  
  	return 0;
  }
-@@ -89,10 +147,10 @@ static int wpf_init_controls(struct vsp1_rwpf *wpf)
+@@ -89,10 +147,10 @@ static int wpf_init_controls(struct vsp1
  		num_flip_ctrls = 0;
  	} else if (vsp1->info->features & VSP1_HAS_WPF_HFLIP) {
  		/*
@@ -230,7 +220,7 @@
  	} else if (vsp1->info->features & VSP1_HAS_WPF_VFLIP) {
  		/*
  		 * When only vertical flip is supported the WPF implements a
-@@ -107,17 +165,19 @@ static int wpf_init_controls(struct vsp1_rwpf *wpf)
+@@ -107,17 +165,19 @@ static int wpf_init_controls(struct vsp1
  	vsp1_rwpf_init_ctrls(wpf, num_flip_ctrls);
  
  	if (num_flip_ctrls >= 1) {
@@ -255,7 +245,7 @@
  	}
  
  	if (wpf->ctrls.error) {
-@@ -222,8 +282,8 @@ static void wpf_configure(struct vsp1_entity *entity,
+@@ -222,8 +282,8 @@ static void wpf_configure(struct vsp1_en
  		const struct vsp1_format_info *fmtinfo = wpf->fmtinfo;
  		struct vsp1_rwpf_memory mem = wpf->mem;
  		unsigned int flip = wpf->flip.active;
@@ -266,7 +256,7 @@
  		unsigned int offset;
  
  		/*
-@@ -246,45 +306,78 @@ static void wpf_configure(struct vsp1_entity *entity,
+@@ -246,45 +306,78 @@ static void wpf_configure(struct vsp1_en
  		/*
  		 * Update the memory offsets based on flipping configuration.
  		 * The destination addresses point to the locations where the
@@ -369,7 +359,7 @@
  		/*
  		 * On Gen3 hardware the SPUVS bit has no effect on 3-planar
  		 * formats. Swap the U and V planes manually in that case.
-@@ -306,6 +399,9 @@ static void wpf_configure(struct vsp1_entity *entity,
+@@ -306,6 +399,9 @@ static void wpf_configure(struct vsp1_en
  
  		outfmt = fmtinfo->hwfmt << VI6_WPF_OUTFMT_WRFMT_SHIFT;
  
@@ -379,7 +369,7 @@
  		if (fmtinfo->alpha)
  			outfmt |= VI6_WPF_OUTFMT_PXA;
  		if (fmtinfo->swap_yc)
-@@ -367,9 +463,18 @@ static void wpf_configure(struct vsp1_entity *entity,
+@@ -367,9 +463,18 @@ static void wpf_configure(struct vsp1_en
  			   VI6_WFP_IRQ_ENB_DFEE);
  }
  
@@ -398,6 +388,3 @@
  };
  
  /* -----------------------------------------------------------------------------
--- 
-2.13.3
-
diff --git a/patches.renesas/0149-ASoC-wm8978-Add-OF-device-ID-table.patch b/patches.renesas/0149-ASoC-wm8978-Add-OF-device-ID-table.patch
index bbef1e5..328b252 100644
--- a/patches.renesas/0149-ASoC-wm8978-Add-OF-device-ID-table.patch
+++ b/patches.renesas/0149-ASoC-wm8978-Add-OF-device-ID-table.patch
@@ -29,14 +29,12 @@
 (cherry picked from commit 5cf015d9cb02c360582b624497b0a1716881cf28)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- sound/soc/codecs/wm8978.c | 7 +++++++
+ sound/soc/codecs/wm8978.c |    7 +++++++
  1 file changed, 7 insertions(+)
 
-diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c
-index 90b2d418ef60..cf761e2d7546 100644
 --- a/sound/soc/codecs/wm8978.c
 +++ b/sound/soc/codecs/wm8978.c
-@@ -1071,9 +1071,16 @@ static const struct i2c_device_id wm8978_i2c_id[] = {
+@@ -1071,9 +1071,16 @@ static const struct i2c_device_id wm8978
  };
  MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id);
  
@@ -53,6 +51,3 @@
  	},
  	.probe =    wm8978_i2c_probe,
  	.remove =   wm8978_i2c_remove,
--- 
-2.13.3
-
diff --git a/patches.renesas/0150-clk-renesas-r8a7795-Add-IMR-clocks.patch b/patches.renesas/0150-clk-renesas-r8a7795-Add-IMR-clocks.patch
index c7e30bc..0800325 100644
--- a/patches.renesas/0150-clk-renesas-r8a7795-Add-IMR-clocks.patch
+++ b/patches.renesas/0150-clk-renesas-r8a7795-Add-IMR-clocks.patch
@@ -14,14 +14,12 @@
 (cherry picked from commit 7d0a7c7bdf7f849ff864a539f1c0c20b8a053f2e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7795-cpg-mssr.c | 4 ++++
+ drivers/clk/renesas/r8a7795-cpg-mssr.c |    4 ++++
  1 file changed, 4 insertions(+)
 
-diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-index bfffdb00df97..2add8218e0f7 100644
 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-@@ -208,6 +208,10 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
+@@ -208,6 +208,10 @@ static const struct mssr_mod_clk r8a7795
  	DEF_MOD("vin0",			 811,	R8A7795_CLK_S2D1),
  	DEF_MOD("etheravb",		 812,	R8A7795_CLK_S3D2),
  	DEF_MOD("sata0",		 815,	R8A7795_CLK_S3D2),
@@ -32,6 +30,3 @@
  	DEF_MOD("gpio7",		 905,	R8A7795_CLK_CP),
  	DEF_MOD("gpio6",		 906,	R8A7795_CLK_CP),
  	DEF_MOD("gpio5",		 907,	R8A7795_CLK_CP),
--- 
-2.13.3
-
diff --git a/patches.renesas/0151-clk-renesas-r8a7796-Add-IMR-clocks.patch b/patches.renesas/0151-clk-renesas-r8a7796-Add-IMR-clocks.patch
index 7db0e0d..6686f84 100644
--- a/patches.renesas/0151-clk-renesas-r8a7796-Add-IMR-clocks.patch
+++ b/patches.renesas/0151-clk-renesas-r8a7796-Add-IMR-clocks.patch
@@ -12,14 +12,12 @@
 (cherry picked from commit 6c8a9312946374947287ac1bd3b94aba850a5d1f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 ++
+ drivers/clk/renesas/r8a7796-cpg-mssr.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
-index 11e084a56b0d..12a23c18bc1e 100644
 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
-@@ -179,6 +179,8 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {
+@@ -179,6 +179,8 @@ static const struct mssr_mod_clk r8a7796
  	DEF_MOD("vin1",			 810,	R8A7796_CLK_S0D2),
  	DEF_MOD("vin0",			 811,	R8A7796_CLK_S0D2),
  	DEF_MOD("etheravb",		 812,	R8A7796_CLK_S0D6),
@@ -28,6 +26,3 @@
  	DEF_MOD("gpio7",		 905,	R8A7796_CLK_S3D4),
  	DEF_MOD("gpio6",		 906,	R8A7796_CLK_S3D4),
  	DEF_MOD("gpio5",		 907,	R8A7796_CLK_S3D4),
--- 
-2.13.3
-
diff --git a/patches.renesas/0152-clk-renesas-r8a7795-Correct-parent-clock-and-sort-or.patch b/patches.renesas/0152-clk-renesas-r8a7795-Correct-parent-clock-and-sort-or.patch
index 4012d85..429b7a3 100644
--- a/patches.renesas/0152-clk-renesas-r8a7795-Correct-parent-clock-and-sort-or.patch
+++ b/patches.renesas/0152-clk-renesas-r8a7795-Correct-parent-clock-and-sort-or.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit a843ed3f6c3e856f9091b042c6b4ed34c02a3187)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7795-cpg-mssr.c | 4 ++--
+ drivers/clk/renesas/r8a7795-cpg-mssr.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-index 2add8218e0f7..cde470ce81e4 100644
 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-@@ -142,8 +142,8 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
+@@ -142,8 +142,8 @@ static const struct mssr_mod_clk r8a7795
  	DEF_MOD("rwdt0",		 402,	R8A7795_CLK_R),
  	DEF_MOD("intc-ex",		 407,	R8A7795_CLK_CP),
  	DEF_MOD("intc-ap",		 408,	R8A7795_CLK_S3D1),
@@ -31,6 +29,3 @@
  	DEF_MOD("drif7",		 508,	R8A7795_CLK_S3D2),
  	DEF_MOD("drif6",		 509,	R8A7795_CLK_S3D2),
  	DEF_MOD("drif5",		 510,	R8A7795_CLK_S3D2),
--- 
-2.13.3
-
diff --git a/patches.renesas/0153-clk-renesas-r8a7795-Correct-name-of-watchdog-clock.patch b/patches.renesas/0153-clk-renesas-r8a7795-Correct-name-of-watchdog-clock.patch
index 793d1e2..2a9cffd 100644
--- a/patches.renesas/0153-clk-renesas-r8a7795-Correct-name-of-watchdog-clock.patch
+++ b/patches.renesas/0153-clk-renesas-r8a7795-Correct-name-of-watchdog-clock.patch
@@ -9,14 +9,12 @@
 (cherry picked from commit 2122b56d30e4fb25b383f137e83e6b901e5b05ae)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7795-cpg-mssr.c | 2 +-
+ drivers/clk/renesas/r8a7795-cpg-mssr.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-index cde470ce81e4..4e176e7f958b 100644
 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-@@ -139,7 +139,7 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
+@@ -139,7 +139,7 @@ static const struct mssr_mod_clk r8a7795
  	DEF_MOD("usb3-if0",		 328,	R8A7795_CLK_S3D1),
  	DEF_MOD("usb-dmac0",		 330,	R8A7795_CLK_S3D1),
  	DEF_MOD("usb-dmac1",		 331,	R8A7795_CLK_S3D1),
@@ -25,6 +23,3 @@
  	DEF_MOD("intc-ex",		 407,	R8A7795_CLK_CP),
  	DEF_MOD("intc-ap",		 408,	R8A7795_CLK_S3D1),
  	DEF_MOD("audmac1",		 501,	R8A7795_CLK_S3D1),
--- 
-2.13.3
-
diff --git a/patches.renesas/0154-clk-renesas-r8a7796-Correct-name-of-watchdog-clock.patch b/patches.renesas/0154-clk-renesas-r8a7796-Correct-name-of-watchdog-clock.patch
index 7853df1..d479d02 100644
--- a/patches.renesas/0154-clk-renesas-r8a7796-Correct-name-of-watchdog-clock.patch
+++ b/patches.renesas/0154-clk-renesas-r8a7796-Correct-name-of-watchdog-clock.patch
@@ -9,14 +9,12 @@
 (cherry picked from commit 89aa58a3951bcf242c7755075a7429d0ed6640de)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 +-
+ drivers/clk/renesas/r8a7796-cpg-mssr.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
-index 12a23c18bc1e..55003194a256 100644
 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
-@@ -135,7 +135,7 @@ static const struct mssr_mod_clk r8a7796_mod_clks[] __initconst = {
+@@ -135,7 +135,7 @@ static const struct mssr_mod_clk r8a7796
  	DEF_MOD("sdif2",		 312,	R8A7796_CLK_SD2),
  	DEF_MOD("sdif1",		 313,	R8A7796_CLK_SD1),
  	DEF_MOD("sdif0",		 314,	R8A7796_CLK_SD0),
@@ -25,6 +23,3 @@
  	DEF_MOD("intc-ap",		 408,	R8A7796_CLK_S3D1),
  	DEF_MOD("drif7",		 508,	R8A7796_CLK_S3D2),
  	DEF_MOD("drif6",		 509,	R8A7796_CLK_S3D2),
--- 
-2.13.3
-
diff --git a/patches.renesas/0155-clk-renesas-r8a7795-Reformat-core-clock-table.patch b/patches.renesas/0155-clk-renesas-r8a7795-Reformat-core-clock-table.patch
index e91fcf0..e3c12e5 100644
--- a/patches.renesas/0155-clk-renesas-r8a7795-Reformat-core-clock-table.patch
+++ b/patches.renesas/0155-clk-renesas-r8a7795-Reformat-core-clock-table.patch
@@ -10,11 +10,9 @@
 (cherry picked from commit 3c969cec16176e98f9d8c976c163d2bb519c7c87)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7795-cpg-mssr.c | 20 ++++++++++----------
+ drivers/clk/renesas/r8a7795-cpg-mssr.c |   20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-index 4e176e7f958b..608178618da8 100644
 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
 @@ -53,8 +53,8 @@ enum clk_ids {
@@ -28,7 +26,7 @@
  
  	/* Internal Core Clocks */
  	DEF_BASE(".main",       CLK_MAIN, CLK_TYPE_GEN3_MAIN, CLK_EXTAL),
-@@ -89,23 +89,23 @@ static const struct cpg_core_clk r8a7795_core_clks[] __initconst = {
+@@ -89,23 +89,23 @@ static const struct cpg_core_clk r8a7795
  	DEF_FIXED("s3d2",       R8A7795_CLK_S3D2,  CLK_S3,         2, 1),
  	DEF_FIXED("s3d4",       R8A7795_CLK_S3D4,  CLK_S3,         4, 1),
  
@@ -60,6 +58,3 @@
  };
  
  static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
--- 
-2.13.3
-
diff --git a/patches.renesas/0156-clk-renesas-r8a7796-Reformat-core-clock-table.patch b/patches.renesas/0156-clk-renesas-r8a7796-Reformat-core-clock-table.patch
index 55540b6..8960680 100644
--- a/patches.renesas/0156-clk-renesas-r8a7796-Reformat-core-clock-table.patch
+++ b/patches.renesas/0156-clk-renesas-r8a7796-Reformat-core-clock-table.patch
@@ -10,11 +10,9 @@
 (cherry picked from commit c013fc7d23ca5b29f0cdc37d58b2466ead4fd5f6)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7796-cpg-mssr.c | 12 ++++++------
+ drivers/clk/renesas/r8a7796-cpg-mssr.c |   12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
-index 55003194a256..f7787101b8d0 100644
 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
 @@ -54,8 +54,8 @@ enum clk_ids {
@@ -28,7 +26,7 @@
  
  	/* Internal Core Clocks */
  	DEF_BASE(".main",       CLK_MAIN, CLK_TYPE_GEN3_MAIN, CLK_EXTAL),
-@@ -95,10 +95,10 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {
+@@ -95,10 +95,10 @@ static const struct cpg_core_clk r8a7796
  	DEF_FIXED("s3d2",       R8A7796_CLK_S3D2,  CLK_S3,         2, 1),
  	DEF_FIXED("s3d4",       R8A7796_CLK_S3D4,  CLK_S3,         4, 1),
  
@@ -43,6 +41,3 @@
  
  	DEF_FIXED("cl",         R8A7796_CLK_CL,    CLK_PLL1_DIV2, 48, 1),
  	DEF_FIXED("cp",         R8A7796_CLK_CP,    CLK_EXTAL,      2, 1),
--- 
-2.13.3
-
diff --git a/patches.renesas/0157-clk-renesas-rcar-gen3-cpg-Pass-mode-pins-to-rcar_gen.patch b/patches.renesas/0157-clk-renesas-rcar-gen3-cpg-Pass-mode-pins-to-rcar_gen.patch
index 813a0cb..b0a6189 100644
--- a/patches.renesas/0157-clk-renesas-rcar-gen3-cpg-Pass-mode-pins-to-rcar_gen.patch
+++ b/patches.renesas/0157-clk-renesas-rcar-gen3-cpg-Pass-mode-pins-to-rcar_gen.patch
@@ -12,17 +12,15 @@
 (cherry picked from commit 5f3a432a44b135db002d22446827cfa061fc0bfb)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7795-cpg-mssr.c | 2 +-
- drivers/clk/renesas/r8a7796-cpg-mssr.c | 2 +-
- drivers/clk/renesas/rcar-gen3-cpg.c    | 4 +++-
- drivers/clk/renesas/rcar-gen3-cpg.h    | 2 +-
+ drivers/clk/renesas/r8a7795-cpg-mssr.c |    2 +-
+ drivers/clk/renesas/r8a7796-cpg-mssr.c |    2 +-
+ drivers/clk/renesas/rcar-gen3-cpg.c    |    4 +++-
+ drivers/clk/renesas/rcar-gen3-cpg.h    |    2 +-
  4 files changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-index 608178618da8..4699f416e275 100644
 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-@@ -330,7 +330,7 @@ static int __init r8a7795_cpg_mssr_init(struct device *dev)
+@@ -330,7 +330,7 @@ static int __init r8a7795_cpg_mssr_init(
  		return -EINVAL;
  	}
  
@@ -31,11 +29,9 @@
  }
  
  const struct cpg_mssr_info r8a7795_cpg_mssr_info __initconst = {
-diff --git a/drivers/clk/renesas/r8a7796-cpg-mssr.c b/drivers/clk/renesas/r8a7796-cpg-mssr.c
-index f7787101b8d0..9d114b31b073 100644
 --- a/drivers/clk/renesas/r8a7796-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7796-cpg-mssr.c
-@@ -273,7 +273,7 @@ static int __init r8a7796_cpg_mssr_init(struct device *dev)
+@@ -273,7 +273,7 @@ static int __init r8a7796_cpg_mssr_init(
  		return -EINVAL;
  	}
  
@@ -44,11 +40,9 @@
  }
  
  const struct cpg_mssr_info r8a7796_cpg_mssr_info __initconst = {
-diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c
-index 742f6dc7c156..d395bb8c22f5 100644
 --- a/drivers/clk/renesas/rcar-gen3-cpg.c
 +++ b/drivers/clk/renesas/rcar-gen3-cpg.c
-@@ -247,6 +247,7 @@ static struct clk * __init cpg_sd_clk_register(const struct cpg_core_clk *core,
+@@ -247,6 +247,7 @@ static struct clk * __init cpg_sd_clk_re
  
  static const struct rcar_gen3_cpg_pll_config *cpg_pll_config __initdata;
  static unsigned int cpg_clk_extalr __initdata;
@@ -56,7 +50,7 @@
  
  struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
  	const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
-@@ -334,9 +335,10 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
+@@ -334,9 +335,10 @@ struct clk * __init rcar_gen3_cpg_clk_re
  }
  
  int __init rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,
@@ -68,11 +62,9 @@
 +	cpg_mode = mode;
  	return 0;
  }
-diff --git a/drivers/clk/renesas/rcar-gen3-cpg.h b/drivers/clk/renesas/rcar-gen3-cpg.h
-index f788f481dd42..073be54b5d03 100644
 --- a/drivers/clk/renesas/rcar-gen3-cpg.h
 +++ b/drivers/clk/renesas/rcar-gen3-cpg.h
-@@ -37,6 +37,6 @@ struct clk *rcar_gen3_cpg_clk_register(struct device *dev,
+@@ -37,6 +37,6 @@ struct clk *rcar_gen3_cpg_clk_register(s
  	const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
  	struct clk **clks, void __iomem *base);
  int rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,
@@ -80,6 +72,3 @@
 +		       unsigned int clk_extalr, u32 mode);
  
  #endif
--- 
-2.13.3
-
diff --git a/patches.renesas/0158-clk-renesas-rcar-gen3-Add-workaround-for-PLL0-2-4-er.patch b/patches.renesas/0158-clk-renesas-rcar-gen3-Add-workaround-for-PLL0-2-4-er.patch
index 33a0090..97dd697 100644
--- a/patches.renesas/0158-clk-renesas-rcar-gen3-Add-workaround-for-PLL0-2-4-er.patch
+++ b/patches.renesas/0158-clk-renesas-rcar-gen3-Add-workaround-for-PLL0-2-4-er.patch
@@ -14,11 +14,9 @@
 (cherry picked from commit cecbe87d73006cb321dec79b349e3fefd1a80962)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/rcar-gen3-cpg.c | 24 ++++++++++++++++++++++++
+ drivers/clk/renesas/rcar-gen3-cpg.c |   24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
-diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c
-index d395bb8c22f5..e5247e3dc897 100644
 --- a/drivers/clk/renesas/rcar-gen3-cpg.c
 +++ b/drivers/clk/renesas/rcar-gen3-cpg.c
 @@ -20,6 +20,7 @@
@@ -29,7 +27,7 @@
  
  #include "renesas-cpg-mssr.h"
  #include "rcar-gen3-cpg.h"
-@@ -248,6 +249,17 @@ static struct clk * __init cpg_sd_clk_register(const struct cpg_core_clk *core,
+@@ -248,6 +249,17 @@ static struct clk * __init cpg_sd_clk_re
  static const struct rcar_gen3_cpg_pll_config *cpg_pll_config __initdata;
  static unsigned int cpg_clk_extalr __initdata;
  static u32 cpg_mode __initdata;
@@ -47,7 +45,7 @@
  
  struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
  	const struct cpg_core_clk *core, const struct cpg_mssr_info *info,
-@@ -276,6 +288,8 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
+@@ -276,6 +288,8 @@ struct clk * __init rcar_gen3_cpg_clk_re
  		 */
  		value = readl(base + CPG_PLL0CR);
  		mult = (((value >> 24) & 0x7f) + 1) * 2;
@@ -56,7 +54,7 @@
  		break;
  
  	case CLK_TYPE_GEN3_PLL1:
-@@ -291,6 +305,8 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
+@@ -291,6 +305,8 @@ struct clk * __init rcar_gen3_cpg_clk_re
  		 */
  		value = readl(base + CPG_PLL2CR);
  		mult = (((value >> 24) & 0x7f) + 1) * 2;
@@ -65,7 +63,7 @@
  		break;
  
  	case CLK_TYPE_GEN3_PLL3:
-@@ -306,6 +322,8 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
+@@ -306,6 +322,8 @@ struct clk * __init rcar_gen3_cpg_clk_re
  		 */
  		value = readl(base + CPG_PLL4CR);
  		mult = (((value >> 24) & 0x7f) + 1) * 2;
@@ -74,7 +72,7 @@
  		break;
  
  	case CLK_TYPE_GEN3_SD:
-@@ -337,8 +355,14 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
+@@ -337,8 +355,14 @@ struct clk * __init rcar_gen3_cpg_clk_re
  int __init rcar_gen3_cpg_init(const struct rcar_gen3_cpg_pll_config *config,
  			      unsigned int clk_extalr, u32 mode)
  {
@@ -89,6 +87,3 @@
 +	pr_debug("%s: mode = 0x%x quirks = 0x%x\n", __func__, mode, cpg_quirks);
  	return 0;
  }
--- 
-2.13.3
-
diff --git a/patches.renesas/0159-clk-renesas-cpg-mssr-Add-support-for-fixing-up-clock.patch b/patches.renesas/0159-clk-renesas-cpg-mssr-Add-support-for-fixing-up-clock.patch
index 6d79b68..5c9cb89 100644
--- a/patches.renesas/0159-clk-renesas-cpg-mssr-Add-support-for-fixing-up-clock.patch
+++ b/patches.renesas/0159-clk-renesas-cpg-mssr-Add-support-for-fixing-up-clock.patch
@@ -21,15 +21,13 @@
 (cherry picked from commit 48d0341e41870bcfc42206d38e00a6b1c2fea929)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/renesas-cpg-mssr.c | 50 ++++++++++++++++++++++++++++++++++
- drivers/clk/renesas/renesas-cpg-mssr.h | 22 +++++++++++++++
+ drivers/clk/renesas/renesas-cpg-mssr.c |   50 +++++++++++++++++++++++++++++++++
+ drivers/clk/renesas/renesas-cpg-mssr.h |   22 ++++++++++++++
  2 files changed, 72 insertions(+)
 
-diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c
-index eadcbd43ff88..99eeec6f24ec 100644
 --- a/drivers/clk/renesas/renesas-cpg-mssr.c
 +++ b/drivers/clk/renesas/renesas-cpg-mssr.c
-@@ -265,6 +265,11 @@ static void __init cpg_mssr_register_core_clk(const struct cpg_core_clk *core,
+@@ -265,6 +265,11 @@ static void __init cpg_mssr_register_cor
  	WARN_DEBUG(id >= priv->num_core_clks);
  	WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT);
  
@@ -41,7 +39,7 @@
  	switch (core->type) {
  	case CLK_TYPE_IN:
  		clk = of_clk_get_by_name(priv->dev->of_node, core->name);
-@@ -335,6 +340,11 @@ static void __init cpg_mssr_register_mod_clk(const struct mssr_mod_clk *mod,
+@@ -335,6 +340,11 @@ static void __init cpg_mssr_register_mod
  	WARN_DEBUG(mod->parent >= priv->num_core_clks + priv->num_mod_clks);
  	WARN_DEBUG(PTR_ERR(priv->clks[id]) != -ENOENT);
  
@@ -99,11 +97,9 @@
 +
  MODULE_DESCRIPTION("Renesas CPG/MSSR Driver");
  MODULE_LICENSE("GPL v2");
-diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h
-index 4bb7a80c6469..148f4f0aa2a4 100644
 --- a/drivers/clk/renesas/renesas-cpg-mssr.h
 +++ b/drivers/clk/renesas/renesas-cpg-mssr.h
-@@ -134,4 +134,26 @@ extern const struct cpg_mssr_info r8a7743_cpg_mssr_info;
+@@ -134,4 +134,26 @@ extern const struct cpg_mssr_info r8a774
  extern const struct cpg_mssr_info r8a7745_cpg_mssr_info;
  extern const struct cpg_mssr_info r8a7795_cpg_mssr_info;
  extern const struct cpg_mssr_info r8a7796_cpg_mssr_info;
@@ -130,6 +126,3 @@
 +			      const struct mssr_mod_reparent *clks,
 +			      unsigned int n);
  #endif
--- 
-2.13.3
-
diff --git a/patches.renesas/0160-clk-renesas-r8a7795-Add-support-for-R-Car-H3-ES2.0.patch b/patches.renesas/0160-clk-renesas-r8a7795-Add-support-for-R-Car-H3-ES2.0.patch
index c80011e..2e79708 100644
--- a/patches.renesas/0160-clk-renesas-r8a7795-Add-support-for-R-Car-H3-ES2.0.patch
+++ b/patches.renesas/0160-clk-renesas-r8a7795-Add-support-for-R-Car-H3-ES2.0.patch
@@ -34,11 +34,9 @@
 (cherry picked from commit 5573d194128b47334e3edb2db87cb471449d445a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/r8a7795-cpg-mssr.c | 201 +++++++++++++++++++++++++--------
+ drivers/clk/renesas/r8a7795-cpg-mssr.c |  201 ++++++++++++++++++++++++---------
  1 file changed, 151 insertions(+), 50 deletions(-)
 
-diff --git a/drivers/clk/renesas/r8a7795-cpg-mssr.c b/drivers/clk/renesas/r8a7795-cpg-mssr.c
-index 4699f416e275..eaa98b488f01 100644
 --- a/drivers/clk/renesas/r8a7795-cpg-mssr.c
 +++ b/drivers/clk/renesas/r8a7795-cpg-mssr.c
 @@ -16,6 +16,7 @@
@@ -67,7 +65,7 @@
  	/* External Clock Inputs */
  	DEF_INPUT("extal",      CLK_EXTAL),
  	DEF_INPUT("extalr",     CLK_EXTALR),
-@@ -78,7 +79,12 @@ static const struct cpg_core_clk r8a7795_core_clks[] __initconst = {
+@@ -78,7 +79,12 @@ static const struct cpg_core_clk r8a7795
  	DEF_FIXED("zt",         R8A7795_CLK_ZT,    CLK_PLL1_DIV2,  4, 1),
  	DEF_FIXED("zx",         R8A7795_CLK_ZX,    CLK_PLL1_DIV2,  2, 1),
  	DEF_FIXED("s0d1",       R8A7795_CLK_S0D1,  CLK_S0,         1, 1),
@@ -80,7 +78,7 @@
  	DEF_FIXED("s1d1",       R8A7795_CLK_S1D1,  CLK_S1,         1, 1),
  	DEF_FIXED("s1d2",       R8A7795_CLK_S1D2,  CLK_S1,         2, 1),
  	DEF_FIXED("s1d4",       R8A7795_CLK_S1D4,  CLK_S1,         4, 1),
-@@ -108,10 +114,10 @@ static const struct cpg_core_clk r8a7795_core_clks[] __initconst = {
+@@ -108,10 +114,10 @@ static const struct cpg_core_clk r8a7795
  	DEF_BASE("r",           R8A7795_CLK_R,     CLK_TYPE_GEN3_R, CLK_RINT),
  };
  
@@ -95,7 +93,7 @@
  	DEF_MOD("scif5",		 202,	R8A7795_CLK_S3D4),
  	DEF_MOD("scif4",		 203,	R8A7795_CLK_S3D4),
  	DEF_MOD("scif3",		 204,	R8A7795_CLK_S3D4),
-@@ -121,9 +127,9 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
+@@ -121,9 +127,9 @@ static const struct mssr_mod_clk r8a7795
  	DEF_MOD("msiof2",		 209,	R8A7795_CLK_MSO),
  	DEF_MOD("msiof1",		 210,	R8A7795_CLK_MSO),
  	DEF_MOD("msiof0",		 211,	R8A7795_CLK_MSO),
@@ -108,7 +106,7 @@
  	DEF_MOD("cmt3",			 300,	R8A7795_CLK_R),
  	DEF_MOD("cmt2",			 301,	R8A7795_CLK_R),
  	DEF_MOD("cmt1",			 302,	R8A7795_CLK_R),
-@@ -135,15 +141,15 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
+@@ -135,15 +141,15 @@ static const struct mssr_mod_clk r8a7795
  	DEF_MOD("sdif0",		 314,	R8A7795_CLK_SD0),
  	DEF_MOD("pcie1",		 318,	R8A7795_CLK_S3D1),
  	DEF_MOD("pcie0",		 319,	R8A7795_CLK_S3D1),
@@ -127,7 +125,7 @@
  	DEF_MOD("drif7",		 508,	R8A7795_CLK_S3D2),
  	DEF_MOD("drif6",		 509,	R8A7795_CLK_S3D2),
  	DEF_MOD("drif5",		 510,	R8A7795_CLK_S3D2),
-@@ -159,35 +165,35 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
+@@ -159,35 +165,35 @@ static const struct mssr_mod_clk r8a7795
  	DEF_MOD("hscif0",		 520,	R8A7795_CLK_S3D1),
  	DEF_MOD("thermal",		 522,	R8A7795_CLK_CP),
  	DEF_MOD("pwm",			 523,	R8A7795_CLK_S3D4),
@@ -188,7 +186,7 @@
  	DEF_MOD("csi20",		 714,	R8A7795_CLK_CSI0),
  	DEF_MOD("csi41",		 715,	R8A7795_CLK_CSI0),
  	DEF_MOD("csi40",		 716,	R8A7795_CLK_CSI0),
-@@ -198,20 +204,20 @@ static const struct mssr_mod_clk r8a7795_mod_clks[] __initconst = {
+@@ -198,20 +204,20 @@ static const struct mssr_mod_clk r8a7795
  	DEF_MOD("lvds",			 727,	R8A7795_CLK_S0D4),
  	DEF_MOD("hdmi1",		 728,	R8A7795_CLK_HDMI),
  	DEF_MOD("hdmi0",		 729,	R8A7795_CLK_HDMI),
@@ -222,7 +220,7 @@
  	DEF_MOD("gpio7",		 905,	R8A7795_CLK_CP),
  	DEF_MOD("gpio6",		 906,	R8A7795_CLK_CP),
  	DEF_MOD("gpio5",		 907,	R8A7795_CLK_CP),
-@@ -314,6 +320,82 @@ static const struct rcar_gen3_cpg_pll_config cpg_pll_configs[16] __initconst = {
+@@ -314,6 +320,82 @@ static const struct rcar_gen3_cpg_pll_co
  	{ 2,		192,		192,	},
  };
  
@@ -305,7 +303,7 @@
  static int __init r8a7795_cpg_mssr_init(struct device *dev)
  {
  	const struct rcar_gen3_cpg_pll_config *cpg_pll_config;
-@@ -330,6 +412,25 @@ static int __init r8a7795_cpg_mssr_init(struct device *dev)
+@@ -330,6 +412,25 @@ static int __init r8a7795_cpg_mssr_init(
  		return -EINVAL;
  	}
  
@@ -331,6 +329,3 @@
  	return rcar_gen3_cpg_init(cpg_pll_config, CLK_EXTALR, cpg_mode);
  }
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0161-clk-renesas-rcar-gen3-cpg-Add-support-for-RCLK-on-R-.patch b/patches.renesas/0161-clk-renesas-rcar-gen3-cpg-Add-support-for-RCLK-on-R-.patch
index c5083f7..da70a3f 100644
--- a/patches.renesas/0161-clk-renesas-rcar-gen3-cpg-Add-support-for-RCLK-on-R-.patch
+++ b/patches.renesas/0161-clk-renesas-rcar-gen3-cpg-Add-support-for-RCLK-on-R-.patch
@@ -16,11 +16,9 @@
 (cherry picked from commit bb1953067c05be30a605ee1d5b05a2677735bb37)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/clk/renesas/rcar-gen3-cpg.c | 38 ++++++++++++++++++++++++++-----------
- 1 file changed, 27 insertions(+), 11 deletions(-)
+ drivers/clk/renesas/rcar-gen3-cpg.c |   36 ++++++++++++++++++++++++++----------
+ 1 file changed, 26 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/clk/renesas/rcar-gen3-cpg.c b/drivers/clk/renesas/rcar-gen3-cpg.c
-index e5247e3dc897..3dee900522b7 100644
 --- a/drivers/clk/renesas/rcar-gen3-cpg.c
 +++ b/drivers/clk/renesas/rcar-gen3-cpg.c
 @@ -252,11 +252,20 @@ static u32 cpg_mode __initdata;
@@ -45,7 +43,7 @@
  	},
  	{ /* sentinel */ }
  };
-@@ -330,18 +339,25 @@ struct clk * __init rcar_gen3_cpg_clk_register(struct device *dev,
+@@ -330,18 +339,25 @@ struct clk * __init rcar_gen3_cpg_clk_re
  		return cpg_sd_clk_register(core, base, __clk_get_name(parent));
  
  	case CLK_TYPE_GEN3_R:
@@ -54,10 +52,6 @@
 -		 * Only if EXTALR is populated, we switch to it.
 -		 */
 -		value = readl(base + CPG_RCKCR) & 0x3f;
--
--		if (clk_get_rate(clks[cpg_clk_extalr])) {
--			parent = clks[cpg_clk_extalr];
--			value |= BIT(15);
 +		if (cpg_quirks & RCKCR_CKSEL) {
 +			/*
 +			 * RINT is default.
@@ -69,7 +63,10 @@
 +				parent = clks[cpg_clk_extalr];
 +				value |= BIT(15);
 +			}
-+
+ 
+-		if (clk_get_rate(clks[cpg_clk_extalr])) {
+-			parent = clks[cpg_clk_extalr];
+-			value |= BIT(15);
 +			writel(value, base + CPG_RCKCR);
 +			break;
  		}
@@ -81,6 +78,3 @@
  		break;
  
  	default:
--- 
-2.13.3
-
diff --git a/patches.renesas/0162-pinctrl-sh-pfc-r8a7795-Fix-hscif2_clk_b-and-hscif4_c.patch b/patches.renesas/0162-pinctrl-sh-pfc-r8a7795-Fix-hscif2_clk_b-and-hscif4_c.patch
deleted file mode 100644
index 5b56886..0000000
--- a/patches.renesas/0162-pinctrl-sh-pfc-r8a7795-Fix-hscif2_clk_b-and-hscif4_c.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f448442eccb681d866c97c37d5e1b1b7dfe3a35d Mon Sep 17 00:00:00 2001
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-Date: Sat, 11 Mar 2017 12:26:09 +0100
-Subject: [PATCH 162/286] pinctrl: sh-pfc: r8a7795: Fix hscif2_clk_b and
- hscif4_ctrl
-
-Fix typos in hscif2_clk_b_mux[] and hscif4_ctrl_mux[].
-
-Fixes: a56069c46c102710 ("pinctrl: sh-pfc: r8a7795: Add HSCIF pins, groups, and functions")
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-(cherry picked from commit 4324b6084f45b9faebda8d6563d8625d22b4b5df)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-index 504d0c3d7f74..6ba7ed15a461 100644
---- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-@@ -2167,7 +2167,7 @@ static const unsigned int hscif2_clk_b_pins[] = {
- 	RCAR_GP_PIN(6, 21),
- };
- static const unsigned int hscif2_clk_b_mux[] = {
--	HSCK1_B_MARK,
-+	HSCK2_B_MARK,
- };
- static const unsigned int hscif2_ctrl_b_pins[] = {
- 	/* RTS, CTS */
-@@ -2240,7 +2240,7 @@ static const unsigned int hscif4_ctrl_pins[] = {
- 	RCAR_GP_PIN(1, 15), RCAR_GP_PIN(1, 14),
- };
- static const unsigned int hscif4_ctrl_mux[] = {
--	HRTS4_N_MARK, HCTS3_N_MARK,
-+	HRTS4_N_MARK, HCTS4_N_MARK,
- };
- 
- static const unsigned int hscif4_data_b_pins[] = {
--- 
-2.13.3
-
diff --git a/patches.renesas/0163-pinctrl-sh-pfc-r8a7795-Restore-sort-order.patch b/patches.renesas/0163-pinctrl-sh-pfc-r8a7795-Restore-sort-order.patch
index 7f6b226..ee0fc00 100644
--- a/patches.renesas/0163-pinctrl-sh-pfc-r8a7795-Restore-sort-order.patch
+++ b/patches.renesas/0163-pinctrl-sh-pfc-r8a7795-Restore-sort-order.patch
@@ -10,14 +10,12 @@
 (cherry picked from commit b332da51a929de9081058b17d108008cd6a0d15f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 171 ++++++++++++++++++-----------------
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c |  171 +++++++++++++++++------------------
  1 file changed, 86 insertions(+), 85 deletions(-)
 
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-index 6ba7ed15a461..3d1c32cca16a 100644
 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
 +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-@@ -3101,6 +3101,55 @@ static const unsigned int pwm6_b_mux[] = {
+@@ -3101,6 +3101,55 @@ static const unsigned int pwm6_b_mux[] =
  	PWM6_B_MARK,
  };
  
@@ -73,7 +71,7 @@
  /* - SATA --------------------------------------------------------------------*/
  static const unsigned int sata0_devslp_a_pins[] = {
  	/* DEVSLP */
-@@ -3299,6 +3348,23 @@ static const unsigned int scif5_clk_pins[] = {
+@@ -3299,6 +3348,23 @@ static const unsigned int scif5_clk_pins
  static const unsigned int scif5_clk_mux[] = {
  	SCK5_MARK,
  };
@@ -97,7 +95,7 @@
  /* - SDHI0 ------------------------------------------------------------------ */
  static const unsigned int sdhi0_data1_pins[] = {
  	/* D0 */
-@@ -3506,22 +3572,6 @@ static const unsigned int sdhi3_ds_mux[] = {
+@@ -3506,22 +3572,6 @@ static const unsigned int sdhi3_ds_mux[]
  	SD3_DS_MARK,
  };
  
@@ -176,7 +174,7 @@
  static const struct sh_pfc_pin_group pinmux_groups[] = {
  	SH_PFC_PIN_GROUP(audio_clk_a_a),
  	SH_PFC_PIN_GROUP(audio_clk_a_b),
-@@ -3990,6 +3991,12 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
+@@ -3990,6 +3991,12 @@ static const struct sh_pfc_pin_group pin
  	SH_PFC_PIN_GROUP(pwm5_b),
  	SH_PFC_PIN_GROUP(pwm6_a),
  	SH_PFC_PIN_GROUP(pwm6_b),
@@ -189,7 +187,7 @@
  	SH_PFC_PIN_GROUP(sata0_devslp_a),
  	SH_PFC_PIN_GROUP(sata0_devslp_b),
  	SH_PFC_PIN_GROUP(scif0_data),
-@@ -4073,12 +4080,6 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
+@@ -4073,12 +4080,6 @@ static const struct sh_pfc_pin_group pin
  	SH_PFC_PIN_GROUP(usb0),
  	SH_PFC_PIN_GROUP(usb1),
  	SH_PFC_PIN_GROUP(usb2),
@@ -202,7 +200,7 @@
  };
  
  static const char * const audio_clk_groups[] = {
-@@ -4393,6 +4394,18 @@ static const char * const pwm6_groups[] = {
+@@ -4393,6 +4394,18 @@ static const char * const pwm6_groups[]
  	"pwm6_b",
  };
  
@@ -221,7 +219,7 @@
  static const char * const sata0_groups[] = {
  	"sata0_devslp_a",
  	"sata0_devslp_b",
-@@ -4524,18 +4537,6 @@ static const char * const usb2_groups[] = {
+@@ -4524,18 +4537,6 @@ static const char * const usb2_groups[]
  	"usb2",
  };
  
@@ -240,7 +238,7 @@
  static const struct sh_pfc_function pinmux_functions[] = {
  	SH_PFC_FUNCTION(audio_clk),
  	SH_PFC_FUNCTION(avb),
-@@ -4569,6 +4570,8 @@ static const struct sh_pfc_function pinmux_functions[] = {
+@@ -4569,6 +4570,8 @@ static const struct sh_pfc_function pinm
  	SH_PFC_FUNCTION(pwm4),
  	SH_PFC_FUNCTION(pwm5),
  	SH_PFC_FUNCTION(pwm6),
@@ -249,7 +247,7 @@
  	SH_PFC_FUNCTION(sata0),
  	SH_PFC_FUNCTION(scif0),
  	SH_PFC_FUNCTION(scif1),
-@@ -4585,8 +4588,6 @@ static const struct sh_pfc_function pinmux_functions[] = {
+@@ -4585,8 +4588,6 @@ static const struct sh_pfc_function pinm
  	SH_PFC_FUNCTION(usb0),
  	SH_PFC_FUNCTION(usb1),
  	SH_PFC_FUNCTION(usb2),
@@ -258,6 +256,3 @@
  };
  
  static const struct pinmux_cfg_reg pinmux_config_regs[] = {
--- 
-2.13.3
-
diff --git a/patches.renesas/0164-pinctrl-sh-pfc-Update-info-pointer-after-SoC-specifi.patch b/patches.renesas/0164-pinctrl-sh-pfc-Update-info-pointer-after-SoC-specifi.patch
deleted file mode 100644
index 20ade9f..0000000
--- a/patches.renesas/0164-pinctrl-sh-pfc-Update-info-pointer-after-SoC-specifi.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 71cf9371dde08af8cdf7edea3cf25061e1787891 Mon Sep 17 00:00:00 2001
-From: Geert Uytterhoeven <geert+renesas@glider.be>
-Date: Thu, 9 Mar 2017 19:20:48 +0100
-Subject: [PATCH 164/286] pinctrl: sh-pfc: Update info pointer after
- SoC-specific init
-
-Update the sh_pfc_soc_info pointer after calling the SoC-specific
-initialization function, as it may have been updated to e.g. handle
-different SoC revisions.  This makes sure the correct subdriver name is
-printed later.
-
-Fixes: 0c151062f32c9db8 ("sh-pfc: Add support for SoC-specific initialization")
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-(cherry picked from commit 3091ae775fae17084013021d01513bc1ad274e6a)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/pinctrl/sh-pfc/core.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
-index cf80ce1dd7ce..4a5a0feb931b 100644
---- a/drivers/pinctrl/sh-pfc/core.c
-+++ b/drivers/pinctrl/sh-pfc/core.c
-@@ -586,6 +586,9 @@ static int sh_pfc_probe(struct platform_device *pdev)
- 		ret = info->ops->init(pfc);
- 		if (ret < 0)
- 			return ret;
-+
-+		/* .init() may have overridden pfc->info */
-+		info = pfc->info;
- 	}
- 
- 	/* Enable dummy states for those platforms without pinctrl support */
--- 
-2.13.3
-
diff --git a/patches.renesas/0165-pinctrl-sh-pfc-r8a7795-Add-support-for-R-Car-H3-ES2..patch b/patches.renesas/0165-pinctrl-sh-pfc-r8a7795-Add-support-for-R-Car-H3-ES2..patch
index 3a6e275..e907141 100644
--- a/patches.renesas/0165-pinctrl-sh-pfc-r8a7795-Add-support-for-R-Car-H3-ES2..patch
+++ b/patches.renesas/0165-pinctrl-sh-pfc-r8a7795-Add-support-for-R-Car-H3-ES2..patch
@@ -34,18 +34,16 @@
 (cherry picked from commit b205914c8f822ef2464b741c64e892823d685ad6)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/pinctrl/sh-pfc/Makefile          |    1 +
- drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 5705 ++++++++++++++++++++++++++++++
- drivers/pinctrl/sh-pfc/pfc-r8a7795.c     | 4780 +++++--------------------
- drivers/pinctrl/sh-pfc/sh_pfc.h          |    1 +
- 4 files changed, 6603 insertions(+), 3884 deletions(-)
+ drivers/pinctrl/sh-pfc/Makefile          |    1 
+ drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 5705 +++++++++++++++++++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c     | 4396 +++--------------------
+ drivers/pinctrl/sh-pfc/sh_pfc.h          |    1 
+ 4 files changed, 6411 insertions(+), 3692 deletions(-)
  create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c
 
-diff --git a/drivers/pinctrl/sh-pfc/Makefile b/drivers/pinctrl/sh-pfc/Makefile
-index 2dda8c63f3cf..8e08684774af 100644
 --- a/drivers/pinctrl/sh-pfc/Makefile
 +++ b/drivers/pinctrl/sh-pfc/Makefile
-@@ -11,6 +11,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7792)	+= pfc-r8a7792.o
+@@ -11,6 +11,7 @@ obj-$(CONFIG_PINCTRL_PFC_R8A7792)	+= pfc
  obj-$(CONFIG_PINCTRL_PFC_R8A7793)	+= pfc-r8a7791.o
  obj-$(CONFIG_PINCTRL_PFC_R8A7794)	+= pfc-r8a7794.o
  obj-$(CONFIG_PINCTRL_PFC_R8A7795)	+= pfc-r8a7795.o
@@ -53,9 +51,6 @@
  obj-$(CONFIG_PINCTRL_PFC_R8A7796)	+= pfc-r8a7796.o
  obj-$(CONFIG_PINCTRL_PFC_SH7203)	+= pfc-sh7203.o
  obj-$(CONFIG_PINCTRL_PFC_SH7264)	+= pfc-sh7264.o
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c
-new file mode 100644
-index 000000000000..081efda9a280
 --- /dev/null
 +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c
 @@ -0,0 +1,5705 @@
@@ -5764,8 +5759,6 @@
 +	.pinmux_data = pinmux_data,
 +	.pinmux_data_size = ARRAY_SIZE(pinmux_data),
 +};
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-index 3d1c32cca16a..6caaed53938c 100644
 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
 +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
 @@ -1,7 +1,7 @@
@@ -6140,7 +6133,7 @@
  
  #define PINMUX_GPSR	\
  \
-@@ -426,37 +437,34 @@ FM(IP12_23_20)	IP12_23_20	FM(IP13_23_20)	IP13_23_20	FM(IP14_23_20)	IP14_23_20	FM
+@@ -426,37 +437,34 @@ FM(IP12_23_20)	IP12_23_20	FM(IP13_23_20)
  FM(IP12_27_24)	IP12_27_24	FM(IP13_27_24)	IP13_27_24	FM(IP14_27_24)	IP14_27_24	FM(IP15_27_24)	IP15_27_24 \
  FM(IP12_31_28)	IP12_31_28	FM(IP13_31_28)	IP13_31_28	FM(IP14_31_28)	IP14_31_28	FM(IP15_31_28)	IP15_31_28 \
  \
@@ -6342,171 +6335,89 @@
  
  	PINMUX_IPSR_GPSR(IP1_19_16,	PWM0),
  	PINMUX_IPSR_GPSR(IP1_19_16,	AVB_AVTP_PPS),
-@@ -902,3692 +916,670 @@ static const u16 pinmux_data[] = {
- 	PINMUX_IPSR_GPSR(IP6_3_0,	VI4_DATA21),
- 	PINMUX_IPSR_GPSR(IP6_3_0,	VI5_DATA5),
+@@ -1009,426 +1023,481 @@ static const u16 pinmux_data[] = {
  
--	PINMUX_IPSR_GPSR(IP6_7_4,	D6),
--	PINMUX_IPSR_MSEL(IP6_7_4,	MSIOF2_RXD_B,		SEL_MSIOF2_1),
--	PINMUX_IPSR_GPSR(IP6_7_4,	VI4_DATA22),
--	PINMUX_IPSR_GPSR(IP6_7_4,	VI5_DATA6),
--
--	PINMUX_IPSR_GPSR(IP6_11_8,	D7),
--	PINMUX_IPSR_MSEL(IP6_11_8,	MSIOF2_TXD_B,		SEL_MSIOF2_1),
--	PINMUX_IPSR_GPSR(IP6_11_8,	VI4_DATA23),
--	PINMUX_IPSR_GPSR(IP6_11_8,	VI5_DATA7),
--
--	PINMUX_IPSR_GPSR(IP6_15_12,	D8),
--	PINMUX_IPSR_GPSR(IP6_15_12,	LCDOUT0),
--	PINMUX_IPSR_MSEL(IP6_15_12,	MSIOF2_SCK_D,		SEL_MSIOF2_3),
--	PINMUX_IPSR_MSEL(IP6_15_12,	SCK4_C,			SEL_SCIF4_2),
--	PINMUX_IPSR_MSEL(IP6_15_12,	VI4_DATA0_A,		SEL_VIN4_0),
--	PINMUX_IPSR_GPSR(IP6_15_12,	DU_DR0),
--
--	PINMUX_IPSR_GPSR(IP6_19_16,	D9),
--	PINMUX_IPSR_GPSR(IP6_19_16,	LCDOUT1),
--	PINMUX_IPSR_MSEL(IP6_19_16,	MSIOF2_SYNC_D,		SEL_MSIOF2_3),
--	PINMUX_IPSR_MSEL(IP6_19_16,	VI4_DATA1_A,		SEL_VIN4_0),
--	PINMUX_IPSR_GPSR(IP6_19_16,	DU_DR1),
--
--	PINMUX_IPSR_GPSR(IP6_23_20,	D10),
--	PINMUX_IPSR_GPSR(IP6_23_20,	LCDOUT2),
--	PINMUX_IPSR_MSEL(IP6_23_20,	MSIOF2_RXD_D,		SEL_MSIOF2_3),
--	PINMUX_IPSR_MSEL(IP6_23_20,	HRX3_B,			SEL_HSCIF3_1),
--	PINMUX_IPSR_MSEL(IP6_23_20,	VI4_DATA2_A,		SEL_VIN4_0),
--	PINMUX_IPSR_MSEL(IP6_23_20,	CTS4_N_C,		SEL_SCIF4_2),
--	PINMUX_IPSR_GPSR(IP6_23_20,	DU_DR2),
--
--	PINMUX_IPSR_GPSR(IP6_27_24,	D11),
--	PINMUX_IPSR_GPSR(IP6_27_24,	LCDOUT3),
--	PINMUX_IPSR_MSEL(IP6_27_24,	MSIOF2_TXD_D,		SEL_MSIOF2_3),
--	PINMUX_IPSR_MSEL(IP6_27_24,	HTX3_B,			SEL_HSCIF3_1),
--	PINMUX_IPSR_MSEL(IP6_27_24,	VI4_DATA3_A,		SEL_VIN4_0),
--	PINMUX_IPSR_MSEL(IP6_27_24,	RTS4_N_TANS_C,		SEL_SCIF4_2),
--	PINMUX_IPSR_GPSR(IP6_27_24,	DU_DR3),
--
--	PINMUX_IPSR_GPSR(IP6_31_28,	D12),
--	PINMUX_IPSR_GPSR(IP6_31_28,	LCDOUT4),
--	PINMUX_IPSR_MSEL(IP6_31_28,	MSIOF2_SS1_D,		SEL_MSIOF2_3),
--	PINMUX_IPSR_MSEL(IP6_31_28,	RX4_C,			SEL_SCIF4_2),
--	PINMUX_IPSR_MSEL(IP6_31_28,	VI4_DATA4_A,		SEL_VIN4_0),
--	PINMUX_IPSR_GPSR(IP6_31_28,	DU_DR4),
--
--	/* IPSR7 */
--	PINMUX_IPSR_GPSR(IP7_3_0,	D13),
--	PINMUX_IPSR_GPSR(IP7_3_0,	LCDOUT5),
--	PINMUX_IPSR_MSEL(IP7_3_0,	MSIOF2_SS2_D,		SEL_MSIOF2_3),
--	PINMUX_IPSR_MSEL(IP7_3_0,	TX4_C,			SEL_SCIF4_2),
--	PINMUX_IPSR_MSEL(IP7_3_0,	VI4_DATA5_A,		SEL_VIN4_0),
--	PINMUX_IPSR_GPSR(IP7_3_0,	DU_DR5),
--
--	PINMUX_IPSR_GPSR(IP7_7_4,	D14),
--	PINMUX_IPSR_GPSR(IP7_7_4,	LCDOUT6),
--	PINMUX_IPSR_MSEL(IP7_7_4,	MSIOF3_SS1_A,		SEL_MSIOF3_0),
--	PINMUX_IPSR_MSEL(IP7_7_4,	HRX3_C,			SEL_HSCIF3_2),
--	PINMUX_IPSR_MSEL(IP7_7_4,	VI4_DATA6_A,		SEL_VIN4_0),
--	PINMUX_IPSR_GPSR(IP7_7_4,	DU_DR6),
--	PINMUX_IPSR_MSEL(IP7_7_4,	SCL6_C,			SEL_I2C6_2),
--
--	PINMUX_IPSR_GPSR(IP7_11_8,	D15),
--	PINMUX_IPSR_GPSR(IP7_11_8,	LCDOUT7),
--	PINMUX_IPSR_MSEL(IP7_11_8,	MSIOF3_SS2_A,		SEL_MSIOF3_0),
--	PINMUX_IPSR_MSEL(IP7_11_8,	HTX3_C,			SEL_HSCIF3_2),
--	PINMUX_IPSR_MSEL(IP7_11_8,	VI4_DATA7_A,		SEL_VIN4_0),
--	PINMUX_IPSR_GPSR(IP7_11_8,	DU_DR7),
--	PINMUX_IPSR_MSEL(IP7_11_8,	SDA6_C,			SEL_I2C6_2),
--
--	PINMUX_IPSR_GPSR(IP7_15_12,	FSCLKST),
--
--	PINMUX_IPSR_GPSR(IP7_19_16,	SD0_CLK),
--	PINMUX_IPSR_MSEL(IP7_19_16,	MSIOF1_SCK_E,		SEL_MSIOF1_4),
--	PINMUX_IPSR_MSEL(IP7_19_16,	STP_OPWM_0_B,		SEL_SSP1_0_1),
--
--	PINMUX_IPSR_GPSR(IP7_23_20,	SD0_CMD),
--	PINMUX_IPSR_MSEL(IP7_23_20,	MSIOF1_SYNC_E,		SEL_MSIOF1_4),
--	PINMUX_IPSR_MSEL(IP7_23_20,	STP_IVCXO27_0_B,	SEL_SSP1_0_1),
--
--	PINMUX_IPSR_GPSR(IP7_27_24,	SD0_DAT0),
--	PINMUX_IPSR_MSEL(IP7_27_24,	MSIOF1_RXD_E,		SEL_MSIOF1_4),
--	PINMUX_IPSR_MSEL(IP7_27_24,	TS_SCK0_B,		SEL_TSIF0_1),
--	PINMUX_IPSR_MSEL(IP7_27_24,	STP_ISCLK_0_B,		SEL_SSP1_0_1),
--
--	PINMUX_IPSR_GPSR(IP7_31_28,	SD0_DAT1),
--	PINMUX_IPSR_MSEL(IP7_31_28,	MSIOF1_TXD_E,		SEL_MSIOF1_4),
--	PINMUX_IPSR_MSEL(IP7_31_28,	TS_SPSYNC0_B,		SEL_TSIF0_1),
--	PINMUX_IPSR_MSEL(IP7_31_28,	STP_ISSYNC_0_B,		SEL_SSP1_0_1),
--
--	/* IPSR8 */
--	PINMUX_IPSR_GPSR(IP8_3_0,	SD0_DAT2),
--	PINMUX_IPSR_MSEL(IP8_3_0,	MSIOF1_SS1_E,		SEL_MSIOF1_4),
--	PINMUX_IPSR_MSEL(IP8_3_0,	TS_SDAT0_B,		SEL_TSIF0_1),
--	PINMUX_IPSR_MSEL(IP8_3_0,	STP_ISD_0_B,		SEL_SSP1_0_1),
--
--	PINMUX_IPSR_GPSR(IP8_7_4,	SD0_DAT3),
--	PINMUX_IPSR_MSEL(IP8_7_4,	MSIOF1_SS2_E,		SEL_MSIOF1_4),
--	PINMUX_IPSR_MSEL(IP8_7_4,	TS_SDEN0_B,		SEL_TSIF0_1),
--	PINMUX_IPSR_MSEL(IP8_7_4,	STP_ISEN_0_B,		SEL_SSP1_0_1),
--
--	PINMUX_IPSR_GPSR(IP8_11_8,	SD1_CLK),
--	PINMUX_IPSR_MSEL(IP8_11_8,	MSIOF1_SCK_G,		SEL_MSIOF1_6),
--	PINMUX_IPSR_MSEL(IP8_11_8,	SIM0_CLK_A,		SEL_SIMCARD_0),
--
--	PINMUX_IPSR_GPSR(IP8_15_12,	SD1_CMD),
--	PINMUX_IPSR_MSEL(IP8_15_12,	MSIOF1_SYNC_G,		SEL_MSIOF1_6),
--	PINMUX_IPSR_MSEL(IP8_15_12,	SIM0_D_A,		SEL_SIMCARD_0),
--	PINMUX_IPSR_MSEL(IP8_15_12,	STP_IVCXO27_1_B,	SEL_SSP1_1_1),
--
--	PINMUX_IPSR_GPSR(IP8_19_16,	SD1_DAT0),
--	PINMUX_IPSR_GPSR(IP8_19_16,	SD2_DAT4),
--	PINMUX_IPSR_MSEL(IP8_19_16,	MSIOF1_RXD_G,		SEL_MSIOF1_6),
--	PINMUX_IPSR_MSEL(IP8_19_16,	TS_SCK1_B,		SEL_TSIF1_1),
--	PINMUX_IPSR_MSEL(IP8_19_16,	STP_ISCLK_1_B,		SEL_SSP1_1_1),
--
--	PINMUX_IPSR_GPSR(IP8_23_20,	SD1_DAT1),
--	PINMUX_IPSR_GPSR(IP8_23_20,	SD2_DAT5),
--	PINMUX_IPSR_MSEL(IP8_23_20,	MSIOF1_TXD_G,		SEL_MSIOF1_6),
--	PINMUX_IPSR_MSEL(IP8_23_20,	TS_SPSYNC1_B,		SEL_TSIF1_1),
--	PINMUX_IPSR_MSEL(IP8_23_20,	STP_ISSYNC_1_B,		SEL_SSP1_1_1),
--
--	PINMUX_IPSR_GPSR(IP8_27_24,	SD1_DAT2),
--	PINMUX_IPSR_GPSR(IP8_27_24,	SD2_DAT6),
--	PINMUX_IPSR_MSEL(IP8_27_24,	MSIOF1_SS1_G,		SEL_MSIOF1_6),
--	PINMUX_IPSR_MSEL(IP8_27_24,	TS_SDAT1_B,		SEL_TSIF1_1),
--	PINMUX_IPSR_MSEL(IP8_27_24,	STP_ISD_1_B,		SEL_SSP1_1_1),
--
--	PINMUX_IPSR_GPSR(IP8_31_28,	SD1_DAT3),
--	PINMUX_IPSR_GPSR(IP8_31_28,	SD2_DAT7),
--	PINMUX_IPSR_MSEL(IP8_31_28,	MSIOF1_SS2_G,		SEL_MSIOF1_6),
--	PINMUX_IPSR_MSEL(IP8_31_28,	TS_SDEN1_B,		SEL_TSIF1_1),
--	PINMUX_IPSR_MSEL(IP8_31_28,	STP_ISEN_1_B,		SEL_SSP1_1_1),
--
--	/* IPSR9 */
--	PINMUX_IPSR_GPSR(IP9_3_0,	SD2_CLK),
--
+ 	PINMUX_IPSR_GPSR(IP8_15_12,	SD1_CMD),
+ 	PINMUX_IPSR_MSEL(IP8_15_12,	MSIOF1_SYNC_G,		SEL_MSIOF1_6),
++	PINMUX_IPSR_MSEL(IP8_15_12,	NFCE_N_B,		SEL_NDF_1),
+ 	PINMUX_IPSR_MSEL(IP8_15_12,	SIM0_D_A,		SEL_SIMCARD_0),
+ 	PINMUX_IPSR_MSEL(IP8_15_12,	STP_IVCXO27_1_B,	SEL_SSP1_1_1),
+ 
+ 	PINMUX_IPSR_GPSR(IP8_19_16,	SD1_DAT0),
+ 	PINMUX_IPSR_GPSR(IP8_19_16,	SD2_DAT4),
+ 	PINMUX_IPSR_MSEL(IP8_19_16,	MSIOF1_RXD_G,		SEL_MSIOF1_6),
++	PINMUX_IPSR_MSEL(IP8_19_16,	NFWP_N_B,		SEL_NDF_1),
+ 	PINMUX_IPSR_MSEL(IP8_19_16,	TS_SCK1_B,		SEL_TSIF1_1),
+ 	PINMUX_IPSR_MSEL(IP8_19_16,	STP_ISCLK_1_B,		SEL_SSP1_1_1),
+ 
+ 	PINMUX_IPSR_GPSR(IP8_23_20,	SD1_DAT1),
+ 	PINMUX_IPSR_GPSR(IP8_23_20,	SD2_DAT5),
+ 	PINMUX_IPSR_MSEL(IP8_23_20,	MSIOF1_TXD_G,		SEL_MSIOF1_6),
++	PINMUX_IPSR_MSEL(IP8_23_20,	NFDATA14_B,		SEL_NDF_1),
+ 	PINMUX_IPSR_MSEL(IP8_23_20,	TS_SPSYNC1_B,		SEL_TSIF1_1),
+ 	PINMUX_IPSR_MSEL(IP8_23_20,	STP_ISSYNC_1_B,		SEL_SSP1_1_1),
+ 
+ 	PINMUX_IPSR_GPSR(IP8_27_24,	SD1_DAT2),
+ 	PINMUX_IPSR_GPSR(IP8_27_24,	SD2_DAT6),
+ 	PINMUX_IPSR_MSEL(IP8_27_24,	MSIOF1_SS1_G,		SEL_MSIOF1_6),
++	PINMUX_IPSR_MSEL(IP8_27_24,	NFDATA15_B,		SEL_NDF_1),
+ 	PINMUX_IPSR_MSEL(IP8_27_24,	TS_SDAT1_B,		SEL_TSIF1_1),
+ 	PINMUX_IPSR_MSEL(IP8_27_24,	STP_ISD_1_B,		SEL_SSP1_1_1),
+ 
+ 	PINMUX_IPSR_GPSR(IP8_31_28,	SD1_DAT3),
+ 	PINMUX_IPSR_GPSR(IP8_31_28,	SD2_DAT7),
+ 	PINMUX_IPSR_MSEL(IP8_31_28,	MSIOF1_SS2_G,		SEL_MSIOF1_6),
++	PINMUX_IPSR_MSEL(IP8_31_28,	NFRB_N_B,		SEL_NDF_1),
+ 	PINMUX_IPSR_MSEL(IP8_31_28,	TS_SDEN1_B,		SEL_TSIF1_1),
+ 	PINMUX_IPSR_MSEL(IP8_31_28,	STP_ISEN_1_B,		SEL_SSP1_1_1),
+ 
+ 	/* IPSR9 */
+ 	PINMUX_IPSR_GPSR(IP9_3_0,	SD2_CLK),
++	PINMUX_IPSR_GPSR(IP9_3_0,	NFDATA8),
+ 
 -	PINMUX_IPSR_GPSR(IP9_7_4,	SD2_DAT0),
--
++	PINMUX_IPSR_GPSR(IP9_7_4,	SD2_CMD),
++	PINMUX_IPSR_GPSR(IP9_7_4,	NFDATA9),
+ 
 -	PINMUX_IPSR_GPSR(IP9_11_8,	SD2_DAT1),
--
++	PINMUX_IPSR_GPSR(IP9_11_8,	SD2_DAT0),
++	PINMUX_IPSR_GPSR(IP9_11_8,	NFDATA10),
+ 
 -	PINMUX_IPSR_GPSR(IP9_15_12,	SD2_DAT2),
--
++	PINMUX_IPSR_GPSR(IP9_15_12,	SD2_DAT1),
++	PINMUX_IPSR_GPSR(IP9_15_12,	NFDATA11),
+ 
 -	PINMUX_IPSR_GPSR(IP9_19_16,	SD2_DAT3),
--
++	PINMUX_IPSR_GPSR(IP9_19_16,	SD2_DAT2),
++	PINMUX_IPSR_GPSR(IP9_19_16,	NFDATA12),
+ 
 -	PINMUX_IPSR_GPSR(IP9_23_20,	SD2_DS),
 -	PINMUX_IPSR_MSEL(IP9_23_20,	SATA_DEVSLP_B,		SEL_SATA_1),
--
++	PINMUX_IPSR_GPSR(IP9_23_20,	SD2_DAT3),
++	PINMUX_IPSR_GPSR(IP9_23_20,	NFDATA13),
+ 
 -	PINMUX_IPSR_GPSR(IP9_27_24,	SD3_DAT4),
 -	PINMUX_IPSR_MSEL(IP9_27_24,	SD2_CD_A,		SEL_SDHI2_0),
--
++	PINMUX_IPSR_GPSR(IP9_27_24,	SD2_DS),
++	PINMUX_IPSR_GPSR(IP9_27_24,	NFALE),
++	PINMUX_IPSR_GPSR(IP9_27_24,	SATA_DEVSLP_B),
+ 
 -	PINMUX_IPSR_GPSR(IP9_31_28,	SD3_DAT5),
 -	PINMUX_IPSR_MSEL(IP9_31_28,	SD2_WP_A,		SEL_SDHI2_0),
--
--	/* IPSR10 */
++	PINMUX_IPSR_GPSR(IP9_31_28,	SD3_CLK),
++	PINMUX_IPSR_GPSR(IP9_31_28,	NFWE_N),
+ 
+ 	/* IPSR10 */
 -	PINMUX_IPSR_GPSR(IP10_3_0,	SD3_DAT6),
 -	PINMUX_IPSR_GPSR(IP10_3_0,	SD3_CD),
--
++	PINMUX_IPSR_GPSR(IP10_3_0,	SD3_CMD),
++	PINMUX_IPSR_GPSR(IP10_3_0,	NFRE_N),
+ 
 -	PINMUX_IPSR_GPSR(IP10_7_4,	SD3_DAT7),
 -	PINMUX_IPSR_GPSR(IP10_7_4,	SD3_WP),
--
++	PINMUX_IPSR_GPSR(IP10_7_4,	SD3_DAT0),
++	PINMUX_IPSR_GPSR(IP10_7_4,	NFDATA0),
+ 
 -	PINMUX_IPSR_GPSR(IP10_11_8,	SD0_CD),
 -	PINMUX_IPSR_MSEL(IP10_11_8,	SCL2_B,			SEL_I2C2_1),
 -	PINMUX_IPSR_MSEL(IP10_11_8,	SIM0_RST_A,		SEL_SIMCARD_0),
@@ -6535,7 +6446,9 @@
 -	PINMUX_IPSR_MSEL(IP10_31_28,	TS_SCK0_C,		SEL_TSIF0_2),
 -	PINMUX_IPSR_MSEL(IP10_31_28,	STP_ISCLK_0_C,		SEL_SSP1_0_2),
 -	PINMUX_IPSR_MSEL(IP10_31_28,	RIF0_D0_B,		SEL_DRIF0_1),
--
++	PINMUX_IPSR_GPSR(IP10_11_8,	SD3_DAT1),
++	PINMUX_IPSR_GPSR(IP10_11_8,	NFDATA1),
+ 
 -	/* IPSR11 */
 -	PINMUX_IPSR_GPSR(IP11_3_0,	TX0),
 -	PINMUX_IPSR_MSEL(IP11_3_0,	HTX1_B,			SEL_HSCIF1_1),
@@ -6596,7 +6509,9 @@
 -	PINMUX_IPSR_MSEL(IP11_31_28,	STP_ISCLK_1_C,		SEL_SSP1_1_2),
 -	PINMUX_IPSR_MSEL(IP11_31_28,	RIF1_CLK_B,		SEL_DRIF1_1),
 -	PINMUX_IPSR_GPSR(IP11_31_28,	ADICLK),
--
++	PINMUX_IPSR_GPSR(IP10_15_12,	SD3_DAT2),
++	PINMUX_IPSR_GPSR(IP10_15_12,	NFDATA2),
+ 
 -	/* IPSR12 */
 -	PINMUX_IPSR_MSEL(IP12_3_0,	TX2_A,			SEL_SCIF2_0),
 -	PINMUX_IPSR_MSEL(IP12_3_0,	SD2_CD_B,		SEL_SDHI2_1),
@@ -6650,10 +6565,15 @@
 -	PINMUX_IPSR_MSEL(IP12_27_24,	STP_IVCXO27_0_D,	SEL_SSP1_0_3),
 -	PINMUX_IPSR_MSEL(IP12_27_24,	BPFCLK_A,		SEL_FM_0),
 -	PINMUX_IPSR_MSEL(IP12_27_24,	AUDIO_CLKOUT2_A,	SEL_ADG_0),
--
++	PINMUX_IPSR_GPSR(IP10_19_16,	SD3_DAT3),
++	PINMUX_IPSR_GPSR(IP10_19_16,	NFDATA3),
+ 
 -	PINMUX_IPSR_GPSR(IP12_31_28,	MSIOF0_SYNC),
 -	PINMUX_IPSR_MSEL(IP12_31_28,	AUDIO_CLKOUT_A,		SEL_ADG_0),
--
++	PINMUX_IPSR_GPSR(IP10_23_20,	SD3_DAT4),
++	PINMUX_IPSR_MSEL(IP10_23_20,	SD2_CD_A,		SEL_SDHI2_0),
++	PINMUX_IPSR_GPSR(IP10_23_20,	NFDATA4),
+ 
 -	/* IPSR13 */
 -	PINMUX_IPSR_GPSR(IP13_3_0,	MSIOF0_SS1),
 -	PINMUX_IPSR_GPSR(IP13_3_0,	RX5),
@@ -6684,22 +6604,220 @@
 -	PINMUX_IPSR_GPSR(IP13_19_16,	MLB_DAT),
 -	PINMUX_IPSR_MSEL(IP13_19_16,	TX1_B,			SEL_SCIF1_1),
 -	PINMUX_IPSR_MSEL(IP13_19_16,	MSIOF1_RXD_F,		SEL_MSIOF1_5),
--
++	PINMUX_IPSR_GPSR(IP10_27_24,	SD3_DAT5),
++	PINMUX_IPSR_MSEL(IP10_27_24,	SD2_WP_A,		SEL_SDHI2_0),
++	PINMUX_IPSR_GPSR(IP10_27_24,	NFDATA5),
++
++	PINMUX_IPSR_GPSR(IP10_31_28,	SD3_DAT6),
++	PINMUX_IPSR_GPSR(IP10_31_28,	SD3_CD),
++	PINMUX_IPSR_GPSR(IP10_31_28,	NFDATA6),
+ 
 -	PINMUX_IPSR_GPSR(IP13_23_20,	SSI_SCK01239),
 -	PINMUX_IPSR_MSEL(IP13_23_20,	MSIOF1_TXD_F,		SEL_MSIOF1_5),
--
++	/* IPSR11 */
++	PINMUX_IPSR_GPSR(IP11_3_0,	SD3_DAT7),
++	PINMUX_IPSR_GPSR(IP11_3_0,	SD3_WP),
++	PINMUX_IPSR_GPSR(IP11_3_0,	NFDATA7),
++
++	PINMUX_IPSR_GPSR(IP11_7_4,	SD3_DS),
++	PINMUX_IPSR_GPSR(IP11_7_4,	NFCLE),
++
++	PINMUX_IPSR_GPSR(IP11_11_8,	SD0_CD),
++	PINMUX_IPSR_MSEL(IP11_11_8,	SCL2_B,			SEL_I2C2_1),
++	PINMUX_IPSR_MSEL(IP11_11_8,	SIM0_RST_A,		SEL_SIMCARD_0),
++
++	PINMUX_IPSR_GPSR(IP11_15_12,	SD0_WP),
++	PINMUX_IPSR_MSEL(IP11_15_12,	SDA2_B,			SEL_I2C2_1),
++
++	PINMUX_IPSR_GPSR(IP11_19_16,	SD1_CD),
++	PINMUX_IPSR_MSEL(IP11_19_16,	SIM0_CLK_B,		SEL_SIMCARD_1),
++
++	PINMUX_IPSR_GPSR(IP11_23_20,	SD1_WP),
++	PINMUX_IPSR_MSEL(IP11_23_20,	SIM0_D_B,		SEL_SIMCARD_1),
++
++	PINMUX_IPSR_GPSR(IP11_27_24,	SCK0),
++	PINMUX_IPSR_MSEL(IP11_27_24,	HSCK1_B,		SEL_HSCIF1_1),
++	PINMUX_IPSR_MSEL(IP11_27_24,	MSIOF1_SS2_B,		SEL_MSIOF1_1),
++	PINMUX_IPSR_MSEL(IP11_27_24,	AUDIO_CLKC_B,		SEL_ADG_C_1),
++	PINMUX_IPSR_MSEL(IP11_27_24,	SDA2_A,			SEL_I2C2_0),
++	PINMUX_IPSR_MSEL(IP11_27_24,	SIM0_RST_B,		SEL_SIMCARD_1),
++	PINMUX_IPSR_MSEL(IP11_27_24,	STP_OPWM_0_C,		SEL_SSP1_0_2),
++	PINMUX_IPSR_MSEL(IP11_27_24,	RIF0_CLK_B,		SEL_DRIF0_1),
++	PINMUX_IPSR_GPSR(IP11_27_24,	ADICHS2),
++	PINMUX_IPSR_MSEL(IP11_27_24,	SCK5_B,			SEL_SCIF5_1),
++
++	PINMUX_IPSR_GPSR(IP11_31_28,	RX0),
++	PINMUX_IPSR_MSEL(IP11_31_28,	HRX1_B,			SEL_HSCIF1_1),
++	PINMUX_IPSR_MSEL(IP11_31_28,	TS_SCK0_C,		SEL_TSIF0_2),
++	PINMUX_IPSR_MSEL(IP11_31_28,	STP_ISCLK_0_C,		SEL_SSP1_0_2),
++	PINMUX_IPSR_MSEL(IP11_31_28,	RIF0_D0_B,		SEL_DRIF0_1),
+ 
 -	PINMUX_IPSR_GPSR(IP13_27_24,	SSI_WS01239),
 -	PINMUX_IPSR_MSEL(IP13_27_24,	MSIOF1_SS1_F,		SEL_MSIOF1_5),
--
++	/* IPSR12 */
++	PINMUX_IPSR_GPSR(IP12_3_0,	TX0),
++	PINMUX_IPSR_MSEL(IP12_3_0,	HTX1_B,			SEL_HSCIF1_1),
++	PINMUX_IPSR_MSEL(IP12_3_0,	TS_SPSYNC0_C,		SEL_TSIF0_2),
++	PINMUX_IPSR_MSEL(IP12_3_0,	STP_ISSYNC_0_C,		SEL_SSP1_0_2),
++	PINMUX_IPSR_MSEL(IP12_3_0,	RIF0_D1_B,		SEL_DRIF0_1),
++
++	PINMUX_IPSR_GPSR(IP12_7_4,	CTS0_N),
++	PINMUX_IPSR_MSEL(IP12_7_4,	HCTS1_N_B,		SEL_HSCIF1_1),
++	PINMUX_IPSR_MSEL(IP12_7_4,	MSIOF1_SYNC_B,		SEL_MSIOF1_1),
++	PINMUX_IPSR_MSEL(IP12_7_4,	TS_SPSYNC1_C,		SEL_TSIF1_2),
++	PINMUX_IPSR_MSEL(IP12_7_4,	STP_ISSYNC_1_C,		SEL_SSP1_1_2),
++	PINMUX_IPSR_MSEL(IP12_7_4,	RIF1_SYNC_B,		SEL_DRIF1_1),
++	PINMUX_IPSR_GPSR(IP12_7_4,	AUDIO_CLKOUT_C),
++	PINMUX_IPSR_GPSR(IP12_7_4,	ADICS_SAMP),
++
++	PINMUX_IPSR_GPSR(IP12_11_8,	RTS0_N_TANS),
++	PINMUX_IPSR_MSEL(IP12_11_8,	HRTS1_N_B,		SEL_HSCIF1_1),
++	PINMUX_IPSR_MSEL(IP12_11_8,	MSIOF1_SS1_B,		SEL_MSIOF1_1),
++	PINMUX_IPSR_MSEL(IP12_11_8,	AUDIO_CLKA_B,		SEL_ADG_A_1),
++	PINMUX_IPSR_MSEL(IP12_11_8,	SCL2_A,			SEL_I2C2_0),
++	PINMUX_IPSR_MSEL(IP12_11_8,	STP_IVCXO27_1_C,	SEL_SSP1_1_2),
++	PINMUX_IPSR_MSEL(IP12_11_8,	RIF0_SYNC_B,		SEL_DRIF0_1),
++	PINMUX_IPSR_GPSR(IP12_11_8,	ADICHS1),
++
++	PINMUX_IPSR_MSEL(IP12_15_12,	RX1_A,			SEL_SCIF1_0),
++	PINMUX_IPSR_MSEL(IP12_15_12,	HRX1_A,			SEL_HSCIF1_0),
++	PINMUX_IPSR_MSEL(IP12_15_12,	TS_SDAT0_C,		SEL_TSIF0_2),
++	PINMUX_IPSR_MSEL(IP12_15_12,	STP_ISD_0_C,		SEL_SSP1_0_2),
++	PINMUX_IPSR_MSEL(IP12_15_12,	RIF1_CLK_C,		SEL_DRIF1_2),
++
++	PINMUX_IPSR_MSEL(IP12_19_16,	TX1_A,			SEL_SCIF1_0),
++	PINMUX_IPSR_MSEL(IP12_19_16,	HTX1_A,			SEL_HSCIF1_0),
++	PINMUX_IPSR_MSEL(IP12_19_16,	TS_SDEN0_C,		SEL_TSIF0_2),
++	PINMUX_IPSR_MSEL(IP12_19_16,	STP_ISEN_0_C,		SEL_SSP1_0_2),
++	PINMUX_IPSR_MSEL(IP12_19_16,	RIF1_D0_C,		SEL_DRIF1_2),
++
++	PINMUX_IPSR_GPSR(IP12_23_20,	CTS1_N),
++	PINMUX_IPSR_MSEL(IP12_23_20,	HCTS1_N_A,		SEL_HSCIF1_0),
++	PINMUX_IPSR_MSEL(IP12_23_20,	MSIOF1_RXD_B,		SEL_MSIOF1_1),
++	PINMUX_IPSR_MSEL(IP12_23_20,	TS_SDEN1_C,		SEL_TSIF1_2),
++	PINMUX_IPSR_MSEL(IP12_23_20,	STP_ISEN_1_C,		SEL_SSP1_1_2),
++	PINMUX_IPSR_MSEL(IP12_23_20,	RIF1_D0_B,		SEL_DRIF1_1),
++	PINMUX_IPSR_GPSR(IP12_23_20,	ADIDATA),
++
++	PINMUX_IPSR_GPSR(IP12_27_24,	RTS1_N_TANS),
++	PINMUX_IPSR_MSEL(IP12_27_24,	HRTS1_N_A,		SEL_HSCIF1_0),
++	PINMUX_IPSR_MSEL(IP12_27_24,	MSIOF1_TXD_B,		SEL_MSIOF1_1),
++	PINMUX_IPSR_MSEL(IP12_27_24,	TS_SDAT1_C,		SEL_TSIF1_2),
++	PINMUX_IPSR_MSEL(IP12_27_24,	STP_ISD_1_C,		SEL_SSP1_1_2),
++	PINMUX_IPSR_MSEL(IP12_27_24,	RIF1_D1_B,		SEL_DRIF1_1),
++	PINMUX_IPSR_GPSR(IP12_27_24,	ADICHS0),
++
++	PINMUX_IPSR_GPSR(IP12_31_28,	SCK2),
++	PINMUX_IPSR_MSEL(IP12_31_28,	SCIF_CLK_B,		SEL_SCIF1_1),
++	PINMUX_IPSR_MSEL(IP12_31_28,	MSIOF1_SCK_B,		SEL_MSIOF1_1),
++	PINMUX_IPSR_MSEL(IP12_31_28,	TS_SCK1_C,		SEL_TSIF1_2),
++	PINMUX_IPSR_MSEL(IP12_31_28,	STP_ISCLK_1_C,		SEL_SSP1_1_2),
++	PINMUX_IPSR_MSEL(IP12_31_28,	RIF1_CLK_B,		SEL_DRIF1_1),
++	PINMUX_IPSR_GPSR(IP12_31_28,	ADICLK),
+ 
 -	PINMUX_IPSR_GPSR(IP13_31_28,	SSI_SDATA0),
 -	PINMUX_IPSR_MSEL(IP13_31_28,	MSIOF1_SS2_F,		SEL_MSIOF1_5),
--
--	/* IPSR14 */
++	/* IPSR13 */
++	PINMUX_IPSR_MSEL(IP13_3_0,	TX2_A,			SEL_SCIF2_0),
++	PINMUX_IPSR_MSEL(IP13_3_0,	SD2_CD_B,		SEL_SDHI2_1),
++	PINMUX_IPSR_MSEL(IP13_3_0,	SCL1_A,			SEL_I2C1_0),
++	PINMUX_IPSR_MSEL(IP13_3_0,	FMCLK_A,		SEL_FM_0),
++	PINMUX_IPSR_MSEL(IP13_3_0,	RIF1_D1_C,		SEL_DRIF1_2),
++	PINMUX_IPSR_GPSR(IP13_3_0,	FSO_CFE_0_N),
++
++	PINMUX_IPSR_MSEL(IP13_7_4,	RX2_A,			SEL_SCIF2_0),
++	PINMUX_IPSR_MSEL(IP13_7_4,	SD2_WP_B,		SEL_SDHI2_1),
++	PINMUX_IPSR_MSEL(IP13_7_4,	SDA1_A,			SEL_I2C1_0),
++	PINMUX_IPSR_MSEL(IP13_7_4,	FMIN_A,			SEL_FM_0),
++	PINMUX_IPSR_MSEL(IP13_7_4,	RIF1_SYNC_C,		SEL_DRIF1_2),
++	PINMUX_IPSR_GPSR(IP13_7_4,	FSO_CFE_1_N),
++
++	PINMUX_IPSR_GPSR(IP13_11_8,	HSCK0),
++	PINMUX_IPSR_MSEL(IP13_11_8,	MSIOF1_SCK_D,		SEL_MSIOF1_3),
++	PINMUX_IPSR_MSEL(IP13_11_8,	AUDIO_CLKB_A,		SEL_ADG_B_0),
++	PINMUX_IPSR_MSEL(IP13_11_8,	SSI_SDATA1_B,		SEL_SSI_1),
++	PINMUX_IPSR_MSEL(IP13_11_8,	TS_SCK0_D,		SEL_TSIF0_3),
++	PINMUX_IPSR_MSEL(IP13_11_8,	STP_ISCLK_0_D,		SEL_SSP1_0_3),
++	PINMUX_IPSR_MSEL(IP13_11_8,	RIF0_CLK_C,		SEL_DRIF0_2),
++	PINMUX_IPSR_MSEL(IP13_11_8,	RX5_B,			SEL_SCIF5_1),
++
++	PINMUX_IPSR_GPSR(IP13_15_12,	HRX0),
++	PINMUX_IPSR_MSEL(IP13_15_12,	MSIOF1_RXD_D,		SEL_MSIOF1_3),
++	PINMUX_IPSR_MSEL(IP13_15_12,	SSI_SDATA2_B,		SEL_SSI_1),
++	PINMUX_IPSR_MSEL(IP13_15_12,	TS_SDEN0_D,		SEL_TSIF0_3),
++	PINMUX_IPSR_MSEL(IP13_15_12,	STP_ISEN_0_D,		SEL_SSP1_0_3),
++	PINMUX_IPSR_MSEL(IP13_15_12,	RIF0_D0_C,		SEL_DRIF0_2),
++
++	PINMUX_IPSR_GPSR(IP13_19_16,	HTX0),
++	PINMUX_IPSR_MSEL(IP13_19_16,	MSIOF1_TXD_D,		SEL_MSIOF1_3),
++	PINMUX_IPSR_MSEL(IP13_19_16,	SSI_SDATA9_B,		SEL_SSI_1),
++	PINMUX_IPSR_MSEL(IP13_19_16,	TS_SDAT0_D,		SEL_TSIF0_3),
++	PINMUX_IPSR_MSEL(IP13_19_16,	STP_ISD_0_D,		SEL_SSP1_0_3),
++	PINMUX_IPSR_MSEL(IP13_19_16,	RIF0_D1_C,		SEL_DRIF0_2),
++
++	PINMUX_IPSR_GPSR(IP13_23_20,	HCTS0_N),
++	PINMUX_IPSR_MSEL(IP13_23_20,	RX2_B,			SEL_SCIF2_1),
++	PINMUX_IPSR_MSEL(IP13_23_20,	MSIOF1_SYNC_D,		SEL_MSIOF1_3),
++	PINMUX_IPSR_MSEL(IP13_23_20,	SSI_SCK9_A,		SEL_SSI_0),
++	PINMUX_IPSR_MSEL(IP13_23_20,	TS_SPSYNC0_D,		SEL_TSIF0_3),
++	PINMUX_IPSR_MSEL(IP13_23_20,	STP_ISSYNC_0_D,		SEL_SSP1_0_3),
++	PINMUX_IPSR_MSEL(IP13_23_20,	RIF0_SYNC_C,		SEL_DRIF0_2),
++	PINMUX_IPSR_GPSR(IP13_23_20,	AUDIO_CLKOUT1_A),
++
++	PINMUX_IPSR_GPSR(IP13_27_24,	HRTS0_N),
++	PINMUX_IPSR_MSEL(IP13_27_24,	TX2_B,			SEL_SCIF2_1),
++	PINMUX_IPSR_MSEL(IP13_27_24,	MSIOF1_SS1_D,		SEL_MSIOF1_3),
++	PINMUX_IPSR_MSEL(IP13_27_24,	SSI_WS9_A,		SEL_SSI_0),
++	PINMUX_IPSR_MSEL(IP13_27_24,	STP_IVCXO27_0_D,	SEL_SSP1_0_3),
++	PINMUX_IPSR_MSEL(IP13_27_24,	BPFCLK_A,		SEL_FM_0),
++	PINMUX_IPSR_GPSR(IP13_27_24,	AUDIO_CLKOUT2_A),
++
++	PINMUX_IPSR_GPSR(IP13_31_28,	MSIOF0_SYNC),
++	PINMUX_IPSR_GPSR(IP13_31_28,	AUDIO_CLKOUT_A),
++	PINMUX_IPSR_MSEL(IP13_31_28,	TX5_B,			SEL_SCIF5_1),
++	PINMUX_IPSR_MSEL(IP13_31_28,	BPFCLK_D,		SEL_FM_3),
+ 
+ 	/* IPSR14 */
 -	PINMUX_IPSR_MSEL(IP14_3_0,	SSI_SDATA1_A,		SEL_SSI_0),
--
++	PINMUX_IPSR_GPSR(IP14_3_0,	MSIOF0_SS1),
++	PINMUX_IPSR_MSEL(IP14_3_0,	RX5_A,			SEL_SCIF5_0),
++	PINMUX_IPSR_MSEL(IP14_3_0,	NFWP_N_A,		SEL_NDF_0),
++	PINMUX_IPSR_MSEL(IP14_3_0,	AUDIO_CLKA_C,		SEL_ADG_A_2),
++	PINMUX_IPSR_MSEL(IP14_3_0,	SSI_SCK2_A,		SEL_SSI_0),
++	PINMUX_IPSR_MSEL(IP14_3_0,	STP_IVCXO27_0_C,	SEL_SSP1_0_2),
++	PINMUX_IPSR_GPSR(IP14_3_0,	AUDIO_CLKOUT3_A),
++	PINMUX_IPSR_MSEL(IP14_3_0,	TCLK1_B,		SEL_TIMER_TMU_1),
++
++	PINMUX_IPSR_GPSR(IP14_7_4,	MSIOF0_SS2),
++	PINMUX_IPSR_MSEL(IP14_7_4,	TX5_A,			SEL_SCIF5_0),
++	PINMUX_IPSR_MSEL(IP14_7_4,	MSIOF1_SS2_D,		SEL_MSIOF1_3),
++	PINMUX_IPSR_MSEL(IP14_7_4,	AUDIO_CLKC_A,		SEL_ADG_C_0),
++	PINMUX_IPSR_MSEL(IP14_7_4,	SSI_WS2_A,		SEL_SSI_0),
++	PINMUX_IPSR_MSEL(IP14_7_4,	STP_OPWM_0_D,		SEL_SSP1_0_3),
++	PINMUX_IPSR_GPSR(IP14_7_4,	AUDIO_CLKOUT_D),
++	PINMUX_IPSR_MSEL(IP14_7_4,	SPEEDIN_B,		SEL_SPEED_PULSE_1),
++
++	PINMUX_IPSR_GPSR(IP14_11_8,	MLB_CLK),
++	PINMUX_IPSR_MSEL(IP14_11_8,	MSIOF1_SCK_F,		SEL_MSIOF1_5),
++	PINMUX_IPSR_MSEL(IP14_11_8,	SCL1_B,			SEL_I2C1_1),
++
++	PINMUX_IPSR_GPSR(IP14_15_12,	MLB_SIG),
++	PINMUX_IPSR_MSEL(IP14_15_12,	RX1_B,			SEL_SCIF1_1),
++	PINMUX_IPSR_MSEL(IP14_15_12,	MSIOF1_SYNC_F,		SEL_MSIOF1_5),
++	PINMUX_IPSR_MSEL(IP14_15_12,	SDA1_B,			SEL_I2C1_1),
++
++	PINMUX_IPSR_GPSR(IP14_19_16,	MLB_DAT),
++	PINMUX_IPSR_MSEL(IP14_19_16,	TX1_B,			SEL_SCIF1_1),
++	PINMUX_IPSR_MSEL(IP14_19_16,	MSIOF1_RXD_F,		SEL_MSIOF1_5),
++
++	PINMUX_IPSR_GPSR(IP14_23_20,	SSI_SCK01239),
++	PINMUX_IPSR_MSEL(IP14_23_20,	MSIOF1_TXD_F,		SEL_MSIOF1_5),
+ 
 -	PINMUX_IPSR_MSEL(IP14_7_4,	SSI_SDATA2_A,		SEL_SSI_0),
 -	PINMUX_IPSR_MSEL(IP14_7_4,	SSI_SCK1_B,		SEL_SSI_1),
--
++	PINMUX_IPSR_GPSR(IP14_27_24,	SSI_WS01239),
++	PINMUX_IPSR_MSEL(IP14_27_24,	MSIOF1_SS1_F,		SEL_MSIOF1_5),
+ 
 -	PINMUX_IPSR_GPSR(IP14_11_8,	SSI_SCK34),
 -	PINMUX_IPSR_MSEL(IP14_11_8,	MSIOF1_SS1_A,		SEL_MSIOF1_0),
 -	PINMUX_IPSR_MSEL(IP14_11_8,	STP_OPWM_0_A,		SEL_SSP1_0_0),
@@ -6740,8 +6858,10 @@
 -	PINMUX_IPSR_MSEL(IP14_31_28,	STP_ISSYNC_0_A,		SEL_SSP1_0_0),
 -	PINMUX_IPSR_MSEL(IP14_31_28,	RIF0_D0_A,		SEL_DRIF0_0),
 -	PINMUX_IPSR_MSEL(IP14_31_28,	RIF2_D1_A,		SEL_DRIF2_0),
--
--	/* IPSR15 */
++	PINMUX_IPSR_GPSR(IP14_31_28,	SSI_SDATA0),
++	PINMUX_IPSR_MSEL(IP14_31_28,	MSIOF1_SS2_F,		SEL_MSIOF1_5),
+ 
+ 	/* IPSR15 */
 -	PINMUX_IPSR_GPSR(IP15_3_0,	SSI_SCK6),
 -	PINMUX_IPSR_GPSR(IP15_3_0,	USB2_PWEN),
 -	PINMUX_IPSR_MSEL(IP15_3_0,	SIM0_RST_D,		SEL_SIMCARD_3),
@@ -6795,11 +6915,55 @@
 -	PINMUX_IPSR_GPSR(IP15_31_28,	SCK1),
 -	PINMUX_IPSR_MSEL(IP15_31_28,	STP_IVCXO27_1_A,	SEL_SSP1_1_0),
 -	PINMUX_IPSR_GPSR(IP15_31_28,	SCK5),
--
++	PINMUX_IPSR_MSEL(IP15_3_0,	SSI_SDATA1_A,		SEL_SSI_0),
+ 
 -	/* IPSR16 */
 -	PINMUX_IPSR_MSEL(IP16_3_0,	AUDIO_CLKA_A,		SEL_ADG_0),
 -	PINMUX_IPSR_GPSR(IP16_3_0,	CC5_OSCOUT),
--
++	PINMUX_IPSR_MSEL(IP15_7_4,	SSI_SDATA2_A,		SEL_SSI_0),
++	PINMUX_IPSR_MSEL(IP15_7_4,	SSI_SCK1_B,		SEL_SSI_1),
++
++	PINMUX_IPSR_GPSR(IP15_11_8,	SSI_SCK34),
++	PINMUX_IPSR_MSEL(IP15_11_8,	MSIOF1_SS1_A,		SEL_MSIOF1_0),
++	PINMUX_IPSR_MSEL(IP15_11_8,	STP_OPWM_0_A,		SEL_SSP1_0_0),
++
++	PINMUX_IPSR_GPSR(IP15_15_12,	SSI_WS34),
++	PINMUX_IPSR_MSEL(IP15_15_12,	HCTS2_N_A,		SEL_HSCIF2_0),
++	PINMUX_IPSR_MSEL(IP15_15_12,	MSIOF1_SS2_A,		SEL_MSIOF1_0),
++	PINMUX_IPSR_MSEL(IP15_15_12,	STP_IVCXO27_0_A,	SEL_SSP1_0_0),
++
++	PINMUX_IPSR_GPSR(IP15_19_16,	SSI_SDATA3),
++	PINMUX_IPSR_MSEL(IP15_19_16,	HRTS2_N_A,		SEL_HSCIF2_0),
++	PINMUX_IPSR_MSEL(IP15_19_16,	MSIOF1_TXD_A,		SEL_MSIOF1_0),
++	PINMUX_IPSR_MSEL(IP15_19_16,	TS_SCK0_A,		SEL_TSIF0_0),
++	PINMUX_IPSR_MSEL(IP15_19_16,	STP_ISCLK_0_A,		SEL_SSP1_0_0),
++	PINMUX_IPSR_MSEL(IP15_19_16,	RIF0_D1_A,		SEL_DRIF0_0),
++	PINMUX_IPSR_MSEL(IP15_19_16,	RIF2_D0_A,		SEL_DRIF2_0),
++
++	PINMUX_IPSR_GPSR(IP15_23_20,	SSI_SCK4),
++	PINMUX_IPSR_MSEL(IP15_23_20,	HRX2_A,			SEL_HSCIF2_0),
++	PINMUX_IPSR_MSEL(IP15_23_20,	MSIOF1_SCK_A,		SEL_MSIOF1_0),
++	PINMUX_IPSR_MSEL(IP15_23_20,	TS_SDAT0_A,		SEL_TSIF0_0),
++	PINMUX_IPSR_MSEL(IP15_23_20,	STP_ISD_0_A,		SEL_SSP1_0_0),
++	PINMUX_IPSR_MSEL(IP15_23_20,	RIF0_CLK_A,		SEL_DRIF0_0),
++	PINMUX_IPSR_MSEL(IP15_23_20,	RIF2_CLK_A,		SEL_DRIF2_0),
++
++	PINMUX_IPSR_GPSR(IP15_27_24,	SSI_WS4),
++	PINMUX_IPSR_MSEL(IP15_27_24,	HTX2_A,			SEL_HSCIF2_0),
++	PINMUX_IPSR_MSEL(IP15_27_24,	MSIOF1_SYNC_A,		SEL_MSIOF1_0),
++	PINMUX_IPSR_MSEL(IP15_27_24,	TS_SDEN0_A,		SEL_TSIF0_0),
++	PINMUX_IPSR_MSEL(IP15_27_24,	STP_ISEN_0_A,		SEL_SSP1_0_0),
++	PINMUX_IPSR_MSEL(IP15_27_24,	RIF0_SYNC_A,		SEL_DRIF0_0),
++	PINMUX_IPSR_MSEL(IP15_27_24,	RIF2_SYNC_A,		SEL_DRIF2_0),
++
++	PINMUX_IPSR_GPSR(IP15_31_28,	SSI_SDATA4),
++	PINMUX_IPSR_MSEL(IP15_31_28,	HSCK2_A,		SEL_HSCIF2_0),
++	PINMUX_IPSR_MSEL(IP15_31_28,	MSIOF1_RXD_A,		SEL_MSIOF1_0),
++	PINMUX_IPSR_MSEL(IP15_31_28,	TS_SPSYNC0_A,		SEL_TSIF0_0),
++	PINMUX_IPSR_MSEL(IP15_31_28,	STP_ISSYNC_0_A,		SEL_SSP1_0_0),
++	PINMUX_IPSR_MSEL(IP15_31_28,	RIF0_D0_A,		SEL_DRIF0_0),
++	PINMUX_IPSR_MSEL(IP15_31_28,	RIF2_D1_A,		SEL_DRIF2_0),
+ 
 -	PINMUX_IPSR_MSEL(IP16_7_4,	AUDIO_CLKB_B,		SEL_ADG_1),
 -	PINMUX_IPSR_MSEL(IP16_7_4,	SCIF_CLK_A,		SEL_SCIF1_0),
 -	PINMUX_IPSR_MSEL(IP16_7_4,	STP_IVCXO27_1_D,	SEL_SSP1_1_3),
@@ -6856,8 +7020,62 @@
 -	PINMUX_IPSR_MSEL(IP16_31_28,	RIF3_D1_B,		SEL_DRIF3_1),
 -	PINMUX_IPSR_MSEL(IP16_31_28,	FSO_TOE_B,		SEL_FSO_1),
 -	PINMUX_IPSR_GPSR(IP16_31_28,	TPU0TO1),
--
--	/* IPSR17 */
++	/* IPSR16 */
++	PINMUX_IPSR_GPSR(IP16_3_0,	SSI_SCK6),
++	PINMUX_IPSR_GPSR(IP16_3_0,	USB2_PWEN),
++	PINMUX_IPSR_MSEL(IP16_3_0,	SIM0_RST_D,		SEL_SIMCARD_3),
++
++	PINMUX_IPSR_GPSR(IP16_7_4,	SSI_WS6),
++	PINMUX_IPSR_GPSR(IP16_7_4,	USB2_OVC),
++	PINMUX_IPSR_MSEL(IP16_7_4,	SIM0_D_D,		SEL_SIMCARD_3),
++
++	PINMUX_IPSR_GPSR(IP16_11_8,	SSI_SDATA6),
++	PINMUX_IPSR_MSEL(IP16_11_8,	SIM0_CLK_D,		SEL_SIMCARD_3),
++	PINMUX_IPSR_GPSR(IP16_11_8,	SATA_DEVSLP_A),
++
++	PINMUX_IPSR_GPSR(IP16_15_12,	SSI_SCK78),
++	PINMUX_IPSR_MSEL(IP16_15_12,	HRX2_B,			SEL_HSCIF2_1),
++	PINMUX_IPSR_MSEL(IP16_15_12,	MSIOF1_SCK_C,		SEL_MSIOF1_2),
++	PINMUX_IPSR_MSEL(IP16_15_12,	TS_SCK1_A,		SEL_TSIF1_0),
++	PINMUX_IPSR_MSEL(IP16_15_12,	STP_ISCLK_1_A,		SEL_SSP1_1_0),
++	PINMUX_IPSR_MSEL(IP16_15_12,	RIF1_CLK_A,		SEL_DRIF1_0),
++	PINMUX_IPSR_MSEL(IP16_15_12,	RIF3_CLK_A,		SEL_DRIF3_0),
++
++	PINMUX_IPSR_GPSR(IP16_19_16,	SSI_WS78),
++	PINMUX_IPSR_MSEL(IP16_19_16,	HTX2_B,			SEL_HSCIF2_1),
++	PINMUX_IPSR_MSEL(IP16_19_16,	MSIOF1_SYNC_C,		SEL_MSIOF1_2),
++	PINMUX_IPSR_MSEL(IP16_19_16,	TS_SDAT1_A,		SEL_TSIF1_0),
++	PINMUX_IPSR_MSEL(IP16_19_16,	STP_ISD_1_A,		SEL_SSP1_1_0),
++	PINMUX_IPSR_MSEL(IP16_19_16,	RIF1_SYNC_A,		SEL_DRIF1_0),
++	PINMUX_IPSR_MSEL(IP16_19_16,	RIF3_SYNC_A,		SEL_DRIF3_0),
++
++	PINMUX_IPSR_GPSR(IP16_23_20,	SSI_SDATA7),
++	PINMUX_IPSR_MSEL(IP16_23_20,	HCTS2_N_B,		SEL_HSCIF2_1),
++	PINMUX_IPSR_MSEL(IP16_23_20,	MSIOF1_RXD_C,		SEL_MSIOF1_2),
++	PINMUX_IPSR_MSEL(IP16_23_20,	TS_SDEN1_A,		SEL_TSIF1_0),
++	PINMUX_IPSR_MSEL(IP16_23_20,	STP_ISEN_1_A,		SEL_SSP1_1_0),
++	PINMUX_IPSR_MSEL(IP16_23_20,	RIF1_D0_A,		SEL_DRIF1_0),
++	PINMUX_IPSR_MSEL(IP16_23_20,	RIF3_D0_A,		SEL_DRIF3_0),
++	PINMUX_IPSR_MSEL(IP16_23_20,	TCLK2_A,		SEL_TIMER_TMU_0),
++
++	PINMUX_IPSR_GPSR(IP16_27_24,	SSI_SDATA8),
++	PINMUX_IPSR_MSEL(IP16_27_24,	HRTS2_N_B,		SEL_HSCIF2_1),
++	PINMUX_IPSR_MSEL(IP16_27_24,	MSIOF1_TXD_C,		SEL_MSIOF1_2),
++	PINMUX_IPSR_MSEL(IP16_27_24,	TS_SPSYNC1_A,		SEL_TSIF1_0),
++	PINMUX_IPSR_MSEL(IP16_27_24,	STP_ISSYNC_1_A,		SEL_SSP1_1_0),
++	PINMUX_IPSR_MSEL(IP16_27_24,	RIF1_D1_A,		SEL_DRIF1_0),
++	PINMUX_IPSR_MSEL(IP16_27_24,	RIF3_D1_A,		SEL_DRIF3_0),
++
++	PINMUX_IPSR_MSEL(IP16_31_28,	SSI_SDATA9_A,		SEL_SSI_0),
++	PINMUX_IPSR_MSEL(IP16_31_28,	HSCK2_B,		SEL_HSCIF2_1),
++	PINMUX_IPSR_MSEL(IP16_31_28,	MSIOF1_SS1_C,		SEL_MSIOF1_2),
++	PINMUX_IPSR_MSEL(IP16_31_28,	HSCK1_A,		SEL_HSCIF1_0),
++	PINMUX_IPSR_MSEL(IP16_31_28,	SSI_WS1_B,		SEL_SSI_1),
++	PINMUX_IPSR_GPSR(IP16_31_28,	SCK1),
++	PINMUX_IPSR_MSEL(IP16_31_28,	STP_IVCXO27_1_A,	SEL_SSP1_1_0),
++	PINMUX_IPSR_GPSR(IP16_31_28,	SCK5_A),
+ 
+ 	/* IPSR17 */
 -	PINMUX_IPSR_GPSR(IP17_3_0,	USB31_PWEN),
 -	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKOUT2_B,	SEL_ADG_1),
 -	PINMUX_IPSR_MSEL(IP17_3_0,	SSI_SCK9_B,		SEL_SSI_1),
@@ -6873,84 +7091,99 @@
 -	PINMUX_IPSR_MSEL(IP17_7_4,	STP_ISSYNC_0_E,		SEL_SSP1_0_4),
 -	PINMUX_IPSR_MSEL(IP17_7_4,	RIF2_D1_B,		SEL_DRIF2_1),
 -	PINMUX_IPSR_GPSR(IP17_7_4,	TPU0TO3),
--
--/*
-- * Static pins can not be muxed between different functions but
-- * still needs a mark entry in the pinmux list. Add each static
-- * pin to the list without an associated function. The sh-pfc
-- * core will do the right thing and skip trying to mux then pin
-- * while still applying configuration to it
-- */
--#define FM(x)	PINMUX_DATA(x##_MARK, 0),
--	PINMUX_STATIC
--#undef FM
--};
--
--/*
-- * R8A7795 has 8 banks with 32 PGIOS in each => 256 GPIOs.
-- * Physical layout rows: A - AW, cols: 1 - 39.
-- */
--#define ROW_GROUP_A(r) ('Z' - 'A' + 1 + (r))
--#define PIN_NUMBER(r, c) (((r) - 'A') * 39 + (c) + 300)
--#define PIN_A_NUMBER(r, c) PIN_NUMBER(ROW_GROUP_A(r), c)
--
--static const struct sh_pfc_pin pinmux_pins[] = {
--	PINMUX_GPIO_GP_ALL(),
--
--	/*
--	 * Pins not associated with a GPIO port.
--	 *
--	 * The pin positions are different between different r8a7795
--	 * packages, all that is needed for the pfc driver is a unique
--	 * number for each pin. To this end use the pin layout from
--	 * R-Car H3SiP to calculate a unique number for each pin.
--	 */
--	SH_PFC_PIN_NAMED_CFG('A',  8, AVB_TX_CTL, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('A',  9, AVB_MDIO, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('A', 12, AVB_TXCREFCLK, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('A', 13, AVB_RD0, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('A', 14, AVB_RD2, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('A', 16, AVB_RX_CTL, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('A', 17, AVB_TD2, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('A', 18, AVB_TD0, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('A', 19, AVB_TXC, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('B', 13, AVB_RD1, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('B', 14, AVB_RD3, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('B', 17, AVB_TD3, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('B', 18, AVB_TD1, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('B', 19, AVB_RXC, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('C',  1, PRESETOUT#, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('F',  1, CLKOUT, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('H', 37, MLB_REF, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('V',  3, QSPI1_SPCLK, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('V',  5, QSPI1_SSL, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('V',  6, RPC_WP#, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('V',  7, RPC_RESET#, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('W',  3, QSPI0_SPCLK, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('Y',  3, QSPI0_SSL, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('Y',  6, QSPI0_IO2, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG('Y',  7, RPC_INT#, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('B'),  4, QSPI0_MISO_IO1, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('B'),  6, QSPI0_IO3, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('C'),  3, QSPI1_IO3, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('C'),  5, QSPI0_MOSI_IO0, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('C'),  7, QSPI1_MOSI_IO0, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('D'), 38, FSCLKST#, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('D'), 39, EXTALR, SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('E'),  4, QSPI1_IO2, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('E'),  5, QSPI1_MISO_IO1, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('P'),  7, DU_DOTCLKIN0, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('P'),  8, DU_DOTCLKIN1, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'),  7, DU_DOTCLKIN2, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'),  8, DU_DOTCLKIN3, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'), 26, TRST#, SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'), 29, TDI, SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'), 30, TMS, CFG_FLAGS),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('T'), 27, TCK, SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('T'), 28, TDO, SH_PFC_PIN_CFG_DRIVE_STRENGTH),
--	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('T'), 30, ASEBRK, CFG_FLAGS),
--};
--
++	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKA_A,		SEL_ADG_A_0),
++	PINMUX_IPSR_GPSR(IP17_3_0,	CC5_OSCOUT),
++
++	PINMUX_IPSR_MSEL(IP17_7_4,	AUDIO_CLKB_B,		SEL_ADG_B_1),
++	PINMUX_IPSR_MSEL(IP17_7_4,	SCIF_CLK_A,		SEL_SCIF1_0),
++	PINMUX_IPSR_MSEL(IP17_7_4,	STP_IVCXO27_1_D,	SEL_SSP1_1_3),
++	PINMUX_IPSR_MSEL(IP17_7_4,	REMOCON_A,		SEL_REMOCON_0),
++	PINMUX_IPSR_MSEL(IP17_7_4,	TCLK1_A,		SEL_TIMER_TMU_0),
++
++	PINMUX_IPSR_GPSR(IP17_11_8,	USB0_PWEN),
++	PINMUX_IPSR_MSEL(IP17_11_8,	SIM0_RST_C,		SEL_SIMCARD_2),
++	PINMUX_IPSR_MSEL(IP17_11_8,	TS_SCK1_D,		SEL_TSIF1_3),
++	PINMUX_IPSR_MSEL(IP17_11_8,	STP_ISCLK_1_D,		SEL_SSP1_1_3),
++	PINMUX_IPSR_MSEL(IP17_11_8,	BPFCLK_B,		SEL_FM_1),
++	PINMUX_IPSR_MSEL(IP17_11_8,	RIF3_CLK_B,		SEL_DRIF3_1),
++	PINMUX_IPSR_MSEL(IP17_11_8,	HSCK2_C,		SEL_HSCIF2_2),
++
++	PINMUX_IPSR_GPSR(IP17_15_12,	USB0_OVC),
++	PINMUX_IPSR_MSEL(IP17_15_12,	SIM0_D_C,		SEL_SIMCARD_2),
++	PINMUX_IPSR_MSEL(IP17_15_12,	TS_SDAT1_D,		SEL_TSIF1_3),
++	PINMUX_IPSR_MSEL(IP17_15_12,	STP_ISD_1_D,		SEL_SSP1_1_3),
++	PINMUX_IPSR_MSEL(IP17_15_12,	RIF3_SYNC_B,		SEL_DRIF3_1),
++	PINMUX_IPSR_MSEL(IP17_15_12,	HRX2_C,			SEL_HSCIF2_2),
++
++	PINMUX_IPSR_GPSR(IP17_19_16,	USB1_PWEN),
++	PINMUX_IPSR_MSEL(IP17_19_16,	SIM0_CLK_C,		SEL_SIMCARD_2),
++	PINMUX_IPSR_MSEL(IP17_19_16,	SSI_SCK1_A,		SEL_SSI_0),
++	PINMUX_IPSR_MSEL(IP17_19_16,	TS_SCK0_E,		SEL_TSIF0_4),
++	PINMUX_IPSR_MSEL(IP17_19_16,	STP_ISCLK_0_E,		SEL_SSP1_0_4),
++	PINMUX_IPSR_MSEL(IP17_19_16,	FMCLK_B,		SEL_FM_1),
++	PINMUX_IPSR_MSEL(IP17_19_16,	RIF2_CLK_B,		SEL_DRIF2_1),
++	PINMUX_IPSR_MSEL(IP17_19_16,	SPEEDIN_A,		SEL_SPEED_PULSE_0),
++	PINMUX_IPSR_MSEL(IP17_19_16,	HTX2_C,			SEL_HSCIF2_2),
++
++	PINMUX_IPSR_GPSR(IP17_23_20,	USB1_OVC),
++	PINMUX_IPSR_MSEL(IP17_23_20,	MSIOF1_SS2_C,		SEL_MSIOF1_2),
++	PINMUX_IPSR_MSEL(IP17_23_20,	SSI_WS1_A,		SEL_SSI_0),
++	PINMUX_IPSR_MSEL(IP17_23_20,	TS_SDAT0_E,		SEL_TSIF0_4),
++	PINMUX_IPSR_MSEL(IP17_23_20,	STP_ISD_0_E,		SEL_SSP1_0_4),
++	PINMUX_IPSR_MSEL(IP17_23_20,	FMIN_B,			SEL_FM_1),
++	PINMUX_IPSR_MSEL(IP17_23_20,	RIF2_SYNC_B,		SEL_DRIF2_1),
++	PINMUX_IPSR_MSEL(IP17_23_20,	REMOCON_B,		SEL_REMOCON_1),
++	PINMUX_IPSR_MSEL(IP17_23_20,	HCTS2_N_C,		SEL_HSCIF2_2),
++
++	PINMUX_IPSR_GPSR(IP17_27_24,	USB30_PWEN),
++	PINMUX_IPSR_GPSR(IP17_27_24,	AUDIO_CLKOUT_B),
++	PINMUX_IPSR_MSEL(IP17_27_24,	SSI_SCK2_B,		SEL_SSI_1),
++	PINMUX_IPSR_MSEL(IP17_27_24,	TS_SDEN1_D,		SEL_TSIF1_3),
++	PINMUX_IPSR_MSEL(IP17_27_24,	STP_ISEN_1_D,		SEL_SSP1_1_2),
++	PINMUX_IPSR_MSEL(IP17_27_24,	STP_OPWM_0_E,		SEL_SSP1_0_4),
++	PINMUX_IPSR_MSEL(IP17_27_24,	RIF3_D0_B,		SEL_DRIF3_1),
++	PINMUX_IPSR_MSEL(IP17_27_24,	TCLK2_B,		SEL_TIMER_TMU_1),
++	PINMUX_IPSR_GPSR(IP17_27_24,	TPU0TO0),
++	PINMUX_IPSR_MSEL(IP17_27_24,	BPFCLK_C,		SEL_FM_2),
++	PINMUX_IPSR_MSEL(IP17_27_24,	HRTS2_N_C,		SEL_HSCIF2_2),
++
++	PINMUX_IPSR_GPSR(IP17_31_28,	USB30_OVC),
++	PINMUX_IPSR_GPSR(IP17_31_28,	AUDIO_CLKOUT1_B),
++	PINMUX_IPSR_MSEL(IP17_31_28,	SSI_WS2_B,		SEL_SSI_1),
++	PINMUX_IPSR_MSEL(IP17_31_28,	TS_SPSYNC1_D,		SEL_TSIF1_3),
++	PINMUX_IPSR_MSEL(IP17_31_28,	STP_ISSYNC_1_D,		SEL_SSP1_1_3),
++	PINMUX_IPSR_MSEL(IP17_31_28,	STP_IVCXO27_0_E,	SEL_SSP1_0_4),
++	PINMUX_IPSR_MSEL(IP17_31_28,	RIF3_D1_B,		SEL_DRIF3_1),
++	PINMUX_IPSR_GPSR(IP17_31_28,	FSO_TOE_N),
++	PINMUX_IPSR_GPSR(IP17_31_28,	TPU0TO1),
++
++	/* IPSR18 */
++	PINMUX_IPSR_GPSR(IP18_3_0,	USB3_PWEN),
++	PINMUX_IPSR_GPSR(IP18_3_0,	AUDIO_CLKOUT2_B),
++	PINMUX_IPSR_MSEL(IP18_3_0,	SSI_SCK9_B,		SEL_SSI_1),
++	PINMUX_IPSR_MSEL(IP18_3_0,	TS_SDEN0_E,		SEL_TSIF0_4),
++	PINMUX_IPSR_MSEL(IP18_3_0,	STP_ISEN_0_E,		SEL_SSP1_0_4),
++	PINMUX_IPSR_MSEL(IP18_3_0,	RIF2_D0_B,		SEL_DRIF2_1),
++	PINMUX_IPSR_GPSR(IP18_3_0,	TPU0TO2),
++	PINMUX_IPSR_MSEL(IP18_3_0,	FMCLK_C,		SEL_FM_2),
++	PINMUX_IPSR_MSEL(IP18_3_0,	FMCLK_D,		SEL_FM_3),
++
++	PINMUX_IPSR_GPSR(IP18_7_4,	USB3_OVC),
++	PINMUX_IPSR_GPSR(IP18_7_4,	AUDIO_CLKOUT3_B),
++	PINMUX_IPSR_MSEL(IP18_7_4,	SSI_WS9_B,		SEL_SSI_1),
++	PINMUX_IPSR_MSEL(IP18_7_4,	TS_SPSYNC0_E,		SEL_TSIF0_4),
++	PINMUX_IPSR_MSEL(IP18_7_4,	STP_ISSYNC_0_E,		SEL_SSP1_0_4),
++	PINMUX_IPSR_MSEL(IP18_7_4,	RIF2_D1_B,		SEL_DRIF2_1),
++	PINMUX_IPSR_GPSR(IP18_7_4,	TPU0TO3),
++	PINMUX_IPSR_MSEL(IP18_7_4,	FMIN_C,			SEL_FM_2),
++	PINMUX_IPSR_MSEL(IP18_7_4,	FMIN_D,			SEL_FM_3),
+ 
+ /*
+  * Static pins can not be muxed between different functions but
+@@ -1507,3087 +1576,10 @@ static const struct sh_pfc_pin pinmux_pi
+ 	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('T'), 30, ASEBRK, CFG_FLAGS),
+ };
+ 
 -/* - AUDIO CLOCK ------------------------------------------------------------ */
 -static const unsigned int audio_clk_a_a_pins[] = {
 -	/* CLK A */
@@ -9218,7 +9451,7 @@
 -	USB2_PWEN_MARK, USB2_OVC_MARK,
 -};
 -
--static const struct sh_pfc_pin_group pinmux_groups[] = {
+ static const struct sh_pfc_pin_group pinmux_groups[] = {
 -	SH_PFC_PIN_GROUP(audio_clk_a_a),
 -	SH_PFC_PIN_GROUP(audio_clk_a_b),
 -	SH_PFC_PIN_GROUP(audio_clk_a_c),
@@ -9545,11 +9778,7 @@
 -	"audio_clkout3_a",
 -	"audio_clkout3_b",
 -};
-+	PINMUX_IPSR_GPSR(IP6_7_4,	D6),
-+	PINMUX_IPSR_MSEL(IP6_7_4,	MSIOF2_RXD_B,		SEL_MSIOF2_1),
-+	PINMUX_IPSR_GPSR(IP6_7_4,	VI4_DATA22),
-+	PINMUX_IPSR_GPSR(IP6_7_4,	VI5_DATA6),
- 
+-
 -static const char * const avb_groups[] = {
 -	"avb_link",
 -	"avb_magic",
@@ -9562,64 +9791,29 @@
 -	"avb_avtp_match_b",
 -	"avb_avtp_capture_b",
 -};
-+	PINMUX_IPSR_GPSR(IP6_11_8,	D7),
-+	PINMUX_IPSR_MSEL(IP6_11_8,	MSIOF2_TXD_B,		SEL_MSIOF2_1),
-+	PINMUX_IPSR_GPSR(IP6_11_8,	VI4_DATA23),
-+	PINMUX_IPSR_GPSR(IP6_11_8,	VI5_DATA7),
- 
+-
 -static const char * const can0_groups[] = {
 -	"can0_data_a",
 -	"can0_data_b",
 -};
-+	PINMUX_IPSR_GPSR(IP6_15_12,	D8),
-+	PINMUX_IPSR_GPSR(IP6_15_12,	LCDOUT0),
-+	PINMUX_IPSR_MSEL(IP6_15_12,	MSIOF2_SCK_D,		SEL_MSIOF2_3),
-+	PINMUX_IPSR_MSEL(IP6_15_12,	SCK4_C,			SEL_SCIF4_2),
-+	PINMUX_IPSR_MSEL(IP6_15_12,	VI4_DATA0_A,		SEL_VIN4_0),
-+	PINMUX_IPSR_GPSR(IP6_15_12,	DU_DR0),
- 
+-
 -static const char * const can1_groups[] = {
 -	"can1_data",
 -};
-+	PINMUX_IPSR_GPSR(IP6_19_16,	D9),
-+	PINMUX_IPSR_GPSR(IP6_19_16,	LCDOUT1),
-+	PINMUX_IPSR_MSEL(IP6_19_16,	MSIOF2_SYNC_D,		SEL_MSIOF2_3),
-+	PINMUX_IPSR_MSEL(IP6_19_16,	VI4_DATA1_A,		SEL_VIN4_0),
-+	PINMUX_IPSR_GPSR(IP6_19_16,	DU_DR1),
- 
+-
 -static const char * const can_clk_groups[] = {
 -	"can_clk",
 -};
-+	PINMUX_IPSR_GPSR(IP6_23_20,	D10),
-+	PINMUX_IPSR_GPSR(IP6_23_20,	LCDOUT2),
-+	PINMUX_IPSR_MSEL(IP6_23_20,	MSIOF2_RXD_D,		SEL_MSIOF2_3),
-+	PINMUX_IPSR_MSEL(IP6_23_20,	HRX3_B,			SEL_HSCIF3_1),
-+	PINMUX_IPSR_MSEL(IP6_23_20,	VI4_DATA2_A,		SEL_VIN4_0),
-+	PINMUX_IPSR_MSEL(IP6_23_20,	CTS4_N_C,		SEL_SCIF4_2),
-+	PINMUX_IPSR_GPSR(IP6_23_20,	DU_DR2),
- 
+-
 -static const char * const canfd0_groups[] = {
 -	"canfd0_data_a",
 -	"canfd0_data_b",
 -};
-+	PINMUX_IPSR_GPSR(IP6_27_24,	D11),
-+	PINMUX_IPSR_GPSR(IP6_27_24,	LCDOUT3),
-+	PINMUX_IPSR_MSEL(IP6_27_24,	MSIOF2_TXD_D,		SEL_MSIOF2_3),
-+	PINMUX_IPSR_MSEL(IP6_27_24,	HTX3_B,			SEL_HSCIF3_1),
-+	PINMUX_IPSR_MSEL(IP6_27_24,	VI4_DATA3_A,		SEL_VIN4_0),
-+	PINMUX_IPSR_MSEL(IP6_27_24,	RTS4_N_TANS_C,		SEL_SCIF4_2),
-+	PINMUX_IPSR_GPSR(IP6_27_24,	DU_DR3),
- 
+-
 -static const char * const canfd1_groups[] = {
 -	"canfd1_data",
 -};
-+	PINMUX_IPSR_GPSR(IP6_31_28,	D12),
-+	PINMUX_IPSR_GPSR(IP6_31_28,	LCDOUT4),
-+	PINMUX_IPSR_MSEL(IP6_31_28,	MSIOF2_SS1_D,		SEL_MSIOF2_3),
-+	PINMUX_IPSR_MSEL(IP6_31_28,	RX4_C,			SEL_SCIF4_2),
-+	PINMUX_IPSR_MSEL(IP6_31_28,	VI4_DATA4_A,		SEL_VIN4_0),
-+	PINMUX_IPSR_GPSR(IP6_31_28,	DU_DR4),
- 
+-
 -static const char * const drif0_groups[] = {
 -	"drif0_ctrl_a",
 -	"drif0_data0_a",
@@ -9631,14 +9825,7 @@
 -	"drif0_data0_c",
 -	"drif0_data1_c",
 -};
-+	/* IPSR7 */
-+	PINMUX_IPSR_GPSR(IP7_3_0,	D13),
-+	PINMUX_IPSR_GPSR(IP7_3_0,	LCDOUT5),
-+	PINMUX_IPSR_MSEL(IP7_3_0,	MSIOF2_SS2_D,		SEL_MSIOF2_3),
-+	PINMUX_IPSR_MSEL(IP7_3_0,	TX4_C,			SEL_SCIF4_2),
-+	PINMUX_IPSR_MSEL(IP7_3_0,	VI4_DATA5_A,		SEL_VIN4_0),
-+	PINMUX_IPSR_GPSR(IP7_3_0,	DU_DR5),
- 
+-
 -static const char * const drif1_groups[] = {
 -	"drif1_ctrl_a",
 -	"drif1_data0_a",
@@ -9650,14 +9837,7 @@
 -	"drif1_data0_c",
 -	"drif1_data1_c",
 -};
-+	PINMUX_IPSR_GPSR(IP7_7_4,	D14),
-+	PINMUX_IPSR_GPSR(IP7_7_4,	LCDOUT6),
-+	PINMUX_IPSR_MSEL(IP7_7_4,	MSIOF3_SS1_A,		SEL_MSIOF3_0),
-+	PINMUX_IPSR_MSEL(IP7_7_4,	HRX3_C,			SEL_HSCIF3_2),
-+	PINMUX_IPSR_MSEL(IP7_7_4,	VI4_DATA6_A,		SEL_VIN4_0),
-+	PINMUX_IPSR_GPSR(IP7_7_4,	DU_DR6),
-+	PINMUX_IPSR_MSEL(IP7_7_4,	SCL6_C,			SEL_I2C6_2),
- 
+-
 -static const char * const drif2_groups[] = {
 -	"drif2_ctrl_a",
 -	"drif2_data0_a",
@@ -9666,14 +9846,7 @@
 -	"drif2_data0_b",
 -	"drif2_data1_b",
 -};
-+	PINMUX_IPSR_GPSR(IP7_11_8,	D15),
-+	PINMUX_IPSR_GPSR(IP7_11_8,	LCDOUT7),
-+	PINMUX_IPSR_MSEL(IP7_11_8,	MSIOF3_SS2_A,		SEL_MSIOF3_0),
-+	PINMUX_IPSR_MSEL(IP7_11_8,	HTX3_C,			SEL_HSCIF3_2),
-+	PINMUX_IPSR_MSEL(IP7_11_8,	VI4_DATA7_A,		SEL_VIN4_0),
-+	PINMUX_IPSR_GPSR(IP7_11_8,	DU_DR7),
-+	PINMUX_IPSR_MSEL(IP7_11_8,	SDA6_C,			SEL_I2C6_2),
- 
+-
 -static const char * const drif3_groups[] = {
 -	"drif3_ctrl_a",
 -	"drif3_data0_a",
@@ -9682,8 +9855,7 @@
 -	"drif3_data0_b",
 -	"drif3_data1_b",
 -};
-+	PINMUX_IPSR_GPSR(IP7_15_12,	FSCLKST),
- 
+-
 -static const char * const du_groups[] = {
 -	"du_rgb666",
 -	"du_rgb888",
@@ -9694,19 +9866,13 @@
 -	"du_cde",
 -	"du_disp",
 -};
-+	PINMUX_IPSR_GPSR(IP7_19_16,	SD0_CLK),
-+	PINMUX_IPSR_MSEL(IP7_19_16,	MSIOF1_SCK_E,		SEL_MSIOF1_4),
-+	PINMUX_IPSR_MSEL(IP7_19_16,	STP_OPWM_0_B,		SEL_SSP1_0_1),
- 
+-
 -static const char * const hscif0_groups[] = {
 -	"hscif0_data",
 -	"hscif0_clk",
 -	"hscif0_ctrl",
 -};
-+	PINMUX_IPSR_GPSR(IP7_23_20,	SD0_CMD),
-+	PINMUX_IPSR_MSEL(IP7_23_20,	MSIOF1_SYNC_E,		SEL_MSIOF1_4),
-+	PINMUX_IPSR_MSEL(IP7_23_20,	STP_IVCXO27_0_B,	SEL_SSP1_0_1),
- 
+-
 -static const char * const hscif1_groups[] = {
 -	"hscif1_data_a",
 -	"hscif1_clk_a",
@@ -9715,11 +9881,7 @@
 -	"hscif1_clk_b",
 -	"hscif1_ctrl_b",
 -};
-+	PINMUX_IPSR_GPSR(IP7_27_24,	SD0_DAT0),
-+	PINMUX_IPSR_MSEL(IP7_27_24,	MSIOF1_RXD_E,		SEL_MSIOF1_4),
-+	PINMUX_IPSR_MSEL(IP7_27_24,	TS_SCK0_B,		SEL_TSIF0_1),
-+	PINMUX_IPSR_MSEL(IP7_27_24,	STP_ISCLK_0_B,		SEL_SSP1_0_1),
- 
+-
 -static const char * const hscif2_groups[] = {
 -	"hscif2_data_a",
 -	"hscif2_clk_a",
@@ -9728,11 +9890,7 @@
 -	"hscif2_clk_b",
 -	"hscif2_ctrl_b",
 -};
-+	PINMUX_IPSR_GPSR(IP7_31_28,	SD0_DAT1),
-+	PINMUX_IPSR_MSEL(IP7_31_28,	MSIOF1_TXD_E,		SEL_MSIOF1_4),
-+	PINMUX_IPSR_MSEL(IP7_31_28,	TS_SPSYNC0_B,		SEL_TSIF0_1),
-+	PINMUX_IPSR_MSEL(IP7_31_28,	STP_ISSYNC_0_B,		SEL_SSP1_0_1),
- 
+-
 -static const char * const hscif3_groups[] = {
 -	"hscif3_data_a",
 -	"hscif3_clk",
@@ -9741,53 +9899,30 @@
 -	"hscif3_data_c",
 -	"hscif3_data_d",
 -};
-+	/* IPSR8 */
-+	PINMUX_IPSR_GPSR(IP8_3_0,	SD0_DAT2),
-+	PINMUX_IPSR_MSEL(IP8_3_0,	MSIOF1_SS1_E,		SEL_MSIOF1_4),
-+	PINMUX_IPSR_MSEL(IP8_3_0,	TS_SDAT0_B,		SEL_TSIF0_1),
-+	PINMUX_IPSR_MSEL(IP8_3_0,	STP_ISD_0_B,		SEL_SSP1_0_1),
- 
+-
 -static const char * const hscif4_groups[] = {
 -	"hscif4_data_a",
 -	"hscif4_clk",
 -	"hscif4_ctrl",
 -	"hscif4_data_b",
 -};
-+	PINMUX_IPSR_GPSR(IP8_7_4,	SD0_DAT3),
-+	PINMUX_IPSR_MSEL(IP8_7_4,	MSIOF1_SS2_E,		SEL_MSIOF1_4),
-+	PINMUX_IPSR_MSEL(IP8_7_4,	TS_SDEN0_B,		SEL_TSIF0_1),
-+	PINMUX_IPSR_MSEL(IP8_7_4,	STP_ISEN_0_B,		SEL_SSP1_0_1),
- 
+-
 -static const char * const i2c1_groups[] = {
 -	"i2c1_a",
 -	"i2c1_b",
 -};
-+	PINMUX_IPSR_GPSR(IP8_11_8,	SD1_CLK),
-+	PINMUX_IPSR_MSEL(IP8_11_8,	MSIOF1_SCK_G,		SEL_MSIOF1_6),
-+	PINMUX_IPSR_MSEL(IP8_11_8,	SIM0_CLK_A,		SEL_SIMCARD_0),
- 
+-
 -static const char * const i2c2_groups[] = {
 -	"i2c2_a",
 -	"i2c2_b",
 -};
-+	PINMUX_IPSR_GPSR(IP8_15_12,	SD1_CMD),
-+	PINMUX_IPSR_MSEL(IP8_15_12,	MSIOF1_SYNC_G,		SEL_MSIOF1_6),
-+	PINMUX_IPSR_MSEL(IP8_15_12,	NFCE_N_B,		SEL_NDF_1),
-+	PINMUX_IPSR_MSEL(IP8_15_12,	SIM0_D_A,		SEL_SIMCARD_0),
-+	PINMUX_IPSR_MSEL(IP8_15_12,	STP_IVCXO27_1_B,	SEL_SSP1_1_1),
- 
+-
 -static const char * const i2c6_groups[] = {
 -	"i2c6_a",
 -	"i2c6_b",
 -	"i2c6_c",
 -};
-+	PINMUX_IPSR_GPSR(IP8_19_16,	SD1_DAT0),
-+	PINMUX_IPSR_GPSR(IP8_19_16,	SD2_DAT4),
-+	PINMUX_IPSR_MSEL(IP8_19_16,	MSIOF1_RXD_G,		SEL_MSIOF1_6),
-+	PINMUX_IPSR_MSEL(IP8_19_16,	NFWP_N_B,		SEL_NDF_1),
-+	PINMUX_IPSR_MSEL(IP8_19_16,	TS_SCK1_B,		SEL_TSIF1_1),
-+	PINMUX_IPSR_MSEL(IP8_19_16,	STP_ISCLK_1_B,		SEL_SSP1_1_1),
- 
+-
 -static const char * const intc_ex_groups[] = {
 -	"intc_ex_irq0",
 -	"intc_ex_irq1",
@@ -9796,13 +9931,7 @@
 -	"intc_ex_irq4",
 -	"intc_ex_irq5",
 -};
-+	PINMUX_IPSR_GPSR(IP8_23_20,	SD1_DAT1),
-+	PINMUX_IPSR_GPSR(IP8_23_20,	SD2_DAT5),
-+	PINMUX_IPSR_MSEL(IP8_23_20,	MSIOF1_TXD_G,		SEL_MSIOF1_6),
-+	PINMUX_IPSR_MSEL(IP8_23_20,	NFDATA14_B,		SEL_NDF_1),
-+	PINMUX_IPSR_MSEL(IP8_23_20,	TS_SPSYNC1_B,		SEL_TSIF1_1),
-+	PINMUX_IPSR_MSEL(IP8_23_20,	STP_ISSYNC_1_B,		SEL_SSP1_1_1),
- 
+-
 -static const char * const msiof0_groups[] = {
 -	"msiof0_clk",
 -	"msiof0_sync",
@@ -9811,13 +9940,7 @@
 -	"msiof0_txd",
 -	"msiof0_rxd",
 -};
-+	PINMUX_IPSR_GPSR(IP8_27_24,	SD1_DAT2),
-+	PINMUX_IPSR_GPSR(IP8_27_24,	SD2_DAT6),
-+	PINMUX_IPSR_MSEL(IP8_27_24,	MSIOF1_SS1_G,		SEL_MSIOF1_6),
-+	PINMUX_IPSR_MSEL(IP8_27_24,	NFDATA15_B,		SEL_NDF_1),
-+	PINMUX_IPSR_MSEL(IP8_27_24,	TS_SDAT1_B,		SEL_TSIF1_1),
-+	PINMUX_IPSR_MSEL(IP8_27_24,	STP_ISD_1_B,		SEL_SSP1_1_1),
- 
+-
 -static const char * const msiof1_groups[] = {
 -	"msiof1_clk_a",
 -	"msiof1_sync_a",
@@ -9862,13 +9985,7 @@
 -	"msiof1_txd_g",
 -	"msiof1_rxd_g",
 -};
-+	PINMUX_IPSR_GPSR(IP8_31_28,	SD1_DAT3),
-+	PINMUX_IPSR_GPSR(IP8_31_28,	SD2_DAT7),
-+	PINMUX_IPSR_MSEL(IP8_31_28,	MSIOF1_SS2_G,		SEL_MSIOF1_6),
-+	PINMUX_IPSR_MSEL(IP8_31_28,	NFRB_N_B,		SEL_NDF_1),
-+	PINMUX_IPSR_MSEL(IP8_31_28,	TS_SDEN1_B,		SEL_TSIF1_1),
-+	PINMUX_IPSR_MSEL(IP8_31_28,	STP_ISEN_1_B,		SEL_SSP1_1_1),
- 
+-
 -static const char * const msiof2_groups[] = {
 -	"msiof2_clk_a",
 -	"msiof2_sync_a",
@@ -9895,10 +10012,7 @@
 -	"msiof2_txd_d",
 -	"msiof2_rxd_d",
 -};
-+	/* IPSR9 */
-+	PINMUX_IPSR_GPSR(IP9_3_0,	SD2_CLK),
-+	PINMUX_IPSR_GPSR(IP9_3_0,	NFDATA8),
- 
+-
 -static const char * const msiof3_groups[] = {
 -	"msiof3_clk_a",
 -	"msiof3_sync_a",
@@ -9922,119 +10036,84 @@
 -	"msiof3_txd_d",
 -	"msiof3_rxd_d",
 -};
-+	PINMUX_IPSR_GPSR(IP9_7_4,	SD2_CMD),
-+	PINMUX_IPSR_GPSR(IP9_7_4,	NFDATA9),
- 
+-
 -static const char * const pwm0_groups[] = {
 -	"pwm0",
 -};
-+	PINMUX_IPSR_GPSR(IP9_11_8,	SD2_DAT0),
-+	PINMUX_IPSR_GPSR(IP9_11_8,	NFDATA10),
- 
+-
 -static const char * const pwm1_groups[] = {
 -	"pwm1_a",
 -	"pwm1_b",
 -};
-+	PINMUX_IPSR_GPSR(IP9_15_12,	SD2_DAT1),
-+	PINMUX_IPSR_GPSR(IP9_15_12,	NFDATA11),
- 
+-
 -static const char * const pwm2_groups[] = {
 -	"pwm2_a",
 -	"pwm2_b",
 -};
-+	PINMUX_IPSR_GPSR(IP9_19_16,	SD2_DAT2),
-+	PINMUX_IPSR_GPSR(IP9_19_16,	NFDATA12),
- 
+-
 -static const char * const pwm3_groups[] = {
 -	"pwm3_a",
 -	"pwm3_b",
 -};
-+	PINMUX_IPSR_GPSR(IP9_23_20,	SD2_DAT3),
-+	PINMUX_IPSR_GPSR(IP9_23_20,	NFDATA13),
- 
+-
 -static const char * const pwm4_groups[] = {
 -	"pwm4_a",
 -	"pwm4_b",
 -};
-+	PINMUX_IPSR_GPSR(IP9_27_24,	SD2_DS),
-+	PINMUX_IPSR_GPSR(IP9_27_24,	NFALE),
-+	PINMUX_IPSR_GPSR(IP9_27_24,	SATA_DEVSLP_B),
- 
+-
 -static const char * const pwm5_groups[] = {
 -	"pwm5_a",
 -	"pwm5_b",
 -};
-+	PINMUX_IPSR_GPSR(IP9_31_28,	SD3_CLK),
-+	PINMUX_IPSR_GPSR(IP9_31_28,	NFWE_N),
- 
+-
 -static const char * const pwm6_groups[] = {
 -	"pwm6_a",
 -	"pwm6_b",
 -};
-+	/* IPSR10 */
-+	PINMUX_IPSR_GPSR(IP10_3_0,	SD3_CMD),
-+	PINMUX_IPSR_GPSR(IP10_3_0,	NFRE_N),
- 
+-
 -static const char * const qspi0_groups[] = {
 -	"qspi0_ctrl",
 -	"qspi0_data2",
 -	"qspi0_data4",
 -};
-+	PINMUX_IPSR_GPSR(IP10_7_4,	SD3_DAT0),
-+	PINMUX_IPSR_GPSR(IP10_7_4,	NFDATA0),
- 
+-
 -static const char * const qspi1_groups[] = {
 -	"qspi1_ctrl",
 -	"qspi1_data2",
 -	"qspi1_data4",
 -};
-+	PINMUX_IPSR_GPSR(IP10_11_8,	SD3_DAT1),
-+	PINMUX_IPSR_GPSR(IP10_11_8,	NFDATA1),
- 
+-
 -static const char * const sata0_groups[] = {
 -	"sata0_devslp_a",
 -	"sata0_devslp_b",
 -};
-+	PINMUX_IPSR_GPSR(IP10_15_12,	SD3_DAT2),
-+	PINMUX_IPSR_GPSR(IP10_15_12,	NFDATA2),
- 
+-
 -static const char * const scif0_groups[] = {
 -	"scif0_data",
 -	"scif0_clk",
 -	"scif0_ctrl",
 -};
-+	PINMUX_IPSR_GPSR(IP10_19_16,	SD3_DAT3),
-+	PINMUX_IPSR_GPSR(IP10_19_16,	NFDATA3),
- 
+-
 -static const char * const scif1_groups[] = {
 -	"scif1_data_a",
 -	"scif1_clk",
 -	"scif1_ctrl",
 -	"scif1_data_b",
 -};
-+	PINMUX_IPSR_GPSR(IP10_23_20,	SD3_DAT4),
-+	PINMUX_IPSR_MSEL(IP10_23_20,	SD2_CD_A,		SEL_SDHI2_0),
-+	PINMUX_IPSR_GPSR(IP10_23_20,	NFDATA4),
- 
+-
 -static const char * const scif2_groups[] = {
 -	"scif2_data_a",
 -	"scif2_clk",
 -	"scif2_data_b",
 -};
-+	PINMUX_IPSR_GPSR(IP10_27_24,	SD3_DAT5),
-+	PINMUX_IPSR_MSEL(IP10_27_24,	SD2_WP_A,		SEL_SDHI2_0),
-+	PINMUX_IPSR_GPSR(IP10_27_24,	NFDATA5),
- 
+-
 -static const char * const scif3_groups[] = {
 -	"scif3_data_a",
 -	"scif3_clk",
 -	"scif3_ctrl",
 -	"scif3_data_b",
 -};
-+	PINMUX_IPSR_GPSR(IP10_31_28,	SD3_DAT6),
-+	PINMUX_IPSR_GPSR(IP10_31_28,	SD3_CD),
-+	PINMUX_IPSR_GPSR(IP10_31_28,	NFDATA6),
- 
+-
 -static const char * const scif4_groups[] = {
 -	"scif4_data_a",
 -	"scif4_clk_a",
@@ -10046,173 +10125,17 @@
 -	"scif4_clk_c",
 -	"scif4_ctrl_c",
 -};
-+	/* IPSR11 */
-+	PINMUX_IPSR_GPSR(IP11_3_0,	SD3_DAT7),
-+	PINMUX_IPSR_GPSR(IP11_3_0,	SD3_WP),
-+	PINMUX_IPSR_GPSR(IP11_3_0,	NFDATA7),
-+
-+	PINMUX_IPSR_GPSR(IP11_7_4,	SD3_DS),
-+	PINMUX_IPSR_GPSR(IP11_7_4,	NFCLE),
-+
-+	PINMUX_IPSR_GPSR(IP11_11_8,	SD0_CD),
-+	PINMUX_IPSR_MSEL(IP11_11_8,	SCL2_B,			SEL_I2C2_1),
-+	PINMUX_IPSR_MSEL(IP11_11_8,	SIM0_RST_A,		SEL_SIMCARD_0),
-+
-+	PINMUX_IPSR_GPSR(IP11_15_12,	SD0_WP),
-+	PINMUX_IPSR_MSEL(IP11_15_12,	SDA2_B,			SEL_I2C2_1),
-+
-+	PINMUX_IPSR_GPSR(IP11_19_16,	SD1_CD),
-+	PINMUX_IPSR_MSEL(IP11_19_16,	SIM0_CLK_B,		SEL_SIMCARD_1),
-+
-+	PINMUX_IPSR_GPSR(IP11_23_20,	SD1_WP),
-+	PINMUX_IPSR_MSEL(IP11_23_20,	SIM0_D_B,		SEL_SIMCARD_1),
-+
-+	PINMUX_IPSR_GPSR(IP11_27_24,	SCK0),
-+	PINMUX_IPSR_MSEL(IP11_27_24,	HSCK1_B,		SEL_HSCIF1_1),
-+	PINMUX_IPSR_MSEL(IP11_27_24,	MSIOF1_SS2_B,		SEL_MSIOF1_1),
-+	PINMUX_IPSR_MSEL(IP11_27_24,	AUDIO_CLKC_B,		SEL_ADG_C_1),
-+	PINMUX_IPSR_MSEL(IP11_27_24,	SDA2_A,			SEL_I2C2_0),
-+	PINMUX_IPSR_MSEL(IP11_27_24,	SIM0_RST_B,		SEL_SIMCARD_1),
-+	PINMUX_IPSR_MSEL(IP11_27_24,	STP_OPWM_0_C,		SEL_SSP1_0_2),
-+	PINMUX_IPSR_MSEL(IP11_27_24,	RIF0_CLK_B,		SEL_DRIF0_1),
-+	PINMUX_IPSR_GPSR(IP11_27_24,	ADICHS2),
-+	PINMUX_IPSR_MSEL(IP11_27_24,	SCK5_B,			SEL_SCIF5_1),
-+
-+	PINMUX_IPSR_GPSR(IP11_31_28,	RX0),
-+	PINMUX_IPSR_MSEL(IP11_31_28,	HRX1_B,			SEL_HSCIF1_1),
-+	PINMUX_IPSR_MSEL(IP11_31_28,	TS_SCK0_C,		SEL_TSIF0_2),
-+	PINMUX_IPSR_MSEL(IP11_31_28,	STP_ISCLK_0_C,		SEL_SSP1_0_2),
-+	PINMUX_IPSR_MSEL(IP11_31_28,	RIF0_D0_B,		SEL_DRIF0_1),
- 
+-
 -static const char * const scif5_groups[] = {
 -	"scif5_data",
 -	"scif5_clk",
 -};
-+	/* IPSR12 */
-+	PINMUX_IPSR_GPSR(IP12_3_0,	TX0),
-+	PINMUX_IPSR_MSEL(IP12_3_0,	HTX1_B,			SEL_HSCIF1_1),
-+	PINMUX_IPSR_MSEL(IP12_3_0,	TS_SPSYNC0_C,		SEL_TSIF0_2),
-+	PINMUX_IPSR_MSEL(IP12_3_0,	STP_ISSYNC_0_C,		SEL_SSP1_0_2),
-+	PINMUX_IPSR_MSEL(IP12_3_0,	RIF0_D1_B,		SEL_DRIF0_1),
-+
-+	PINMUX_IPSR_GPSR(IP12_7_4,	CTS0_N),
-+	PINMUX_IPSR_MSEL(IP12_7_4,	HCTS1_N_B,		SEL_HSCIF1_1),
-+	PINMUX_IPSR_MSEL(IP12_7_4,	MSIOF1_SYNC_B,		SEL_MSIOF1_1),
-+	PINMUX_IPSR_MSEL(IP12_7_4,	TS_SPSYNC1_C,		SEL_TSIF1_2),
-+	PINMUX_IPSR_MSEL(IP12_7_4,	STP_ISSYNC_1_C,		SEL_SSP1_1_2),
-+	PINMUX_IPSR_MSEL(IP12_7_4,	RIF1_SYNC_B,		SEL_DRIF1_1),
-+	PINMUX_IPSR_GPSR(IP12_7_4,	AUDIO_CLKOUT_C),
-+	PINMUX_IPSR_GPSR(IP12_7_4,	ADICS_SAMP),
-+
-+	PINMUX_IPSR_GPSR(IP12_11_8,	RTS0_N_TANS),
-+	PINMUX_IPSR_MSEL(IP12_11_8,	HRTS1_N_B,		SEL_HSCIF1_1),
-+	PINMUX_IPSR_MSEL(IP12_11_8,	MSIOF1_SS1_B,		SEL_MSIOF1_1),
-+	PINMUX_IPSR_MSEL(IP12_11_8,	AUDIO_CLKA_B,		SEL_ADG_A_1),
-+	PINMUX_IPSR_MSEL(IP12_11_8,	SCL2_A,			SEL_I2C2_0),
-+	PINMUX_IPSR_MSEL(IP12_11_8,	STP_IVCXO27_1_C,	SEL_SSP1_1_2),
-+	PINMUX_IPSR_MSEL(IP12_11_8,	RIF0_SYNC_B,		SEL_DRIF0_1),
-+	PINMUX_IPSR_GPSR(IP12_11_8,	ADICHS1),
-+
-+	PINMUX_IPSR_MSEL(IP12_15_12,	RX1_A,			SEL_SCIF1_0),
-+	PINMUX_IPSR_MSEL(IP12_15_12,	HRX1_A,			SEL_HSCIF1_0),
-+	PINMUX_IPSR_MSEL(IP12_15_12,	TS_SDAT0_C,		SEL_TSIF0_2),
-+	PINMUX_IPSR_MSEL(IP12_15_12,	STP_ISD_0_C,		SEL_SSP1_0_2),
-+	PINMUX_IPSR_MSEL(IP12_15_12,	RIF1_CLK_C,		SEL_DRIF1_2),
-+
-+	PINMUX_IPSR_MSEL(IP12_19_16,	TX1_A,			SEL_SCIF1_0),
-+	PINMUX_IPSR_MSEL(IP12_19_16,	HTX1_A,			SEL_HSCIF1_0),
-+	PINMUX_IPSR_MSEL(IP12_19_16,	TS_SDEN0_C,		SEL_TSIF0_2),
-+	PINMUX_IPSR_MSEL(IP12_19_16,	STP_ISEN_0_C,		SEL_SSP1_0_2),
-+	PINMUX_IPSR_MSEL(IP12_19_16,	RIF1_D0_C,		SEL_DRIF1_2),
-+
-+	PINMUX_IPSR_GPSR(IP12_23_20,	CTS1_N),
-+	PINMUX_IPSR_MSEL(IP12_23_20,	HCTS1_N_A,		SEL_HSCIF1_0),
-+	PINMUX_IPSR_MSEL(IP12_23_20,	MSIOF1_RXD_B,		SEL_MSIOF1_1),
-+	PINMUX_IPSR_MSEL(IP12_23_20,	TS_SDEN1_C,		SEL_TSIF1_2),
-+	PINMUX_IPSR_MSEL(IP12_23_20,	STP_ISEN_1_C,		SEL_SSP1_1_2),
-+	PINMUX_IPSR_MSEL(IP12_23_20,	RIF1_D0_B,		SEL_DRIF1_1),
-+	PINMUX_IPSR_GPSR(IP12_23_20,	ADIDATA),
-+
-+	PINMUX_IPSR_GPSR(IP12_27_24,	RTS1_N_TANS),
-+	PINMUX_IPSR_MSEL(IP12_27_24,	HRTS1_N_A,		SEL_HSCIF1_0),
-+	PINMUX_IPSR_MSEL(IP12_27_24,	MSIOF1_TXD_B,		SEL_MSIOF1_1),
-+	PINMUX_IPSR_MSEL(IP12_27_24,	TS_SDAT1_C,		SEL_TSIF1_2),
-+	PINMUX_IPSR_MSEL(IP12_27_24,	STP_ISD_1_C,		SEL_SSP1_1_2),
-+	PINMUX_IPSR_MSEL(IP12_27_24,	RIF1_D1_B,		SEL_DRIF1_1),
-+	PINMUX_IPSR_GPSR(IP12_27_24,	ADICHS0),
-+
-+	PINMUX_IPSR_GPSR(IP12_31_28,	SCK2),
-+	PINMUX_IPSR_MSEL(IP12_31_28,	SCIF_CLK_B,		SEL_SCIF1_1),
-+	PINMUX_IPSR_MSEL(IP12_31_28,	MSIOF1_SCK_B,		SEL_MSIOF1_1),
-+	PINMUX_IPSR_MSEL(IP12_31_28,	TS_SCK1_C,		SEL_TSIF1_2),
-+	PINMUX_IPSR_MSEL(IP12_31_28,	STP_ISCLK_1_C,		SEL_SSP1_1_2),
-+	PINMUX_IPSR_MSEL(IP12_31_28,	RIF1_CLK_B,		SEL_DRIF1_1),
-+	PINMUX_IPSR_GPSR(IP12_31_28,	ADICLK),
- 
+-
 -static const char * const scif_clk_groups[] = {
 -	"scif_clk_a",
 -	"scif_clk_b",
 -};
-+	/* IPSR13 */
-+	PINMUX_IPSR_MSEL(IP13_3_0,	TX2_A,			SEL_SCIF2_0),
-+	PINMUX_IPSR_MSEL(IP13_3_0,	SD2_CD_B,		SEL_SDHI2_1),
-+	PINMUX_IPSR_MSEL(IP13_3_0,	SCL1_A,			SEL_I2C1_0),
-+	PINMUX_IPSR_MSEL(IP13_3_0,	FMCLK_A,		SEL_FM_0),
-+	PINMUX_IPSR_MSEL(IP13_3_0,	RIF1_D1_C,		SEL_DRIF1_2),
-+	PINMUX_IPSR_GPSR(IP13_3_0,	FSO_CFE_0_N),
-+
-+	PINMUX_IPSR_MSEL(IP13_7_4,	RX2_A,			SEL_SCIF2_0),
-+	PINMUX_IPSR_MSEL(IP13_7_4,	SD2_WP_B,		SEL_SDHI2_1),
-+	PINMUX_IPSR_MSEL(IP13_7_4,	SDA1_A,			SEL_I2C1_0),
-+	PINMUX_IPSR_MSEL(IP13_7_4,	FMIN_A,			SEL_FM_0),
-+	PINMUX_IPSR_MSEL(IP13_7_4,	RIF1_SYNC_C,		SEL_DRIF1_2),
-+	PINMUX_IPSR_GPSR(IP13_7_4,	FSO_CFE_1_N),
-+
-+	PINMUX_IPSR_GPSR(IP13_11_8,	HSCK0),
-+	PINMUX_IPSR_MSEL(IP13_11_8,	MSIOF1_SCK_D,		SEL_MSIOF1_3),
-+	PINMUX_IPSR_MSEL(IP13_11_8,	AUDIO_CLKB_A,		SEL_ADG_B_0),
-+	PINMUX_IPSR_MSEL(IP13_11_8,	SSI_SDATA1_B,		SEL_SSI_1),
-+	PINMUX_IPSR_MSEL(IP13_11_8,	TS_SCK0_D,		SEL_TSIF0_3),
-+	PINMUX_IPSR_MSEL(IP13_11_8,	STP_ISCLK_0_D,		SEL_SSP1_0_3),
-+	PINMUX_IPSR_MSEL(IP13_11_8,	RIF0_CLK_C,		SEL_DRIF0_2),
-+	PINMUX_IPSR_MSEL(IP13_11_8,	RX5_B,			SEL_SCIF5_1),
-+
-+	PINMUX_IPSR_GPSR(IP13_15_12,	HRX0),
-+	PINMUX_IPSR_MSEL(IP13_15_12,	MSIOF1_RXD_D,		SEL_MSIOF1_3),
-+	PINMUX_IPSR_MSEL(IP13_15_12,	SSI_SDATA2_B,		SEL_SSI_1),
-+	PINMUX_IPSR_MSEL(IP13_15_12,	TS_SDEN0_D,		SEL_TSIF0_3),
-+	PINMUX_IPSR_MSEL(IP13_15_12,	STP_ISEN_0_D,		SEL_SSP1_0_3),
-+	PINMUX_IPSR_MSEL(IP13_15_12,	RIF0_D0_C,		SEL_DRIF0_2),
-+
-+	PINMUX_IPSR_GPSR(IP13_19_16,	HTX0),
-+	PINMUX_IPSR_MSEL(IP13_19_16,	MSIOF1_TXD_D,		SEL_MSIOF1_3),
-+	PINMUX_IPSR_MSEL(IP13_19_16,	SSI_SDATA9_B,		SEL_SSI_1),
-+	PINMUX_IPSR_MSEL(IP13_19_16,	TS_SDAT0_D,		SEL_TSIF0_3),
-+	PINMUX_IPSR_MSEL(IP13_19_16,	STP_ISD_0_D,		SEL_SSP1_0_3),
-+	PINMUX_IPSR_MSEL(IP13_19_16,	RIF0_D1_C,		SEL_DRIF0_2),
-+
-+	PINMUX_IPSR_GPSR(IP13_23_20,	HCTS0_N),
-+	PINMUX_IPSR_MSEL(IP13_23_20,	RX2_B,			SEL_SCIF2_1),
-+	PINMUX_IPSR_MSEL(IP13_23_20,	MSIOF1_SYNC_D,		SEL_MSIOF1_3),
-+	PINMUX_IPSR_MSEL(IP13_23_20,	SSI_SCK9_A,		SEL_SSI_0),
-+	PINMUX_IPSR_MSEL(IP13_23_20,	TS_SPSYNC0_D,		SEL_TSIF0_3),
-+	PINMUX_IPSR_MSEL(IP13_23_20,	STP_ISSYNC_0_D,		SEL_SSP1_0_3),
-+	PINMUX_IPSR_MSEL(IP13_23_20,	RIF0_SYNC_C,		SEL_DRIF0_2),
-+	PINMUX_IPSR_GPSR(IP13_23_20,	AUDIO_CLKOUT1_A),
-+
-+	PINMUX_IPSR_GPSR(IP13_27_24,	HRTS0_N),
-+	PINMUX_IPSR_MSEL(IP13_27_24,	TX2_B,			SEL_SCIF2_1),
-+	PINMUX_IPSR_MSEL(IP13_27_24,	MSIOF1_SS1_D,		SEL_MSIOF1_3),
-+	PINMUX_IPSR_MSEL(IP13_27_24,	SSI_WS9_A,		SEL_SSI_0),
-+	PINMUX_IPSR_MSEL(IP13_27_24,	STP_IVCXO27_0_D,	SEL_SSP1_0_3),
-+	PINMUX_IPSR_MSEL(IP13_27_24,	BPFCLK_A,		SEL_FM_0),
-+	PINMUX_IPSR_GPSR(IP13_27_24,	AUDIO_CLKOUT2_A),
-+
-+	PINMUX_IPSR_GPSR(IP13_31_28,	MSIOF0_SYNC),
-+	PINMUX_IPSR_GPSR(IP13_31_28,	AUDIO_CLKOUT_A),
-+	PINMUX_IPSR_MSEL(IP13_31_28,	TX5_B,			SEL_SCIF5_1),
-+	PINMUX_IPSR_MSEL(IP13_31_28,	BPFCLK_D,		SEL_FM_3),
- 
+-
 -static const char * const sdhi0_groups[] = {
 -	"sdhi0_data1",
 -	"sdhi0_data4",
@@ -10220,47 +10143,7 @@
 -	"sdhi0_cd",
 -	"sdhi0_wp",
 -};
-+	/* IPSR14 */
-+	PINMUX_IPSR_GPSR(IP14_3_0,	MSIOF0_SS1),
-+	PINMUX_IPSR_MSEL(IP14_3_0,	RX5_A,			SEL_SCIF5_0),
-+	PINMUX_IPSR_MSEL(IP14_3_0,	NFWP_N_A,		SEL_NDF_0),
-+	PINMUX_IPSR_MSEL(IP14_3_0,	AUDIO_CLKA_C,		SEL_ADG_A_2),
-+	PINMUX_IPSR_MSEL(IP14_3_0,	SSI_SCK2_A,		SEL_SSI_0),
-+	PINMUX_IPSR_MSEL(IP14_3_0,	STP_IVCXO27_0_C,	SEL_SSP1_0_2),
-+	PINMUX_IPSR_GPSR(IP14_3_0,	AUDIO_CLKOUT3_A),
-+	PINMUX_IPSR_MSEL(IP14_3_0,	TCLK1_B,		SEL_TIMER_TMU_1),
-+
-+	PINMUX_IPSR_GPSR(IP14_7_4,	MSIOF0_SS2),
-+	PINMUX_IPSR_MSEL(IP14_7_4,	TX5_A,			SEL_SCIF5_0),
-+	PINMUX_IPSR_MSEL(IP14_7_4,	MSIOF1_SS2_D,		SEL_MSIOF1_3),
-+	PINMUX_IPSR_MSEL(IP14_7_4,	AUDIO_CLKC_A,		SEL_ADG_C_0),
-+	PINMUX_IPSR_MSEL(IP14_7_4,	SSI_WS2_A,		SEL_SSI_0),
-+	PINMUX_IPSR_MSEL(IP14_7_4,	STP_OPWM_0_D,		SEL_SSP1_0_3),
-+	PINMUX_IPSR_GPSR(IP14_7_4,	AUDIO_CLKOUT_D),
-+	PINMUX_IPSR_MSEL(IP14_7_4,	SPEEDIN_B,		SEL_SPEED_PULSE_1),
-+
-+	PINMUX_IPSR_GPSR(IP14_11_8,	MLB_CLK),
-+	PINMUX_IPSR_MSEL(IP14_11_8,	MSIOF1_SCK_F,		SEL_MSIOF1_5),
-+	PINMUX_IPSR_MSEL(IP14_11_8,	SCL1_B,			SEL_I2C1_1),
-+
-+	PINMUX_IPSR_GPSR(IP14_15_12,	MLB_SIG),
-+	PINMUX_IPSR_MSEL(IP14_15_12,	RX1_B,			SEL_SCIF1_1),
-+	PINMUX_IPSR_MSEL(IP14_15_12,	MSIOF1_SYNC_F,		SEL_MSIOF1_5),
-+	PINMUX_IPSR_MSEL(IP14_15_12,	SDA1_B,			SEL_I2C1_1),
-+
-+	PINMUX_IPSR_GPSR(IP14_19_16,	MLB_DAT),
-+	PINMUX_IPSR_MSEL(IP14_19_16,	TX1_B,			SEL_SCIF1_1),
-+	PINMUX_IPSR_MSEL(IP14_19_16,	MSIOF1_RXD_F,		SEL_MSIOF1_5),
-+
-+	PINMUX_IPSR_GPSR(IP14_23_20,	SSI_SCK01239),
-+	PINMUX_IPSR_MSEL(IP14_23_20,	MSIOF1_TXD_F,		SEL_MSIOF1_5),
-+
-+	PINMUX_IPSR_GPSR(IP14_27_24,	SSI_WS01239),
-+	PINMUX_IPSR_MSEL(IP14_27_24,	MSIOF1_SS1_F,		SEL_MSIOF1_5),
-+
-+	PINMUX_IPSR_GPSR(IP14_31_28,	SSI_SDATA0),
-+	PINMUX_IPSR_MSEL(IP14_31_28,	MSIOF1_SS2_F,		SEL_MSIOF1_5),
- 
+-
 -static const char * const sdhi1_groups[] = {
 -	"sdhi1_data1",
 -	"sdhi1_data4",
@@ -10268,53 +10151,7 @@
 -	"sdhi1_cd",
 -	"sdhi1_wp",
 -};
-+	/* IPSR15 */
-+	PINMUX_IPSR_MSEL(IP15_3_0,	SSI_SDATA1_A,		SEL_SSI_0),
-+
-+	PINMUX_IPSR_MSEL(IP15_7_4,	SSI_SDATA2_A,		SEL_SSI_0),
-+	PINMUX_IPSR_MSEL(IP15_7_4,	SSI_SCK1_B,		SEL_SSI_1),
-+
-+	PINMUX_IPSR_GPSR(IP15_11_8,	SSI_SCK34),
-+	PINMUX_IPSR_MSEL(IP15_11_8,	MSIOF1_SS1_A,		SEL_MSIOF1_0),
-+	PINMUX_IPSR_MSEL(IP15_11_8,	STP_OPWM_0_A,		SEL_SSP1_0_0),
-+
-+	PINMUX_IPSR_GPSR(IP15_15_12,	SSI_WS34),
-+	PINMUX_IPSR_MSEL(IP15_15_12,	HCTS2_N_A,		SEL_HSCIF2_0),
-+	PINMUX_IPSR_MSEL(IP15_15_12,	MSIOF1_SS2_A,		SEL_MSIOF1_0),
-+	PINMUX_IPSR_MSEL(IP15_15_12,	STP_IVCXO27_0_A,	SEL_SSP1_0_0),
-+
-+	PINMUX_IPSR_GPSR(IP15_19_16,	SSI_SDATA3),
-+	PINMUX_IPSR_MSEL(IP15_19_16,	HRTS2_N_A,		SEL_HSCIF2_0),
-+	PINMUX_IPSR_MSEL(IP15_19_16,	MSIOF1_TXD_A,		SEL_MSIOF1_0),
-+	PINMUX_IPSR_MSEL(IP15_19_16,	TS_SCK0_A,		SEL_TSIF0_0),
-+	PINMUX_IPSR_MSEL(IP15_19_16,	STP_ISCLK_0_A,		SEL_SSP1_0_0),
-+	PINMUX_IPSR_MSEL(IP15_19_16,	RIF0_D1_A,		SEL_DRIF0_0),
-+	PINMUX_IPSR_MSEL(IP15_19_16,	RIF2_D0_A,		SEL_DRIF2_0),
-+
-+	PINMUX_IPSR_GPSR(IP15_23_20,	SSI_SCK4),
-+	PINMUX_IPSR_MSEL(IP15_23_20,	HRX2_A,			SEL_HSCIF2_0),
-+	PINMUX_IPSR_MSEL(IP15_23_20,	MSIOF1_SCK_A,		SEL_MSIOF1_0),
-+	PINMUX_IPSR_MSEL(IP15_23_20,	TS_SDAT0_A,		SEL_TSIF0_0),
-+	PINMUX_IPSR_MSEL(IP15_23_20,	STP_ISD_0_A,		SEL_SSP1_0_0),
-+	PINMUX_IPSR_MSEL(IP15_23_20,	RIF0_CLK_A,		SEL_DRIF0_0),
-+	PINMUX_IPSR_MSEL(IP15_23_20,	RIF2_CLK_A,		SEL_DRIF2_0),
-+
-+	PINMUX_IPSR_GPSR(IP15_27_24,	SSI_WS4),
-+	PINMUX_IPSR_MSEL(IP15_27_24,	HTX2_A,			SEL_HSCIF2_0),
-+	PINMUX_IPSR_MSEL(IP15_27_24,	MSIOF1_SYNC_A,		SEL_MSIOF1_0),
-+	PINMUX_IPSR_MSEL(IP15_27_24,	TS_SDEN0_A,		SEL_TSIF0_0),
-+	PINMUX_IPSR_MSEL(IP15_27_24,	STP_ISEN_0_A,		SEL_SSP1_0_0),
-+	PINMUX_IPSR_MSEL(IP15_27_24,	RIF0_SYNC_A,		SEL_DRIF0_0),
-+	PINMUX_IPSR_MSEL(IP15_27_24,	RIF2_SYNC_A,		SEL_DRIF2_0),
-+
-+	PINMUX_IPSR_GPSR(IP15_31_28,	SSI_SDATA4),
-+	PINMUX_IPSR_MSEL(IP15_31_28,	HSCK2_A,		SEL_HSCIF2_0),
-+	PINMUX_IPSR_MSEL(IP15_31_28,	MSIOF1_RXD_A,		SEL_MSIOF1_0),
-+	PINMUX_IPSR_MSEL(IP15_31_28,	TS_SPSYNC0_A,		SEL_TSIF0_0),
-+	PINMUX_IPSR_MSEL(IP15_31_28,	STP_ISSYNC_0_A,		SEL_SSP1_0_0),
-+	PINMUX_IPSR_MSEL(IP15_31_28,	RIF0_D0_A,		SEL_DRIF0_0),
-+	PINMUX_IPSR_MSEL(IP15_31_28,	RIF2_D1_A,		SEL_DRIF2_0),
- 
+-
 -static const char * const sdhi2_groups[] = {
 -	"sdhi2_data1",
 -	"sdhi2_data4",
@@ -10326,61 +10163,7 @@
 -	"sdhi2_wp_b",
 -	"sdhi2_ds",
 -};
-+	/* IPSR16 */
-+	PINMUX_IPSR_GPSR(IP16_3_0,	SSI_SCK6),
-+	PINMUX_IPSR_GPSR(IP16_3_0,	USB2_PWEN),
-+	PINMUX_IPSR_MSEL(IP16_3_0,	SIM0_RST_D,		SEL_SIMCARD_3),
-+
-+	PINMUX_IPSR_GPSR(IP16_7_4,	SSI_WS6),
-+	PINMUX_IPSR_GPSR(IP16_7_4,	USB2_OVC),
-+	PINMUX_IPSR_MSEL(IP16_7_4,	SIM0_D_D,		SEL_SIMCARD_3),
-+
-+	PINMUX_IPSR_GPSR(IP16_11_8,	SSI_SDATA6),
-+	PINMUX_IPSR_MSEL(IP16_11_8,	SIM0_CLK_D,		SEL_SIMCARD_3),
-+	PINMUX_IPSR_GPSR(IP16_11_8,	SATA_DEVSLP_A),
-+
-+	PINMUX_IPSR_GPSR(IP16_15_12,	SSI_SCK78),
-+	PINMUX_IPSR_MSEL(IP16_15_12,	HRX2_B,			SEL_HSCIF2_1),
-+	PINMUX_IPSR_MSEL(IP16_15_12,	MSIOF1_SCK_C,		SEL_MSIOF1_2),
-+	PINMUX_IPSR_MSEL(IP16_15_12,	TS_SCK1_A,		SEL_TSIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_15_12,	STP_ISCLK_1_A,		SEL_SSP1_1_0),
-+	PINMUX_IPSR_MSEL(IP16_15_12,	RIF1_CLK_A,		SEL_DRIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_15_12,	RIF3_CLK_A,		SEL_DRIF3_0),
-+
-+	PINMUX_IPSR_GPSR(IP16_19_16,	SSI_WS78),
-+	PINMUX_IPSR_MSEL(IP16_19_16,	HTX2_B,			SEL_HSCIF2_1),
-+	PINMUX_IPSR_MSEL(IP16_19_16,	MSIOF1_SYNC_C,		SEL_MSIOF1_2),
-+	PINMUX_IPSR_MSEL(IP16_19_16,	TS_SDAT1_A,		SEL_TSIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_19_16,	STP_ISD_1_A,		SEL_SSP1_1_0),
-+	PINMUX_IPSR_MSEL(IP16_19_16,	RIF1_SYNC_A,		SEL_DRIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_19_16,	RIF3_SYNC_A,		SEL_DRIF3_0),
-+
-+	PINMUX_IPSR_GPSR(IP16_23_20,	SSI_SDATA7),
-+	PINMUX_IPSR_MSEL(IP16_23_20,	HCTS2_N_B,		SEL_HSCIF2_1),
-+	PINMUX_IPSR_MSEL(IP16_23_20,	MSIOF1_RXD_C,		SEL_MSIOF1_2),
-+	PINMUX_IPSR_MSEL(IP16_23_20,	TS_SDEN1_A,		SEL_TSIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_23_20,	STP_ISEN_1_A,		SEL_SSP1_1_0),
-+	PINMUX_IPSR_MSEL(IP16_23_20,	RIF1_D0_A,		SEL_DRIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_23_20,	RIF3_D0_A,		SEL_DRIF3_0),
-+	PINMUX_IPSR_MSEL(IP16_23_20,	TCLK2_A,		SEL_TIMER_TMU_0),
-+
-+	PINMUX_IPSR_GPSR(IP16_27_24,	SSI_SDATA8),
-+	PINMUX_IPSR_MSEL(IP16_27_24,	HRTS2_N_B,		SEL_HSCIF2_1),
-+	PINMUX_IPSR_MSEL(IP16_27_24,	MSIOF1_TXD_C,		SEL_MSIOF1_2),
-+	PINMUX_IPSR_MSEL(IP16_27_24,	TS_SPSYNC1_A,		SEL_TSIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_27_24,	STP_ISSYNC_1_A,		SEL_SSP1_1_0),
-+	PINMUX_IPSR_MSEL(IP16_27_24,	RIF1_D1_A,		SEL_DRIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_27_24,	RIF3_D1_A,		SEL_DRIF3_0),
-+
-+	PINMUX_IPSR_MSEL(IP16_31_28,	SSI_SDATA9_A,		SEL_SSI_0),
-+	PINMUX_IPSR_MSEL(IP16_31_28,	HSCK2_B,		SEL_HSCIF2_1),
-+	PINMUX_IPSR_MSEL(IP16_31_28,	MSIOF1_SS1_C,		SEL_MSIOF1_2),
-+	PINMUX_IPSR_MSEL(IP16_31_28,	HSCK1_A,		SEL_HSCIF1_0),
-+	PINMUX_IPSR_MSEL(IP16_31_28,	SSI_WS1_B,		SEL_SSI_1),
-+	PINMUX_IPSR_GPSR(IP16_31_28,	SCK1),
-+	PINMUX_IPSR_MSEL(IP16_31_28,	STP_IVCXO27_1_A,	SEL_SSP1_1_0),
-+	PINMUX_IPSR_GPSR(IP16_31_28,	SCK5_A),
- 
+-
 -static const char * const sdhi3_groups[] = {
 -	"sdhi3_data1",
 -	"sdhi3_data4",
@@ -10390,94 +10173,7 @@
 -	"sdhi3_wp",
 -	"sdhi3_ds",
 -};
-+	/* IPSR17 */
-+	PINMUX_IPSR_MSEL(IP17_3_0,	AUDIO_CLKA_A,		SEL_ADG_A_0),
-+	PINMUX_IPSR_GPSR(IP17_3_0,	CC5_OSCOUT),
-+
-+	PINMUX_IPSR_MSEL(IP17_7_4,	AUDIO_CLKB_B,		SEL_ADG_B_1),
-+	PINMUX_IPSR_MSEL(IP17_7_4,	SCIF_CLK_A,		SEL_SCIF1_0),
-+	PINMUX_IPSR_MSEL(IP17_7_4,	STP_IVCXO27_1_D,	SEL_SSP1_1_3),
-+	PINMUX_IPSR_MSEL(IP17_7_4,	REMOCON_A,		SEL_REMOCON_0),
-+	PINMUX_IPSR_MSEL(IP17_7_4,	TCLK1_A,		SEL_TIMER_TMU_0),
-+
-+	PINMUX_IPSR_GPSR(IP17_11_8,	USB0_PWEN),
-+	PINMUX_IPSR_MSEL(IP17_11_8,	SIM0_RST_C,		SEL_SIMCARD_2),
-+	PINMUX_IPSR_MSEL(IP17_11_8,	TS_SCK1_D,		SEL_TSIF1_3),
-+	PINMUX_IPSR_MSEL(IP17_11_8,	STP_ISCLK_1_D,		SEL_SSP1_1_3),
-+	PINMUX_IPSR_MSEL(IP17_11_8,	BPFCLK_B,		SEL_FM_1),
-+	PINMUX_IPSR_MSEL(IP17_11_8,	RIF3_CLK_B,		SEL_DRIF3_1),
-+	PINMUX_IPSR_MSEL(IP17_11_8,	HSCK2_C,		SEL_HSCIF2_2),
-+
-+	PINMUX_IPSR_GPSR(IP17_15_12,	USB0_OVC),
-+	PINMUX_IPSR_MSEL(IP17_15_12,	SIM0_D_C,		SEL_SIMCARD_2),
-+	PINMUX_IPSR_MSEL(IP17_15_12,	TS_SDAT1_D,		SEL_TSIF1_3),
-+	PINMUX_IPSR_MSEL(IP17_15_12,	STP_ISD_1_D,		SEL_SSP1_1_3),
-+	PINMUX_IPSR_MSEL(IP17_15_12,	RIF3_SYNC_B,		SEL_DRIF3_1),
-+	PINMUX_IPSR_MSEL(IP17_15_12,	HRX2_C,			SEL_HSCIF2_2),
-+
-+	PINMUX_IPSR_GPSR(IP17_19_16,	USB1_PWEN),
-+	PINMUX_IPSR_MSEL(IP17_19_16,	SIM0_CLK_C,		SEL_SIMCARD_2),
-+	PINMUX_IPSR_MSEL(IP17_19_16,	SSI_SCK1_A,		SEL_SSI_0),
-+	PINMUX_IPSR_MSEL(IP17_19_16,	TS_SCK0_E,		SEL_TSIF0_4),
-+	PINMUX_IPSR_MSEL(IP17_19_16,	STP_ISCLK_0_E,		SEL_SSP1_0_4),
-+	PINMUX_IPSR_MSEL(IP17_19_16,	FMCLK_B,		SEL_FM_1),
-+	PINMUX_IPSR_MSEL(IP17_19_16,	RIF2_CLK_B,		SEL_DRIF2_1),
-+	PINMUX_IPSR_MSEL(IP17_19_16,	SPEEDIN_A,		SEL_SPEED_PULSE_0),
-+	PINMUX_IPSR_MSEL(IP17_19_16,	HTX2_C,			SEL_HSCIF2_2),
-+
-+	PINMUX_IPSR_GPSR(IP17_23_20,	USB1_OVC),
-+	PINMUX_IPSR_MSEL(IP17_23_20,	MSIOF1_SS2_C,		SEL_MSIOF1_2),
-+	PINMUX_IPSR_MSEL(IP17_23_20,	SSI_WS1_A,		SEL_SSI_0),
-+	PINMUX_IPSR_MSEL(IP17_23_20,	TS_SDAT0_E,		SEL_TSIF0_4),
-+	PINMUX_IPSR_MSEL(IP17_23_20,	STP_ISD_0_E,		SEL_SSP1_0_4),
-+	PINMUX_IPSR_MSEL(IP17_23_20,	FMIN_B,			SEL_FM_1),
-+	PINMUX_IPSR_MSEL(IP17_23_20,	RIF2_SYNC_B,		SEL_DRIF2_1),
-+	PINMUX_IPSR_MSEL(IP17_23_20,	REMOCON_B,		SEL_REMOCON_1),
-+	PINMUX_IPSR_MSEL(IP17_23_20,	HCTS2_N_C,		SEL_HSCIF2_2),
-+
-+	PINMUX_IPSR_GPSR(IP17_27_24,	USB30_PWEN),
-+	PINMUX_IPSR_GPSR(IP17_27_24,	AUDIO_CLKOUT_B),
-+	PINMUX_IPSR_MSEL(IP17_27_24,	SSI_SCK2_B,		SEL_SSI_1),
-+	PINMUX_IPSR_MSEL(IP17_27_24,	TS_SDEN1_D,		SEL_TSIF1_3),
-+	PINMUX_IPSR_MSEL(IP17_27_24,	STP_ISEN_1_D,		SEL_SSP1_1_2),
-+	PINMUX_IPSR_MSEL(IP17_27_24,	STP_OPWM_0_E,		SEL_SSP1_0_4),
-+	PINMUX_IPSR_MSEL(IP17_27_24,	RIF3_D0_B,		SEL_DRIF3_1),
-+	PINMUX_IPSR_MSEL(IP17_27_24,	TCLK2_B,		SEL_TIMER_TMU_1),
-+	PINMUX_IPSR_GPSR(IP17_27_24,	TPU0TO0),
-+	PINMUX_IPSR_MSEL(IP17_27_24,	BPFCLK_C,		SEL_FM_2),
-+	PINMUX_IPSR_MSEL(IP17_27_24,	HRTS2_N_C,		SEL_HSCIF2_2),
-+
-+	PINMUX_IPSR_GPSR(IP17_31_28,	USB30_OVC),
-+	PINMUX_IPSR_GPSR(IP17_31_28,	AUDIO_CLKOUT1_B),
-+	PINMUX_IPSR_MSEL(IP17_31_28,	SSI_WS2_B,		SEL_SSI_1),
-+	PINMUX_IPSR_MSEL(IP17_31_28,	TS_SPSYNC1_D,		SEL_TSIF1_3),
-+	PINMUX_IPSR_MSEL(IP17_31_28,	STP_ISSYNC_1_D,		SEL_SSP1_1_3),
-+	PINMUX_IPSR_MSEL(IP17_31_28,	STP_IVCXO27_0_E,	SEL_SSP1_0_4),
-+	PINMUX_IPSR_MSEL(IP17_31_28,	RIF3_D1_B,		SEL_DRIF3_1),
-+	PINMUX_IPSR_GPSR(IP17_31_28,	FSO_TOE_N),
-+	PINMUX_IPSR_GPSR(IP17_31_28,	TPU0TO1),
-+
-+	/* IPSR18 */
-+	PINMUX_IPSR_GPSR(IP18_3_0,	USB3_PWEN),
-+	PINMUX_IPSR_GPSR(IP18_3_0,	AUDIO_CLKOUT2_B),
-+	PINMUX_IPSR_MSEL(IP18_3_0,	SSI_SCK9_B,		SEL_SSI_1),
-+	PINMUX_IPSR_MSEL(IP18_3_0,	TS_SDEN0_E,		SEL_TSIF0_4),
-+	PINMUX_IPSR_MSEL(IP18_3_0,	STP_ISEN_0_E,		SEL_SSP1_0_4),
-+	PINMUX_IPSR_MSEL(IP18_3_0,	RIF2_D0_B,		SEL_DRIF2_1),
-+	PINMUX_IPSR_GPSR(IP18_3_0,	TPU0TO2),
-+	PINMUX_IPSR_MSEL(IP18_3_0,	FMCLK_C,		SEL_FM_2),
-+	PINMUX_IPSR_MSEL(IP18_3_0,	FMCLK_D,		SEL_FM_3),
-+
-+	PINMUX_IPSR_GPSR(IP18_7_4,	USB3_OVC),
-+	PINMUX_IPSR_GPSR(IP18_7_4,	AUDIO_CLKOUT3_B),
-+	PINMUX_IPSR_MSEL(IP18_7_4,	SSI_WS9_B,		SEL_SSI_1),
-+	PINMUX_IPSR_MSEL(IP18_7_4,	TS_SPSYNC0_E,		SEL_TSIF0_4),
-+	PINMUX_IPSR_MSEL(IP18_7_4,	STP_ISSYNC_0_E,		SEL_SSP1_0_4),
-+	PINMUX_IPSR_MSEL(IP18_7_4,	RIF2_D1_B,		SEL_DRIF2_1),
-+	PINMUX_IPSR_GPSR(IP18_7_4,	TPU0TO3),
-+	PINMUX_IPSR_MSEL(IP18_7_4,	FMIN_C,			SEL_FM_2),
-+	PINMUX_IPSR_MSEL(IP18_7_4,	FMIN_D,			SEL_FM_3),
- 
+-
 -static const char * const ssi_groups[] = {
 -	"ssi0_data",
 -	"ssi01239_ctrl",
@@ -10504,91 +10200,18 @@
 -	"ssi9_data_b",
 -	"ssi9_ctrl_a",
 -	"ssi9_ctrl_b",
-+/*
-+ * Static pins can not be muxed between different functions but
-+ * still needs a mark entry in the pinmux list. Add each static
-+ * pin to the list without an associated function. The sh-pfc
-+ * core will do the right thing and skip trying to mux then pin
-+ * while still applying configuration to it
-+ */
-+#define FM(x)	PINMUX_DATA(x##_MARK, 0),
-+	PINMUX_STATIC
-+#undef FM
- };
- 
+-};
+-
 -static const char * const usb0_groups[] = {
 -	"usb0",
 -};
-+/*
-+ * R8A7795 has 8 banks with 32 PGIOS in each => 256 GPIOs.
-+ * Physical layout rows: A - AW, cols: 1 - 39.
-+ */
-+#define ROW_GROUP_A(r) ('Z' - 'A' + 1 + (r))
-+#define PIN_NUMBER(r, c) (((r) - 'A') * 39 + (c) + 300)
-+#define PIN_A_NUMBER(r, c) PIN_NUMBER(ROW_GROUP_A(r), c)
-+
-+static const struct sh_pfc_pin pinmux_pins[] = {
-+	PINMUX_GPIO_GP_ALL(),
- 
+-
 -static const char * const usb1_groups[] = {
 -	"usb1",
-+	/*
-+	 * Pins not associated with a GPIO port.
-+	 *
-+	 * The pin positions are different between different r8a7795
-+	 * packages, all that is needed for the pfc driver is a unique
-+	 * number for each pin. To this end use the pin layout from
-+	 * R-Car H3SiP to calculate a unique number for each pin.
-+	 */
-+	SH_PFC_PIN_NAMED_CFG('A',  8, AVB_TX_CTL, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('A',  9, AVB_MDIO, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('A', 12, AVB_TXCREFCLK, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('A', 13, AVB_RD0, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('A', 14, AVB_RD2, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('A', 16, AVB_RX_CTL, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('A', 17, AVB_TD2, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('A', 18, AVB_TD0, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('A', 19, AVB_TXC, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('B', 13, AVB_RD1, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('B', 14, AVB_RD3, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('B', 17, AVB_TD3, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('B', 18, AVB_TD1, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('B', 19, AVB_RXC, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('C',  1, PRESETOUT#, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('F',  1, CLKOUT, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('H', 37, MLB_REF, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('V',  3, QSPI1_SPCLK, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('V',  5, QSPI1_SSL, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('V',  6, RPC_WP#, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('V',  7, RPC_RESET#, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('W',  3, QSPI0_SPCLK, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('Y',  3, QSPI0_SSL, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('Y',  6, QSPI0_IO2, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG('Y',  7, RPC_INT#, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('B'),  4, QSPI0_MISO_IO1, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('B'),  6, QSPI0_IO3, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('C'),  3, QSPI1_IO3, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('C'),  5, QSPI0_MOSI_IO0, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('C'),  7, QSPI1_MOSI_IO0, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('D'), 38, FSCLKST#, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('D'), 39, EXTALR, SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('E'),  4, QSPI1_IO2, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('E'),  5, QSPI1_MISO_IO1, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('P'),  7, DU_DOTCLKIN0, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('P'),  8, DU_DOTCLKIN1, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'),  7, DU_DOTCLKIN2, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'),  8, DU_DOTCLKIN3, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'), 26, TRST#, SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'), 29, TDI, SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('R'), 30, TMS, CFG_FLAGS),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('T'), 27, TCK, SH_PFC_PIN_CFG_PULL_UP | SH_PFC_PIN_CFG_PULL_DOWN),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('T'), 28, TDO, SH_PFC_PIN_CFG_DRIVE_STRENGTH),
-+	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('T'), 30, ASEBRK, CFG_FLAGS),
- };
- 
+-};
+-
 -static const char * const usb2_groups[] = {
 -	"usb2",
-+static const struct sh_pfc_pin_group pinmux_groups[] = {
  };
  
  static const struct sh_pfc_function pinmux_functions[] = {
@@ -10645,7 +10268,7 @@
  };
  
  static const struct pinmux_cfg_reg pinmux_config_regs[] = {
-@@ -5041,46 +2033,54 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
+@@ -5041,46 +2033,54 @@ static const struct pinmux_cfg_reg pinmu
  		IP16_3_0 }
  	},
  	{ PINMUX_CFG_REG("IPSR17", 0xe6060244, 32, 4) {
@@ -10722,7 +10345,7 @@
  	},
  	{ PINMUX_CFG_REG_VAR("MOD_SEL1", 0xe6060504, 32,
  			     2, 3, 1, 2, 3, 1, 1, 2, 1,
-@@ -5110,22 +2110,22 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
+@@ -5110,22 +2110,22 @@ static const struct pinmux_cfg_reg pinmu
  		MOD_SEL1_0 }
  	},
  	{ PINMUX_CFG_REG_VAR("MOD_SEL2", 0xe6060508, 32,
@@ -10757,7 +10380,7 @@
  		/* RESERVED 15, 14, 13, 12 */
  		0, 0, 0, 0, 0, 0, 0, 0,
  		0, 0, 0, 0, 0, 0, 0, 0,
-@@ -5135,10 +2135,8 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
+@@ -5135,10 +2135,8 @@ static const struct pinmux_cfg_reg pinmu
  		/* RESERVED 7, 6, 5, 4 */
  		0, 0, 0, 0, 0, 0, 0, 0,
  		0, 0, 0, 0, 0, 0, 0, 0,
@@ -10770,7 +10393,7 @@
  		MOD_SEL2_0 }
  	},
  	{ },
-@@ -5387,8 +2385,8 @@ static const struct pinmux_drive_reg pinmux_drive_regs[] = {
+@@ -5387,8 +2385,8 @@ static const struct pinmux_drive_reg pin
  		{ RCAR_GP_PIN(6, 27), 20, 3 },	/* USB1_OVC */
  		{ RCAR_GP_PIN(6, 28), 16, 3 },	/* USB30_PWEN */
  		{ RCAR_GP_PIN(6, 29), 12, 3 },	/* USB30_OVC */
@@ -10781,7 +10404,7 @@
  	} },
  	{ },
  };
-@@ -5618,8 +2616,8 @@ static const struct sh_pfc_bias_info bias_info[] = {
+@@ -5618,8 +2616,8 @@ static const struct sh_pfc_bias_info bia
  	{ RCAR_GP_PIN(5, 21),    PU5,  1 },	/* MSIOF0_SS2 */
  	{ RCAR_GP_PIN(5, 20),    PU5,  0 },	/* MSIOF0_TXD */
  
@@ -10792,7 +10415,7 @@
  	{ RCAR_GP_PIN(6, 29),    PU6,  4 },	/* USB30_OVC */
  	{ RCAR_GP_PIN(6, 28),    PU6,  3 },	/* USB30_PWEN */
  	{ RCAR_GP_PIN(6, 27),    PU6,  2 },	/* USB1_OVC */
-@@ -5676,14 +2674,28 @@ static void r8a7795_pinmux_set_bias(struct sh_pfc *pfc, unsigned int pin,
+@@ -5676,14 +2674,28 @@ static void r8a7795_pinmux_set_bias(stru
  	sh_pfc_write_reg(pfc, PUEN + reg, 32, enable);
  }
  
@@ -10822,11 +10445,9 @@
  	.ops = &r8a7795_pinmux_ops,
  	.unlock_reg = 0xe6060000, /* PMMR */
  
-diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
-index e42cc7a8d10e..f31eb6c1e87d 100644
 --- a/drivers/pinctrl/sh-pfc/sh_pfc.h
 +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
-@@ -267,6 +267,7 @@ extern const struct sh_pfc_soc_info r8a7792_pinmux_info;
+@@ -267,6 +267,7 @@ extern const struct sh_pfc_soc_info r8a7
  extern const struct sh_pfc_soc_info r8a7793_pinmux_info;
  extern const struct sh_pfc_soc_info r8a7794_pinmux_info;
  extern const struct sh_pfc_soc_info r8a7795_pinmux_info;
@@ -10834,6 +10455,3 @@
  extern const struct sh_pfc_soc_info r8a7796_pinmux_info;
  extern const struct sh_pfc_soc_info sh7203_pinmux_info;
  extern const struct sh_pfc_soc_info sh7264_pinmux_info;
--- 
-2.13.3
-
diff --git a/patches.renesas/0166-pinctrl-sh-pfc-r8a7795-Add-SCIF-support.patch b/patches.renesas/0166-pinctrl-sh-pfc-r8a7795-Add-SCIF-support.patch
index a6e56be..241c7ff 100644
--- a/patches.renesas/0166-pinctrl-sh-pfc-r8a7795-Add-SCIF-support.patch
+++ b/patches.renesas/0166-pinctrl-sh-pfc-r8a7795-Add-SCIF-support.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit e7ad4d3c1dd9dd6881d4470dd6586d5cc84b8e0c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 275 +++++++++++++++++++++++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c |  275 +++++++++++++++++++++++++++++++++++
  1 file changed, 275 insertions(+)
 
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-index 6caaed53938c..996cacee99c3 100644
 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
 +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-@@ -1576,10 +1576,285 @@ static const struct sh_pfc_pin pinmux_pins[] = {
+@@ -1576,10 +1576,285 @@ static const struct sh_pfc_pin pinmux_pi
  	SH_PFC_PIN_NAMED_CFG(ROW_GROUP_A('T'), 30, ASEBRK, CFG_FLAGS),
  };
  
@@ -306,6 +304,3 @@
  };
  
  static const struct pinmux_cfg_reg pinmux_config_regs[] = {
--- 
-2.13.3
-
diff --git a/patches.renesas/0167-pinctrl-sh-pfc-r8a7795-Add-SCIF_CLK-support.patch b/patches.renesas/0167-pinctrl-sh-pfc-r8a7795-Add-SCIF_CLK-support.patch
index 4bac280..fd336ff 100644
--- a/patches.renesas/0167-pinctrl-sh-pfc-r8a7795-Add-SCIF_CLK-support.patch
+++ b/patches.renesas/0167-pinctrl-sh-pfc-r8a7795-Add-SCIF_CLK-support.patch
@@ -14,14 +14,12 @@
 (cherry picked from commit d14a39edf757f5bdd73cf25d0155d7cfb271e782)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 24 ++++++++++++++++++++++++
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c |   24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
 
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-index 996cacee99c3..0454f31c0831 100644
 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
 +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7795.c
-@@ -1773,6 +1773,22 @@ static const unsigned int scif5_clk_b_mux[] = {
+@@ -1773,6 +1773,22 @@ static const unsigned int scif5_clk_b_mu
  	SCK5_B_MARK,
  };
  
@@ -44,7 +42,7 @@
  static const struct sh_pfc_pin_group pinmux_groups[] = {
  	SH_PFC_PIN_GROUP(scif0_data),
  	SH_PFC_PIN_GROUP(scif0_clk),
-@@ -1801,6 +1817,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
+@@ -1801,6 +1817,8 @@ static const struct sh_pfc_pin_group pin
  	SH_PFC_PIN_GROUP(scif5_clk_a),
  	SH_PFC_PIN_GROUP(scif5_data_b),
  	SH_PFC_PIN_GROUP(scif5_clk_b),
@@ -53,7 +51,7 @@
  };
  
  static const char * const scif0_groups[] = {
-@@ -1848,6 +1866,11 @@ static const char * const scif5_groups[] = {
+@@ -1848,6 +1866,11 @@ static const char * const scif5_groups[]
  	"scif5_clk_b",
  };
  
@@ -65,7 +63,7 @@
  static const struct sh_pfc_function pinmux_functions[] = {
  	SH_PFC_FUNCTION(scif0),
  	SH_PFC_FUNCTION(scif1),
-@@ -1855,6 +1878,7 @@ static const struct sh_pfc_function pinmux_functions[] = {
+@@ -1855,6 +1878,7 @@ static const struct sh_pfc_function pinm
  	SH_PFC_FUNCTION(scif3),
  	SH_PFC_FUNCTION(scif4),
  	SH_PFC_FUNCTION(scif5),
@@ -73,6 +71,3 @@
  };
  
  static const struct pinmux_cfg_reg pinmux_config_regs[] = {
--- 
-2.13.3
-
diff --git a/patches.renesas/0168-pinctrl-sh-pfc-r8a7791-Add-missing-HSCIF1-pinmux-dat.patch b/patches.renesas/0168-pinctrl-sh-pfc-r8a7791-Add-missing-HSCIF1-pinmux-dat.patch
deleted file mode 100644
index 00c0d42..0000000
--- a/patches.renesas/0168-pinctrl-sh-pfc-r8a7791-Add-missing-HSCIF1-pinmux-dat.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 0e1c9e8e6eff51a650699a24a70559729ea01498 Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Wed, 29 Mar 2017 21:36:50 +0300
-Subject: [PATCH 168/286] pinctrl: sh-pfc: r8a7791: Add missing HSCIF1 pinmux
- data
-
-The R8A7791 PFC driver  was apparently based on the preliminary revisions
-of  the  user's manual, which  omitted the HSCIF1 group E signals in  the
-IPSR4 register description. This would cause HSCIF1's probe  to fail with
-the messages like below:
-
-sh-pfc e6060000.pfc: cannot locate data/mark enum_id for mark 1989
-sh-sci e62c8000.serial: Error applying setting, reverse things back
-sh-sci: probe of e62c8000.serial failed with error -22
-
-Add the neceassary PINMUX_IPSR_MSEL() invocations for the HSCK1_E,
-HCTS1#_E, and HRTS1#_E signals...
-
-Fixes: 508845196238 ("pinctrl: sh-pfc: r8a7791 PFC support")
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-(cherry picked from commit da7a692fbbab07f4e9798b5b52798f6e3256dd8f)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-index 841cecdca7ea..cc852e68162c 100644
---- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-@@ -1010,14 +1010,17 @@ static const u16 pinmux_data[] = {
- 	PINMUX_IPSR_MSEL(IP4_12_10, SCL2, SEL_IIC2_0),
- 	PINMUX_IPSR_MSEL(IP4_12_10, GPS_CLK_B, SEL_GPS_1),
- 	PINMUX_IPSR_MSEL(IP4_12_10, GLO_Q0_D, SEL_GPS_3),
-+	PINMUX_IPSR_MSEL(IP4_12_10, HSCK1_E, SEL_HSCIF1_4),
- 	PINMUX_IPSR_GPSR(IP4_15_13, SSI_WS2),
- 	PINMUX_IPSR_MSEL(IP4_15_13, SDA2, SEL_IIC2_0),
- 	PINMUX_IPSR_MSEL(IP4_15_13, GPS_SIGN_B, SEL_GPS_1),
- 	PINMUX_IPSR_MSEL(IP4_15_13, RX2_E, SEL_SCIF2_4),
- 	PINMUX_IPSR_MSEL(IP4_15_13, GLO_Q1_D, SEL_GPS_3),
-+	PINMUX_IPSR_MSEL(IP4_15_13, HCTS1_N_E, SEL_HSCIF1_4),
- 	PINMUX_IPSR_GPSR(IP4_18_16, SSI_SDATA2),
- 	PINMUX_IPSR_MSEL(IP4_18_16, GPS_MAG_B, SEL_GPS_1),
- 	PINMUX_IPSR_MSEL(IP4_18_16, TX2_E, SEL_SCIF2_4),
-+	PINMUX_IPSR_MSEL(IP4_18_16, HRTS1_N_E, SEL_HSCIF1_4),
- 	PINMUX_IPSR_GPSR(IP4_19, SSI_SCK34),
- 	PINMUX_IPSR_GPSR(IP4_20, SSI_WS34),
- 	PINMUX_IPSR_GPSR(IP4_21, SSI_SDATA3),
--- 
-2.13.3
-
diff --git a/patches.renesas/0169-pinctrl-sh-pfc-r8a7791-Add-missing-DVC_MUTE-signal.patch b/patches.renesas/0169-pinctrl-sh-pfc-r8a7791-Add-missing-DVC_MUTE-signal.patch
deleted file mode 100644
index aea58b7..0000000
--- a/patches.renesas/0169-pinctrl-sh-pfc-r8a7791-Add-missing-DVC_MUTE-signal.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From e623e96e9d8f94460fcb2488613e64c9583ca4d0 Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Wed, 29 Mar 2017 21:36:51 +0300
-Subject: [PATCH 169/286] pinctrl: sh-pfc: r8a7791: Add missing DVC_MUTE signal
-
-The R8A7791 PFC driver  was apparently based on the preliminary revisions
-of  the user's  manual, which  omitted the DVC_MUTE signal  altogether in
-the PFC section. The modern manual has the signal described,  so just add
-the necassary data to the driver...
-
-Fixes: 508845196238 ("pinctrl: sh-pfc: r8a7791 PFC support")
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-(cherry picked from commit 3908632fb829d73317c64c3d04f584b49f62e4ae)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-index cc852e68162c..41ac1a3b1964 100644
---- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-@@ -203,7 +203,7 @@ enum {
- 
- 	/* IPSR6 */
- 	FN_AUDIO_CLKB, FN_STP_OPWM_0_B, FN_MSIOF1_SCK_B,
--	FN_SCIF_CLK, FN_BPFCLK_E,
-+	FN_SCIF_CLK, FN_DVC_MUTE, FN_BPFCLK_E,
- 	FN_AUDIO_CLKC, FN_SCIFB0_SCK_C, FN_MSIOF1_SYNC_B, FN_RX2,
- 	FN_SCIFA2_RXD, FN_FMIN_E,
- 	FN_AUDIO_CLKOUT, FN_MSIOF1_SS1_B, FN_TX2, FN_SCIFA2_TXD,
-@@ -573,7 +573,7 @@ enum {
- 
- 	/* IPSR6 */
- 	AUDIO_CLKB_MARK, STP_OPWM_0_B_MARK, MSIOF1_SCK_B_MARK,
--	SCIF_CLK_MARK, BPFCLK_E_MARK,
-+	SCIF_CLK_MARK, DVC_MUTE_MARK, BPFCLK_E_MARK,
- 	AUDIO_CLKC_MARK, SCIFB0_SCK_C_MARK, MSIOF1_SYNC_B_MARK, RX2_MARK,
- 	SCIFA2_RXD_MARK, FMIN_E_MARK,
- 	AUDIO_CLKOUT_MARK, MSIOF1_SS1_B_MARK, TX2_MARK, SCIFA2_TXD_MARK,
-@@ -1093,6 +1093,7 @@ static const u16 pinmux_data[] = {
- 	PINMUX_IPSR_MSEL(IP6_2_0, STP_OPWM_0_B, SEL_SSP_1),
- 	PINMUX_IPSR_MSEL(IP6_2_0, MSIOF1_SCK_B, SEL_SOF1_1),
- 	PINMUX_IPSR_MSEL(IP6_2_0, SCIF_CLK, SEL_SCIF_0),
-+	PINMUX_IPSR_GPSR(IP6_2_0, DVC_MUTE),
- 	PINMUX_IPSR_MSEL(IP6_2_0, BPFCLK_E, SEL_FM_4),
- 	PINMUX_IPSR_GPSR(IP6_5_3, AUDIO_CLKC),
- 	PINMUX_IPSR_MSEL(IP6_5_3, SCIFB0_SCK_C, SEL_SCIFB_2),
-@@ -5899,7 +5900,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
- 		0, 0,
- 		/* IP6_2_0 [3] */
- 		FN_AUDIO_CLKB, FN_STP_OPWM_0_B, FN_MSIOF1_SCK_B,
--		FN_SCIF_CLK, 0, FN_BPFCLK_E,
-+		FN_SCIF_CLK, FN_DVC_MUTE, FN_BPFCLK_E,
- 		0, 0, }
- 	},
- 	{ PINMUX_CFG_REG_VAR("IPSR7", 0xE606003C, 32,
--- 
-2.13.3
-
diff --git a/patches.renesas/0170-pinctrl-sh-pfc-r8a7791-Fix-SCIF2-pinmux-data.patch b/patches.renesas/0170-pinctrl-sh-pfc-r8a7791-Fix-SCIF2-pinmux-data.patch
deleted file mode 100644
index c16ecb2..0000000
--- a/patches.renesas/0170-pinctrl-sh-pfc-r8a7791-Fix-SCIF2-pinmux-data.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6ccc9616097306424a0da7460e4a9042dc81fe58 Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Thu, 30 Mar 2017 23:20:48 +0300
-Subject: [PATCH 170/286] pinctrl: sh-pfc: r8a7791: Fix SCIF2 pinmux data
-
-PINMUX_IPSR_MSEL() macro invocation for the TX2 signal has apparently wrong
-1st argument -- most probably a result of cut&paste programming...
-
-Fixes: 508845196238 ("pinctrl: sh-pfc: r8a7791 PFC support")
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-(cherry picked from commit 58439280f84e6b39fd7d61f25ab30489c1aaf0a9)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-index 41ac1a3b1964..437238691d16 100644
---- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-@@ -1103,7 +1103,7 @@ static const u16 pinmux_data[] = {
- 	PINMUX_IPSR_MSEL(IP6_5_3, FMIN_E, SEL_FM_4),
- 	PINMUX_IPSR_GPSR(IP6_7_6, AUDIO_CLKOUT),
- 	PINMUX_IPSR_MSEL(IP6_7_6, MSIOF1_SS1_B, SEL_SOF1_1),
--	PINMUX_IPSR_MSEL(IP6_5_3, TX2, SEL_SCIF2_0),
-+	PINMUX_IPSR_MSEL(IP6_7_6, TX2, SEL_SCIF2_0),
- 	PINMUX_IPSR_MSEL(IP6_7_6, SCIFA2_TXD, SEL_SCIFA2_0),
- 	PINMUX_IPSR_GPSR(IP6_9_8, IRQ0),
- 	PINMUX_IPSR_MSEL(IP6_9_8, SCIFB1_RXD_D, SEL_SCIFB1_3),
--- 
-2.13.3
-
diff --git a/patches.renesas/0171-pinctrl-sh-pfc-r8a7791-Fix-IPSR-comment-typos.patch b/patches.renesas/0171-pinctrl-sh-pfc-r8a7791-Fix-IPSR-comment-typos.patch
index cd6eb55..301c85c 100644
--- a/patches.renesas/0171-pinctrl-sh-pfc-r8a7791-Fix-IPSR-comment-typos.patch
+++ b/patches.renesas/0171-pinctrl-sh-pfc-r8a7791-Fix-IPSR-comment-typos.patch
@@ -12,14 +12,12 @@
 (cherry picked from commit 0cbdc11482d72ad164e33ef7cc57b01e8b61e40d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 6 +++---
+ drivers/pinctrl/sh-pfc/pfc-r8a7791.c |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-index 437238691d16..2ed7eeb50aac 100644
 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
 +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7791.c
-@@ -5711,7 +5711,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
+@@ -5711,7 +5711,7 @@ static const struct pinmux_cfg_reg pinmu
  	},
  	{ PINMUX_CFG_REG_VAR("IPSR2", 0xE6060028, 32,
  			     2, 3, 2, 2, 2, 2, 3, 3, 3, 3, 2, 2, 3) {
@@ -28,7 +26,7 @@
  		0, 0, 0, 0,
  		/* IP2_29_27 [3] */
  		FN_EX_CS3_N, FN_ATADIR0_N, FN_MSIOF2_TXD,
-@@ -5731,7 +5731,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
+@@ -5731,7 +5731,7 @@ static const struct pinmux_cfg_reg pinmu
  		/* IP2_15_13 [3] */
  		FN_A24, FN_DREQ2, FN_IO3, FN_TX1, FN_SCIFA1_TXD,
  		0, 0, 0,
@@ -37,7 +35,7 @@
  		FN_A23, FN_IO2, FN_BPFCLK_B, FN_RX0, FN_SCIFA0_RXD,
  		0, 0, 0,
  		/* IP2_9_7 [3] */
-@@ -6042,7 +6042,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
+@@ -6042,7 +6042,7 @@ static const struct pinmux_cfg_reg pinmu
  		/* IP10_24_22 [3] */
  		FN_VI0_R1, FN_VI2_DATA2, FN_GLO_I1_B, FN_TS_SCK0_C, FN_ATAG1_N,
  		0, 0, 0,
@@ -46,6 +44,3 @@
  		FN_VI0_R0, FN_VI2_DATA1, FN_GLO_I0_B,
  		FN_TS_SDATA0_C, FN_ATACS11_N,
  		0, 0, 0,
--- 
-2.13.3
-
diff --git a/patches.renesas/0172-pinctrl-sh-pfc-r8a7794-Swap-ATA-signals.patch b/patches.renesas/0172-pinctrl-sh-pfc-r8a7794-Swap-ATA-signals.patch
deleted file mode 100644
index d6038b1..0000000
--- a/patches.renesas/0172-pinctrl-sh-pfc-r8a7794-Swap-ATA-signals.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 5fe6e9d9a8917a5ecdcabfc60c35b66136e40d28 Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Tue, 4 Apr 2017 23:20:16 +0300
-Subject: [PATCH 172/286] pinctrl: sh-pfc: r8a7794: Swap ATA signals
-
-All R8A7794 manuals I have here (0.50 and 1.10) agree that the PFC driver
-has ATAG0# and ATAWR0# signals in IPSR12 swapped -- fix this.
-
-Fixes: 43c4436e2f18 ("pinctrl: sh-pfc: add R8A7794 PFC support")
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
-(cherry picked from commit 5f4c8cafe1148f8a91287072815df8f0b66f0e5c)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
-index ed734f560c84..ef093ac0cf2f 100644
---- a/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
-+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7794.c
-@@ -281,8 +281,8 @@ enum {
- 	FN_AVB_AVTP_CAPTURE, FN_ETH_CRS_DV_B, FN_SSI_WS1, FN_SCIF1_TXD_B,
- 	FN_IIC1_SDA_C, FN_VI1_DATA0, FN_CAN0_TX_D, FN_AVB_AVTP_MATCH,
- 	FN_ETH_RX_ER_B, FN_SSI_SDATA1, FN_HSCIF1_HRX_B, FN_SDATA, FN_VI1_DATA1,
--	FN_ATAG0_N, FN_ETH_RXD0_B, FN_SSI_SCK2, FN_HSCIF1_HTX_B, FN_VI1_DATA2,
--	FN_MDATA, FN_ATAWR0_N, FN_ETH_RXD1_B,
-+	FN_ATAWR0_N, FN_ETH_RXD0_B, FN_SSI_SCK2, FN_HSCIF1_HTX_B, FN_VI1_DATA2,
-+	FN_MDATA, FN_ATAG0_N, FN_ETH_RXD1_B,
- 
- 	/* IPSR13 */
- 	FN_SSI_WS2, FN_HSCIF1_HCTS_N_B, FN_SCIFA0_RXD_D, FN_VI1_DATA3, FN_SCKZ,
-@@ -575,8 +575,8 @@ enum {
- 	ETH_CRS_DV_B_MARK, SSI_WS1_MARK, SCIF1_TXD_B_MARK, IIC1_SDA_C_MARK,
- 	VI1_DATA0_MARK, CAN0_TX_D_MARK, AVB_AVTP_MATCH_MARK, ETH_RX_ER_B_MARK,
- 	SSI_SDATA1_MARK, HSCIF1_HRX_B_MARK, VI1_DATA1_MARK, SDATA_MARK,
--	ATAG0_N_MARK, ETH_RXD0_B_MARK, SSI_SCK2_MARK, HSCIF1_HTX_B_MARK,
--	VI1_DATA2_MARK, MDATA_MARK, ATAWR0_N_MARK, ETH_RXD1_B_MARK,
-+	ATAWR0_N_MARK, ETH_RXD0_B_MARK, SSI_SCK2_MARK, HSCIF1_HTX_B_MARK,
-+	VI1_DATA2_MARK, MDATA_MARK, ATAG0_N_MARK, ETH_RXD1_B_MARK,
- 
- 	/* IPSR13 */
- 	SSI_WS2_MARK, HSCIF1_HCTS_N_B_MARK, SCIFA0_RXD_D_MARK, VI1_DATA3_MARK,
-@@ -1413,13 +1413,13 @@ static const u16 pinmux_data[] = {
- 	PINMUX_IPSR_MSEL(IP12_26_24, HSCIF1_HRX_B, SEL_HSCIF1_1),
- 	PINMUX_IPSR_GPSR(IP12_26_24, VI1_DATA1),
- 	PINMUX_IPSR_MSEL(IP12_26_24, SDATA, SEL_FSN_0),
--	PINMUX_IPSR_GPSR(IP12_26_24, ATAG0_N),
-+	PINMUX_IPSR_GPSR(IP12_26_24, ATAWR0_N),
- 	PINMUX_IPSR_MSEL(IP12_26_24, ETH_RXD0_B, SEL_ETH_1),
- 	PINMUX_IPSR_MSEL(IP12_29_27, SSI_SCK2, SEL_SSI2_0),
- 	PINMUX_IPSR_MSEL(IP12_29_27, HSCIF1_HTX_B, SEL_HSCIF1_1),
- 	PINMUX_IPSR_GPSR(IP12_29_27, VI1_DATA2),
- 	PINMUX_IPSR_MSEL(IP12_29_27, MDATA, SEL_FSN_0),
--	PINMUX_IPSR_GPSR(IP12_29_27, ATAWR0_N),
-+	PINMUX_IPSR_GPSR(IP12_29_27, ATAG0_N),
- 	PINMUX_IPSR_MSEL(IP12_29_27, ETH_RXD1_B, SEL_ETH_1),
- 
- 	/* IPSR13 */
-@@ -4938,10 +4938,10 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {
- 		0, 0, 0, 0,
- 		/* IP12_29_27 [3] */
- 		FN_SSI_SCK2, FN_HSCIF1_HTX_B, FN_VI1_DATA2, FN_MDATA,
--		FN_ATAWR0_N, FN_ETH_RXD1_B, 0, 0,
-+		FN_ATAG0_N, FN_ETH_RXD1_B, 0, 0,
- 		/* IP12_26_24 [3] */
- 		FN_SSI_SDATA1, FN_HSCIF1_HRX_B, FN_VI1_DATA1, FN_SDATA,
--		FN_ATAG0_N, FN_ETH_RXD0_B, 0, 0,
-+		FN_ATAWR0_N, FN_ETH_RXD0_B, 0, 0,
- 		/* IP12_23_21 [3] */
- 		FN_SSI_WS1, FN_SCIF1_TXD_B, FN_IIC1_SDA_C, FN_VI1_DATA0,
- 		FN_CAN0_TX_D, FN_AVB_AVTP_MATCH, FN_ETH_RX_ER_B, 0,
--- 
-2.13.3
-
diff --git a/patches.renesas/0173-net-phy-micrel-Restore-led_mode-and-clk_sel-on-resum.patch b/patches.renesas/0173-net-phy-micrel-Restore-led_mode-and-clk_sel-on-resum.patch
index d17bdfc..7cf1b14 100644
--- a/patches.renesas/0173-net-phy-micrel-Restore-led_mode-and-clk_sel-on-resum.patch
+++ b/patches.renesas/0173-net-phy-micrel-Restore-led_mode-and-clk_sel-on-resum.patch
@@ -16,14 +16,12 @@
 (cherry picked from commit 79e498a9c7da0737829ff864aae44df434105676)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/phy/micrel.c | 42 ++++++++++++++++++++++++++++--------------
+ drivers/net/phy/micrel.c |   42 ++++++++++++++++++++++++++++--------------
  1 file changed, 28 insertions(+), 14 deletions(-)
 
-diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
-index da5b39268370..d18d631c9fed 100644
 --- a/drivers/net/phy/micrel.c
 +++ b/drivers/net/phy/micrel.c
-@@ -268,23 +268,12 @@ static int kszphy_nand_tree_disable(struct phy_device *phydev)
+@@ -268,23 +268,12 @@ out:
  	return ret;
  }
  
@@ -49,7 +47,7 @@
  	if (priv->rmii_ref_clk_sel) {
  		ret = kszphy_rmii_clk_sel(phydev, priv->rmii_ref_clk_sel_val);
  		if (ret) {
-@@ -295,11 +284,30 @@ static int kszphy_config_init(struct phy_device *phydev)
+@@ -295,11 +284,30 @@ static int kszphy_config_init(struct phy
  	}
  
  	if (priv->led_mode >= 0)
@@ -81,7 +79,7 @@
  static int ksz8041_config_init(struct phy_device *phydev)
  {
  	struct device_node *of_node = phydev->mdio.dev.of_node;
-@@ -701,8 +709,14 @@ static int kszphy_suspend(struct phy_device *phydev)
+@@ -703,8 +711,14 @@ static int kszphy_suspend(struct phy_dev
  
  static int kszphy_resume(struct phy_device *phydev)
  {
@@ -96,6 +94,3 @@
  	/* Enable PHY Interrupts */
  	if (phy_interrupt_is_valid(phydev)) {
  		phydev->interrupts = PHY_INTERRUPT_ENABLED;
--- 
-2.13.3
-
diff --git a/patches.renesas/0174-soc-renesas-rcar-sysc-Add-support-for-fixing-up-powe.patch b/patches.renesas/0174-soc-renesas-rcar-sysc-Add-support-for-fixing-up-powe.patch
index dd0abe0..b17112a 100644
--- a/patches.renesas/0174-soc-renesas-rcar-sysc-Add-support-for-fixing-up-powe.patch
+++ b/patches.renesas/0174-soc-renesas-rcar-sysc-Add-support-for-fixing-up-powe.patch
@@ -20,12 +20,10 @@
 (cherry picked from commit afa6f53df6052968ce3934ad324777c0057e31d1)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/soc/renesas/rcar-sysc.c | 25 ++++++++++++++++++++++++-
- drivers/soc/renesas/rcar-sysc.h | 10 ++++++++++
+ drivers/soc/renesas/rcar-sysc.c |   25 ++++++++++++++++++++++++-
+ drivers/soc/renesas/rcar-sysc.h |   10 ++++++++++
  2 files changed, 34 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/soc/renesas/rcar-sysc.c b/drivers/soc/renesas/rcar-sysc.c
-index 225c35c79d9a..528a13742aeb 100644
 --- a/drivers/soc/renesas/rcar-sysc.c
 +++ b/drivers/soc/renesas/rcar-sysc.c
 @@ -2,7 +2,7 @@
@@ -37,7 +35,7 @@
   *
   * This file is subject to the terms and conditions of the GNU General Public
   * License.  See the file "COPYING" in the main directory of this archive
-@@ -334,6 +334,12 @@ static int __init rcar_sysc_pd_init(void)
+@@ -334,6 +334,12 @@ static int __init rcar_sysc_pd_init(void
  
  	info = match->data;
  
@@ -50,7 +48,7 @@
  	has_cpg_mstp = of_find_compatible_node(NULL, NULL,
  					       "renesas,cpg-mstp-clocks");
  
-@@ -377,6 +383,11 @@ static int __init rcar_sysc_pd_init(void)
+@@ -377,6 +383,11 @@ static int __init rcar_sysc_pd_init(void
  		const struct rcar_sysc_area *area = &info->areas[i];
  		struct rcar_sysc_pd *pd;
  
@@ -62,7 +60,7 @@
  		pd = kzalloc(sizeof(*pd) + strlen(area->name) + 1, GFP_KERNEL);
  		if (!pd) {
  			error = -ENOMEM;
-@@ -406,6 +417,18 @@ static int __init rcar_sysc_pd_init(void)
+@@ -406,6 +417,18 @@ out_put:
  }
  early_initcall(rcar_sysc_pd_init);
  
@@ -81,8 +79,6 @@
  void __init rcar_sysc_init(phys_addr_t base, u32 syscier)
  {
  	u32 syscimr;
-diff --git a/drivers/soc/renesas/rcar-sysc.h b/drivers/soc/renesas/rcar-sysc.h
-index f6e842e2976e..07edb049a401 100644
 --- a/drivers/soc/renesas/rcar-sysc.h
 +++ b/drivers/soc/renesas/rcar-sysc.h
 @@ -46,6 +46,7 @@ struct rcar_sysc_area {
@@ -93,7 +89,7 @@
  	const struct rcar_sysc_area *areas;
  	unsigned int num_areas;
  };
-@@ -59,4 +60,13 @@ extern const struct rcar_sysc_info r8a7792_sysc_info;
+@@ -59,4 +60,13 @@ extern const struct rcar_sysc_info r8a77
  extern const struct rcar_sysc_info r8a7794_sysc_info;
  extern const struct rcar_sysc_info r8a7795_sysc_info;
  extern const struct rcar_sysc_info r8a7796_sysc_info;
@@ -107,6 +103,3 @@
 +			      unsigned int num_areas, u8 id);
 +
  #endif /* __SOC_RENESAS_RCAR_SYSC_H__ */
--- 
-2.13.3
-
diff --git a/patches.renesas/0175-soc-renesas-rcar-sysc-Add-support-for-R-Car-H3-ES2.0.patch b/patches.renesas/0175-soc-renesas-rcar-sysc-Add-support-for-R-Car-H3-ES2.0.patch
index 42e9d8a..95121bf 100644
--- a/patches.renesas/0175-soc-renesas-rcar-sysc-Add-support-for-R-Car-H3-ES2.0.patch
+++ b/patches.renesas/0175-soc-renesas-rcar-sysc-Add-support-for-R-Car-H3-ES2.0.patch
@@ -21,12 +21,10 @@
 (cherry picked from commit fcb87087261e1be51b4c03677f39246bdc312b1c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/soc/renesas/r8a7795-sysc.c       | 26 ++++++++++++++++++++++++--
- include/dt-bindings/power/r8a7795-sysc.h |  2 +-
+ drivers/soc/renesas/r8a7795-sysc.c       |   26 ++++++++++++++++++++++++--
+ include/dt-bindings/power/r8a7795-sysc.h |    2 +-
  2 files changed, 25 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/soc/renesas/r8a7795-sysc.c b/drivers/soc/renesas/r8a7795-sysc.c
-index 5e7537c96f7b..7412666187b3 100644
 --- a/drivers/soc/renesas/r8a7795-sysc.c
 +++ b/drivers/soc/renesas/r8a7795-sysc.c
 @@ -1,7 +1,7 @@
@@ -53,7 +51,7 @@
  	{ "always-on",	    0, 0, R8A7795_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },
  	{ "ca57-scu",	0x1c0, 0, R8A7795_PD_CA57_SCU,	R8A7795_PD_ALWAYS_ON,
  	  PD_SCU },
-@@ -40,6 +41,7 @@ static const struct rcar_sysc_area r8a7795_areas[] __initconst = {
+@@ -40,6 +41,7 @@ static const struct rcar_sysc_area r8a77
  	{ "a3vp",	0x340, 0, R8A7795_PD_A3VP,	R8A7795_PD_ALWAYS_ON },
  	{ "cr7",	0x240, 0, R8A7795_PD_CR7,	R8A7795_PD_ALWAYS_ON },
  	{ "a3vc",	0x380, 0, R8A7795_PD_A3VC,	R8A7795_PD_ALWAYS_ON },
@@ -61,7 +59,7 @@
  	{ "a2vc0",	0x3c0, 0, R8A7795_PD_A2VC0,	R8A7795_PD_A3VC },
  	{ "a2vc1",	0x3c0, 1, R8A7795_PD_A2VC1,	R8A7795_PD_A3VC },
  	{ "3dg-a",	0x100, 0, R8A7795_PD_3DG_A,	R8A7795_PD_ALWAYS_ON },
-@@ -50,7 +52,27 @@ static const struct rcar_sysc_area r8a7795_areas[] __initconst = {
+@@ -50,7 +52,27 @@ static const struct rcar_sysc_area r8a77
  	{ "a3ir",	0x180, 0, R8A7795_PD_A3IR,	R8A7795_PD_ALWAYS_ON },
  };
  
@@ -89,8 +87,6 @@
  	.areas = r8a7795_areas,
  	.num_areas = ARRAY_SIZE(r8a7795_areas),
  };
-diff --git a/include/dt-bindings/power/r8a7795-sysc.h b/include/dt-bindings/power/r8a7795-sysc.h
-index ee2e26ba605e..ad679eeda137 100644
 --- a/include/dt-bindings/power/r8a7795-sysc.h
 +++ b/include/dt-bindings/power/r8a7795-sysc.h
 @@ -33,7 +33,7 @@
@@ -102,6 +98,3 @@
  #define R8A7795_PD_A2VC1		26
  
  /* Always-on power area */
--- 
-2.13.3
-
diff --git a/patches.renesas/0176-usb-xhci-plat-Enable-async-suspend-resume.patch b/patches.renesas/0176-usb-xhci-plat-Enable-async-suspend-resume.patch
index 6f14466..dfaae08 100644
--- a/patches.renesas/0176-usb-xhci-plat-Enable-async-suspend-resume.patch
+++ b/patches.renesas/0176-usb-xhci-plat-Enable-async-suspend-resume.patch
@@ -19,14 +19,12 @@
 (cherry picked from commit c70a1529b29cb1362ade5dd113313fb945e32c3e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-plat.c | 2 ++
+ drivers/usb/host/xhci-plat.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 66ddd080a2a8..37f59a975dd9 100644
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
-@@ -258,6 +258,8 @@ static int xhci_plat_probe(struct platform_device *pdev)
+@@ -258,6 +258,8 @@ static int xhci_plat_probe(struct platfo
  	if (ret)
  		goto dealloc_usb2_hcd;
  
@@ -35,6 +33,3 @@
  	return 0;
  
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0177-usb-xhci-clear-EINT-bit-in-status-correctly.patch b/patches.renesas/0177-usb-xhci-clear-EINT-bit-in-status-correctly.patch
index 419292e..9c4b4e1 100644
--- a/patches.renesas/0177-usb-xhci-clear-EINT-bit-in-status-correctly.patch
+++ b/patches.renesas/0177-usb-xhci-clear-EINT-bit-in-status-correctly.patch
@@ -25,14 +25,12 @@
 (cherry picked from commit d1001ab41064c7fe7bffbc1d7c3921912f3ec32d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci.c | 4 ++--
+ drivers/usb/host/xhci.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 304ee6bbe80c..cb3871c93004 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -721,7 +721,7 @@ void xhci_stop(struct usb_hcd *hcd)
+@@ -724,7 +724,7 @@ void xhci_stop(struct usb_hcd *hcd)
  	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
  			"// Disabling event ring interrupts");
  	temp = readl(&xhci->op_regs->status);
@@ -41,7 +39,7 @@
  	temp = readl(&xhci->ir_set->irq_pending);
  	writel(ER_IRQ_DISABLE(temp), &xhci->ir_set->irq_pending);
  	xhci_print_ir_set(xhci, 0);
-@@ -1054,7 +1054,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated)
+@@ -1057,7 +1057,7 @@ int xhci_resume(struct xhci_hcd *xhci, b
  
  		xhci_dbg(xhci, "// Disabling event ring interrupts\n");
  		temp = readl(&xhci->op_regs->status);
@@ -50,6 +48,3 @@
  		temp = readl(&xhci->ir_set->irq_pending);
  		writel(ER_IRQ_DISABLE(temp), &xhci->ir_set->irq_pending);
  		xhci_print_ir_set(xhci, 0);
--- 
-2.13.3
-
diff --git a/patches.renesas/0178-usb-xhci-Add-helper-function-xhci_set_power_on.patch b/patches.renesas/0178-usb-xhci-Add-helper-function-xhci_set_power_on.patch
index 29d47b4..94cee09 100644
--- a/patches.renesas/0178-usb-xhci-Add-helper-function-xhci_set_power_on.patch
+++ b/patches.renesas/0178-usb-xhci-Add-helper-function-xhci_set_power_on.patch
@@ -15,14 +15,12 @@
 (cherry picked from commit a6ff6cbf1fabe7500d8ac25e133e3346db0a0fca)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-hub.c | 66 ++++++++++++++++++++++++++++++---------------
+ drivers/usb/host/xhci-hub.c |   66 ++++++++++++++++++++++++++++++--------------
  1 file changed, 45 insertions(+), 21 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index 3bddeaa1e2d7..04344c14180c 100644
 --- a/drivers/usb/host/xhci-hub.c
 +++ b/drivers/usb/host/xhci-hub.c
-@@ -540,6 +540,49 @@ static int xhci_get_ports(struct usb_hcd *hcd, __le32 __iomem ***port_array)
+@@ -540,6 +540,49 @@ static int xhci_get_ports(struct usb_hcd
  	return max_ports;
  }
  
@@ -72,7 +70,7 @@
  void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
  				int port_id, u32 link_state)
  {
-@@ -1092,18 +1135,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1095,18 +1138,7 @@ int xhci_hub_control(struct usb_hcd *hcd
  			 * However, hub_wq will ignore the roothub events until
  			 * the roothub is registered.
  			 */
@@ -92,7 +90,7 @@
  			break;
  		case USB_PORT_FEAT_RESET:
  			temp = (temp | PORT_RESET);
-@@ -1207,15 +1239,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1210,15 +1242,7 @@ int xhci_hub_control(struct usb_hcd *hcd
  					port_array[wIndex], temp);
  			break;
  		case USB_PORT_FEAT_POWER:
@@ -109,6 +107,3 @@
  			break;
  		default:
  			goto error;
--- 
-2.13.3
-
diff --git a/patches.renesas/0179-usb-xhci-Add-helper-function-xhci_disable_slot.patch b/patches.renesas/0179-usb-xhci-Add-helper-function-xhci_disable_slot.patch
index df6f4d5..ec0d414 100644
--- a/patches.renesas/0179-usb-xhci-Add-helper-function-xhci_disable_slot.patch
+++ b/patches.renesas/0179-usb-xhci-Add-helper-function-xhci_disable_slot.patch
@@ -13,15 +13,13 @@
 (cherry picked from commit f9e609b82479ef48469d42b022b0951abc00dcd1)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci.c | 49 +++++++++++++++++++++++++++++++------------------
- drivers/usb/host/xhci.h |  2 ++
+ drivers/usb/host/xhci.c |   49 ++++++++++++++++++++++++++++++------------------
+ drivers/usb/host/xhci.h |    2 +
  2 files changed, 33 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index cb3871c93004..ccd6f330ad38 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -3558,8 +3558,6 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3564,8 +3564,6 @@ void xhci_free_dev(struct usb_hcd *hcd,
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
  	struct xhci_virt_device *virt_dev;
@@ -30,7 +28,7 @@
  	int i, ret;
  	struct xhci_command *command;
  
-@@ -3594,30 +3592,50 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3600,30 +3598,50 @@ void xhci_free_dev(struct usb_hcd *hcd,
  		del_timer_sync(&virt_dev->eps[i].stop_cmd_timer);
  	}
  
@@ -91,7 +89,7 @@
  }
  
  /*
-@@ -3724,15 +3742,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3730,15 +3748,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd,
  
  disable_slot:
  	/* Disable slot, if we can do it without mem alloc */
@@ -108,11 +106,9 @@
  }
  
  /*
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 2496bd6304ca..e2eec806eafc 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -2019,6 +2019,8 @@ void xhci_shutdown(struct usb_hcd *hcd);
+@@ -2021,6 +2021,8 @@ void xhci_shutdown(struct usb_hcd *hcd);
  int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks);
  void xhci_init_driver(struct hc_driver *drv,
  		      const struct xhci_driver_overrides *over);
@@ -121,6 +117,3 @@
  
  #ifdef	CONFIG_PM
  int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup);
--- 
-2.13.3
-
diff --git a/patches.renesas/0180-usb-xhci-Expose-xhci_start-function.patch b/patches.renesas/0180-usb-xhci-Expose-xhci_start-function.patch
index 1f67259..0d329e2 100644
--- a/patches.renesas/0180-usb-xhci-Expose-xhci_start-function.patch
+++ b/patches.renesas/0180-usb-xhci-Expose-xhci_start-function.patch
@@ -12,12 +12,10 @@
 (cherry picked from commit 26bba5c767de6724f330cdc2ad28bb783674f5a0)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci.c | 2 +-
- drivers/usb/host/xhci.h | 1 +
+ drivers/usb/host/xhci.c |    2 +-
+ drivers/usb/host/xhci.h |    1 +
  2 files changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index ccd6f330ad38..0f9edee7bab3 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
 @@ -125,7 +125,7 @@ int xhci_halt(struct xhci_hcd *xhci)
@@ -29,11 +27,9 @@
  {
  	u32 temp;
  	int ret;
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index e2eec806eafc..93e1dc1a6812 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -2011,6 +2011,7 @@ typedef void (*xhci_get_quirks_t)(struct device *, struct xhci_hcd *);
+@@ -2013,6 +2013,7 @@ typedef void (*xhci_get_quirks_t)(struct
  int xhci_handshake(void __iomem *ptr, u32 mask, u32 done, int usec);
  void xhci_quiesce(struct xhci_hcd *xhci);
  int xhci_halt(struct xhci_hcd *xhci);
@@ -41,6 +37,3 @@
  int xhci_reset(struct xhci_hcd *xhci);
  int xhci_init(struct usb_hcd *hcd);
  int xhci_run(struct usb_hcd *hcd);
--- 
-2.13.3
-
diff --git a/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch b/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch
index 02c1831..51bc882 100644
--- a/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch
+++ b/patches.renesas/0181-usb-xhci-Add-port-test-modes-support-for-usb2.patch
@@ -27,15 +27,13 @@
 (cherry picked from commit 0f1d832ed1fb9527a4cc5fcb8511e85fd0a85185)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-hub.c | 85 +++++++++++++++++++++++++++++++++++++++++++++
- drivers/usb/host/xhci.h     |  2 ++
+ drivers/usb/host/xhci-hub.c |   85 ++++++++++++++++++++++++++++++++++++++++++++
+ drivers/usb/host/xhci.h     |    2 +
  2 files changed, 87 insertions(+)
 
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index 04344c14180c..a0545fc367ca 100644
 --- a/drivers/usb/host/xhci-hub.c
 +++ b/drivers/usb/host/xhci-hub.c
-@@ -583,6 +583,77 @@ static void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd,
+@@ -583,6 +583,77 @@ static void xhci_set_port_power(struct x
  	spin_lock_irqsave(&xhci->lock, flags);
  }
  
@@ -113,7 +111,7 @@
  void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
  				int port_id, u32 link_state)
  {
-@@ -938,6 +1009,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -941,6 +1012,7 @@ int xhci_hub_control(struct usb_hcd *hcd
  	u16 link_state = 0;
  	u16 wake_mask = 0;
  	u16 timeout = 0;
@@ -121,7 +119,7 @@
  
  	max_ports = xhci_get_ports(hcd, &port_array);
  	bus_state = &xhci->bus_state[hcd_index(hcd)];
-@@ -1011,6 +1083,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1014,6 +1086,8 @@ int xhci_hub_control(struct usb_hcd *hcd
  			link_state = (wIndex & 0xff00) >> 3;
  		if (wValue == USB_PORT_FEAT_REMOTE_WAKE_MASK)
  			wake_mask = wIndex & 0xff00;
@@ -130,7 +128,7 @@
  		/* The MSB of wIndex is the U1/U2 timeout */
  		timeout = (wIndex & 0xff00) >> 8;
  		wIndex &= 0xff;
-@@ -1174,6 +1248,14 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1177,6 +1251,14 @@ int xhci_hub_control(struct usb_hcd *hcd
  			temp |= PORT_U2_TIMEOUT(timeout);
  			writel(temp, port_array[wIndex] + PORTPMSC);
  			break;
@@ -145,7 +143,7 @@
  		default:
  			goto error;
  		}
-@@ -1241,6 +1323,9 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1244,6 +1326,9 @@ int xhci_hub_control(struct usb_hcd *hcd
  		case USB_PORT_FEAT_POWER:
  			xhci_set_port_power(xhci, hcd, wIndex, false);
  			break;
@@ -155,8 +153,6 @@
  		default:
  			goto error;
  		}
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 93e1dc1a6812..b65429aa6da4 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
 @@ -425,6 +425,7 @@ struct xhci_op_regs {
@@ -167,7 +163,7 @@
  
  /* USB3 Protocol PORTLI  Port Link Information */
  #define PORT_RX_LANES(p)	(((p) >> 16) & 0xf)
-@@ -1844,6 +1845,7 @@ struct xhci_hcd {
+@@ -1846,6 +1847,7 @@ struct xhci_hcd {
  	/* Compliance Mode Recovery Data */
  	struct timer_list	comp_mode_recovery_timer;
  	u32			port_status_u0;
@@ -175,6 +171,3 @@
  /* Compliance Mode Timer Triggered every 2 seconds */
  #define COMP_MODE_RCVRY_MSECS 2000
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0182-usb-host-xhci-extract-xhci_slot_state_string.patch b/patches.renesas/0182-usb-host-xhci-extract-xhci_slot_state_string.patch
index 5acce8f..0a36176 100644
--- a/patches.renesas/0182-usb-host-xhci-extract-xhci_slot_state_string.patch
+++ b/patches.renesas/0182-usb-host-xhci-extract-xhci_slot_state_string.patch
@@ -13,15 +13,13 @@
 (cherry picked from commit 52407729fbeabb654d38c0c99661a41a481092d1)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-dbg.c | 14 ++------------
- drivers/usb/host/xhci.h     | 16 ++++++++++++++++
+ drivers/usb/host/xhci-dbg.c |   14 ++------------
+ drivers/usb/host/xhci.h     |   16 ++++++++++++++++
  2 files changed, 18 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
-index 2b4a00fa735d..4cfdd51340d4 100644
 --- a/drivers/usb/host/xhci-dbg.c
 +++ b/drivers/usb/host/xhci-dbg.c
-@@ -451,19 +451,9 @@ char *xhci_get_slot_state(struct xhci_hcd *xhci,
+@@ -451,19 +451,9 @@ char *xhci_get_slot_state(struct xhci_hc
  		struct xhci_container_ctx *ctx)
  {
  	struct xhci_slot_ctx *slot_ctx = xhci_get_slot_ctx(xhci, ctx);
@@ -43,11 +41,9 @@
  }
  
  static void xhci_dbg_slot_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx)
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index b65429aa6da4..facdae3ea5bb 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -2159,6 +2159,22 @@ static inline struct xhci_ring *xhci_urb_to_transfer_ring(struct xhci_hcd *xhci,
+@@ -2161,6 +2161,22 @@ static inline struct xhci_ring *xhci_urb
  					urb->stream_id);
  }
  
@@ -70,6 +66,3 @@
  static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
  		u32 field3)
  {
--- 
-2.13.3
-
diff --git a/patches.renesas/0183-usb-host-xhci-add-Slot-and-EP-Context-tracers.patch b/patches.renesas/0183-usb-host-xhci-add-Slot-and-EP-Context-tracers.patch
index 6a9b1c3..31e22ba 100644
--- a/patches.renesas/0183-usb-host-xhci-add-Slot-and-EP-Context-tracers.patch
+++ b/patches.renesas/0183-usb-host-xhci-add-Slot-and-EP-Context-tracers.patch
@@ -14,17 +14,15 @@
 (cherry picked from commit 19a7d0d65c4a813069f4bc4ca701d6a163c337e9)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-ring.c  |  42 ++++++++++++
- drivers/usb/host/xhci-trace.h | 101 +++++++++++++++++++++++++++++
- drivers/usb/host/xhci.c       |  15 ++++-
- drivers/usb/host/xhci.h       | 146 ++++++++++++++++++++++++++++++++++++++++++
+ drivers/usb/host/xhci-ring.c  |   42 ++++++++++++
+ drivers/usb/host/xhci-trace.h |  101 +++++++++++++++++++++++++++++
+ drivers/usb/host/xhci.c       |   15 +++-
+ drivers/usb/host/xhci.h       |  146 ++++++++++++++++++++++++++++++++++++++++++
  4 files changed, 302 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index a3309aa02993..2f700c9893bd 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -689,6 +689,8 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id,
+@@ -689,6 +689,8 @@ static void xhci_handle_cmd_stop_ep(stru
  	struct xhci_virt_ep *ep;
  	struct xhci_td *cur_td = NULL;
  	struct xhci_td *last_unlinked_td;
@@ -33,7 +31,7 @@
  
  	struct xhci_dequeue_state deq_state;
  
-@@ -702,6 +704,11 @@ static void xhci_handle_cmd_stop_ep(struct xhci_hcd *xhci, int slot_id,
+@@ -702,6 +704,11 @@ static void xhci_handle_cmd_stop_ep(stru
  
  	memset(&deq_state, 0, sizeof(deq_state));
  	ep_index = TRB_TO_EP_INDEX(le32_to_cpu(trb->generic.field[3]));
@@ -45,7 +43,7 @@
  	ep = &xhci->devs[slot_id]->eps[ep_index];
  	last_unlinked_td = list_last_entry(&ep->cancelled_td_list,
  			struct xhci_td, cancelled_td_list);
-@@ -1029,6 +1036,8 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id,
+@@ -1032,6 +1039,8 @@ static void xhci_handle_cmd_set_deq(stru
  
  	ep_ctx = xhci_get_ep_ctx(xhci, dev->out_ctx, ep_index);
  	slot_ctx = xhci_get_slot_ctx(xhci, dev->out_ctx);
@@ -54,7 +52,7 @@
  
  	if (cmd_comp_code != COMP_SUCCESS) {
  		unsigned int ep_state;
-@@ -1099,9 +1108,15 @@ static void xhci_handle_cmd_set_deq(struct xhci_hcd *xhci, int slot_id,
+@@ -1102,9 +1111,15 @@ cleanup:
  static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id,
  		union xhci_trb *trb, u32 cmd_comp_code)
  {
@@ -70,7 +68,7 @@
  	/* This command will only fail if the endpoint wasn't halted,
  	 * but we don't care.
  	 */
-@@ -1143,10 +1158,15 @@ static void xhci_handle_cmd_enable_slot(struct xhci_hcd *xhci, int slot_id,
+@@ -1146,10 +1161,15 @@ static void xhci_handle_cmd_enable_slot(
  static void xhci_handle_cmd_disable_slot(struct xhci_hcd *xhci, int slot_id)
  {
  	struct xhci_virt_device *virt_dev;
@@ -86,7 +84,7 @@
  	if (xhci->quirks & XHCI_EP_LIMIT_QUIRK)
  		/* Delete default control endpoint resources */
  		xhci_free_device_endpoint_resources(xhci, virt_dev, true);
-@@ -1158,6 +1178,7 @@ static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id,
+@@ -1161,6 +1181,7 @@ static void xhci_handle_cmd_config_ep(st
  {
  	struct xhci_virt_device *virt_dev;
  	struct xhci_input_control_ctx *ctrl_ctx;
@@ -94,7 +92,7 @@
  	unsigned int ep_index;
  	unsigned int ep_state;
  	u32 add_flags, drop_flags;
-@@ -1182,6 +1203,9 @@ static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id,
+@@ -1185,6 +1206,9 @@ static void xhci_handle_cmd_config_ep(st
  	/* Input ctx add_flags are the endpoint index plus one */
  	ep_index = xhci_last_valid_endpoint(add_flags) - 1;
  
@@ -104,7 +102,7 @@
  	/* A usb_set_interface() call directly after clearing a halted
  	 * condition may race on this quirky hardware.  Not worth
  	 * worrying about, since this is prototype hardware.  Not sure
-@@ -1206,9 +1230,26 @@ static void xhci_handle_cmd_config_ep(struct xhci_hcd *xhci, int slot_id,
+@@ -1209,9 +1233,26 @@ static void xhci_handle_cmd_config_ep(st
  	return;
  }
  
@@ -131,7 +129,7 @@
  	xhci_dbg(xhci, "Completed reset device command.\n");
  	if (!xhci->devs[slot_id])
  		xhci_warn(xhci, "Reset device command completion "
-@@ -1384,6 +1425,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
+@@ -1387,6 +1428,7 @@ static void handle_cmd_completion(struct
  	case TRB_EVAL_CONTEXT:
  		break;
  	case TRB_ADDR_DEV:
@@ -139,11 +137,9 @@
  		break;
  	case TRB_STOP_RING:
  		WARN_ON(slot_id != TRB_TO_SLOT_ID(
-diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h
-index fecd226b422d..f24a45ae153d 100644
 --- a/drivers/usb/host/xhci-trace.h
 +++ b/drivers/usb/host/xhci-trace.h
-@@ -285,6 +285,107 @@ DEFINE_EVENT(xhci_log_urb, xhci_urb_dequeue,
+@@ -285,6 +285,107 @@ DEFINE_EVENT(xhci_log_urb, xhci_urb_dequ
  	TP_ARGS(urb)
  );
  
@@ -251,11 +247,9 @@
  #endif /* __XHCI_TRACE_H */
  
  /* this part must be outside header guard */
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 0f9edee7bab3..6c4cef7e51c9 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -3443,6 +3443,8 @@ int xhci_discover_or_reset_device(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3449,6 +3449,8 @@ int xhci_discover_or_reset_device(struct
  						SLOT_STATE_DISABLED)
  		return 0;
  
@@ -264,7 +258,7 @@
  	xhci_dbg(xhci, "Resetting device with slot ID %u\n", slot_id);
  	/* Allocate the command structure that holds the struct completion.
  	 * Assume we're in process context, since the normal device reset
-@@ -3558,6 +3560,7 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3564,6 +3566,7 @@ void xhci_free_dev(struct usb_hcd *hcd,
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
  	struct xhci_virt_device *virt_dev;
@@ -272,7 +266,7 @@
  	int i, ret;
  	struct xhci_command *command;
  
-@@ -3585,6 +3588,8 @@ void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3591,6 +3594,8 @@ void xhci_free_dev(struct usb_hcd *hcd,
  	}
  
  	virt_dev = xhci->devs[udev->slot_id];
@@ -281,7 +275,7 @@
  
  	/* Stop any wayward timer functions (which may grab the lock) */
  	for (i = 0; i < 31; i++) {
-@@ -3668,6 +3673,8 @@ static int xhci_reserve_host_control_ep_resources(struct xhci_hcd *xhci)
+@@ -3674,6 +3679,8 @@ static int xhci_reserve_host_control_ep_
  int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
@@ -290,7 +284,7 @@
  	unsigned long flags;
  	int ret, slot_id;
  	struct xhci_command *command;
-@@ -3723,6 +3730,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3729,6 +3736,10 @@ int xhci_alloc_dev(struct usb_hcd *hcd,
  		xhci_warn(xhci, "Could not allocate xHCI USB device data structures\n");
  		goto disable_slot;
  	}
@@ -301,7 +295,7 @@
  	udev->slot_id = slot_id;
  
  #ifndef CONFIG_USB_DEFAULT_PERSIST
-@@ -3792,9 +3803,10 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3798,9 +3809,10 @@ static int xhci_setup_device(struct usb_
  		ret = -EINVAL;
  		goto out;
  	}
@@ -313,7 +307,7 @@
  		if (GET_SLOT_STATE(le32_to_cpu(slot_ctx->dev_state)) ==
  		    SLOT_STATE_DEFAULT) {
  			xhci_dbg(xhci, "Slot already in default state\n");
-@@ -3915,7 +3927,6 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3921,7 +3933,6 @@ static int xhci_setup_device(struct usb_
  	 * USB core uses address 1 for the roothubs, so we add one to the
  	 * address given back to us by the HC.
  	 */
@@ -321,8 +315,6 @@
  	trace_xhci_address_ctx(xhci, virt_dev->out_ctx,
  				le32_to_cpu(slot_ctx->dev_info) >> 27);
  	/* Zero the input context control for later use */
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index facdae3ea5bb..2acb6fe64892 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
 @@ -618,6 +618,7 @@ struct xhci_slot_ctx {
@@ -349,7 +341,7 @@
  
  /* dev_state bitmasks */
  /* USB device address - assigned by the HC */
-@@ -2381,5 +2384,148 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2383,5 +2386,148 @@ static inline const char *xhci_decode_tr
  	return str;
  }
  
@@ -498,6 +490,3 @@
 +}
  
  #endif /* __LINUX_XHCI_HCD_H */
--- 
-2.13.3
-
diff --git a/patches.renesas/0184-usb-host-xhci-fix-up-Control-Transfer-TRB-decoder.patch b/patches.renesas/0184-usb-host-xhci-fix-up-Control-Transfer-TRB-decoder.patch
index 08f8aa3..f222d1f 100644
--- a/patches.renesas/0184-usb-host-xhci-fix-up-Control-Transfer-TRB-decoder.patch
+++ b/patches.renesas/0184-usb-host-xhci-fix-up-Control-Transfer-TRB-decoder.patch
@@ -12,14 +12,12 @@
 (cherry picked from commit 5d062aba0d399c57e2d793603d6e372adb09b4d7)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci.h | 59 +++++++++++++++++++++++++++++++------------------
+ drivers/usb/host/xhci.h |   59 ++++++++++++++++++++++++++++++------------------
  1 file changed, 37 insertions(+), 22 deletions(-)
 
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 2acb6fe64892..82fce191b500 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -2218,31 +2218,46 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2220,31 +2220,46 @@ static inline const char *xhci_decode_tr
  
  		break;
  	case TRB_SETUP:
@@ -88,6 +86,3 @@
  	case TRB_ISOC:
  	case TRB_EVENT_DATA:
  	case TRB_TR_NOOP:
--- 
-2.13.3
-
diff --git a/patches.renesas/0185-xhci-add-slot-and-endpoint-numbers-to-debug-messages.patch b/patches.renesas/0185-xhci-add-slot-and-endpoint-numbers-to-debug-messages.patch
index e867ef2..eb96aaf 100644
--- a/patches.renesas/0185-xhci-add-slot-and-endpoint-numbers-to-debug-messages.patch
+++ b/patches.renesas/0185-xhci-add-slot-and-endpoint-numbers-to-debug-messages.patch
@@ -15,14 +15,12 @@
 (cherry picked from commit b7f769ae1b126086c5ec6686734924bac1dc0a9f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-ring.c | 80 ++++++++++++++++++++++++++++++--------------
+ drivers/usb/host/xhci-ring.c |   80 +++++++++++++++++++++++++++++--------------
  1 file changed, 55 insertions(+), 25 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 2f700c9893bd..d45f533772ee 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -2285,7 +2285,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2288,7 +2288,8 @@ static int handle_tx_event(struct xhci_h
  	slot_id = TRB_TO_SLOT_ID(le32_to_cpu(event->flags));
  	xdev = xhci->devs[slot_id];
  	if (!xdev) {
@@ -32,7 +30,7 @@
  		xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",
  			 (unsigned long long) xhci_trb_virt_to_dma(
  				 xhci->event_ring->deq_seg,
-@@ -2305,8 +2306,9 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2308,8 +2309,9 @@ static int handle_tx_event(struct xhci_h
  	ep_ring = xhci_dma_to_transfer_ring(ep, le64_to_cpu(event->buffer));
  	ep_ctx = xhci_get_ep_ctx(xhci, xdev->out_ctx, ep_index);
  	if (!ep_ring ||  GET_EP_CTX_STATE(ep_ctx) == EP_STATE_DISABLED) {
@@ -44,7 +42,7 @@
  		xhci_err(xhci, "@%016llx %08x %08x %08x %08x\n",
  			 (unsigned long long) xhci_trb_virt_to_dma(
  				 xhci->event_ring->deq_seg,
-@@ -2340,45 +2342,62 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2343,45 +2345,62 @@ static int handle_tx_event(struct xhci_h
  			trb_comp_code = COMP_SHORT_PACKET;
  		else
  			xhci_warn_ratelimited(xhci,
@@ -118,7 +116,7 @@
  		break;
  	case COMP_RING_UNDERRUN:
  		/*
-@@ -2402,7 +2421,9 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2405,7 +2424,9 @@ static int handle_tx_event(struct xhci_h
  				 ep_index);
  		goto cleanup;
  	case COMP_INCOMPATIBLE_DEVICE_ERROR:
@@ -129,7 +127,7 @@
  		status = -EPROTO;
  		break;
  	case COMP_MISSED_SERVICE_ERROR:
-@@ -2413,19 +2434,24 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2416,19 +2437,24 @@ static int handle_tx_event(struct xhci_h
  		 * short transfer when process the ep_ring next time.
  		 */
  		ep->skip = true;
@@ -158,7 +156,7 @@
  		goto cleanup;
  	}
  
-@@ -2451,8 +2477,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2454,8 +2480,8 @@ static int handle_tx_event(struct xhci_h
  			}
  			if (ep->skip) {
  				ep->skip = false;
@@ -169,7 +167,7 @@
  			}
  			goto cleanup;
  		}
-@@ -2460,8 +2486,8 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2463,8 +2489,8 @@ static int handle_tx_event(struct xhci_h
  		/* We've skipped all the TDs on the ep ring when ep->skip set */
  		if (ep->skip && td_num == 0) {
  			ep->skip = false;
@@ -180,7 +178,7 @@
  			goto cleanup;
  		}
  
-@@ -2520,7 +2546,9 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2523,7 +2549,9 @@ static int handle_tx_event(struct xhci_h
  			ep_ring->last_td_was_short = false;
  
  		if (ep->skip) {
@@ -191,7 +189,7 @@
  			ep->skip = false;
  		}
  
-@@ -2537,7 +2565,9 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2540,7 +2568,9 @@ static int handle_tx_event(struct xhci_h
  		 * the TD.
  		 */
  		if (trb_is_noop(ep_trb)) {
@@ -202,6 +200,3 @@
  			goto cleanup;
  		}
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0186-xhci-Do-not-halt-the-host-until-both-HCD-have-discon.patch b/patches.renesas/0186-xhci-Do-not-halt-the-host-until-both-HCD-have-discon.patch
index de03157..174d33a 100644
--- a/patches.renesas/0186-xhci-Do-not-halt-the-host-until-both-HCD-have-discon.patch
+++ b/patches.renesas/0186-xhci-Do-not-halt-the-host-until-both-HCD-have-discon.patch
@@ -20,14 +20,12 @@
 (cherry picked from commit fe190ed0d60260e44f48d8b0b04f26a8c8898a02)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci.c | 20 ++++++++++----------
+ drivers/usb/host/xhci.c |   20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 6c4cef7e51c9..8d8c02f4a3a6 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -689,21 +689,21 @@ void xhci_stop(struct usb_hcd *hcd)
+@@ -692,21 +692,21 @@ void xhci_stop(struct usb_hcd *hcd)
  
  	mutex_lock(&xhci->mutex);
  
@@ -59,6 +57,3 @@
  	xhci_cleanup_msix(xhci);
  
  	/* Deleting Compliance Mode Recovery Timer */
--- 
-2.13.3
-
diff --git a/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch b/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch
index 97b94a4..bd9e763 100644
--- a/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch
+++ b/patches.renesas/0187-xhci-Rework-how-we-handle-unresponsive-or-hoptlug-re.patch
@@ -24,17 +24,15 @@
 (cherry picked from commit d9f11ba9f107aa335091ab8d7ba5eea714e46e8b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-hub.c  |  12 +++--
- drivers/usb/host/xhci-ring.c | 118 +++++++++++++++++++++----------------------
- drivers/usb/host/xhci.c      |  16 +++++-
- drivers/usb/host/xhci.h      |   1 +
+ drivers/usb/host/xhci-hub.c  |   12 ++--
+ drivers/usb/host/xhci-ring.c |  118 ++++++++++++++++++++-----------------------
+ drivers/usb/host/xhci.c      |   16 +++++
+ drivers/usb/host/xhci.h      |    1 
  4 files changed, 80 insertions(+), 67 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index a0545fc367ca..0b88e76251eb 100644
 --- a/drivers/usb/host/xhci-hub.c
 +++ b/drivers/usb/host/xhci-hub.c
-@@ -1050,7 +1050,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1053,7 +1053,8 @@ int xhci_hub_control(struct usb_hcd *hcd
  			goto error;
  		wIndex--;
  		temp = readl(port_array[wIndex]);
@@ -44,7 +42,7 @@
  			retval = -ENODEV;
  			break;
  		}
-@@ -1092,7 +1093,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1095,7 +1096,8 @@ int xhci_hub_control(struct usb_hcd *hcd
  			goto error;
  		wIndex--;
  		temp = readl(port_array[wIndex]);
@@ -54,7 +52,7 @@
  			retval = -ENODEV;
  			break;
  		}
-@@ -1267,7 +1269,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1270,7 +1272,8 @@ int xhci_hub_control(struct usb_hcd *hcd
  			goto error;
  		wIndex--;
  		temp = readl(port_array[wIndex]);
@@ -64,7 +62,7 @@
  			retval = -ENODEV;
  			break;
  		}
-@@ -1378,7 +1381,8 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf)
+@@ -1381,7 +1384,8 @@ int xhci_hub_status_data(struct usb_hcd
  	/* For each port, did anything change?  If so, set that bit in buf. */
  	for (i = 0; i < max_ports; i++) {
  		temp = readl(port_array[i]);
@@ -74,11 +72,9 @@
  			retval = -ENODEV;
  			break;
  		}
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index d45f533772ee..c8910fd9b34c 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -359,21 +359,19 @@ static int xhci_abort_cmd_ring(struct xhci_hcd *xhci, unsigned long flags)
+@@ -359,21 +359,19 @@ static int xhci_abort_cmd_ring(struct xh
  	xhci_write_64(xhci, temp_64 | CMD_RING_ABORT,
  			&xhci->op_regs->cmd_ring);
  
@@ -108,7 +104,7 @@
  	}
  	/*
  	 * Writing the CMD_RING_ABORT bit should cause a cmd completion event,
-@@ -873,6 +871,40 @@ static void xhci_kill_endpoint_urbs(struct xhci_hcd *xhci,
+@@ -876,6 +874,40 @@ static void xhci_kill_endpoint_urbs(stru
  	}
  }
  
@@ -149,7 +145,7 @@
  /* Watchdog timer function for when a stop endpoint command fails to complete.
   * In this case, we assume the host controller is broken or dying or dead.  The
   * host may still be completing some other events, so we have to be careful to
-@@ -894,7 +926,6 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg)
+@@ -897,7 +929,6 @@ void xhci_stop_endpoint_command_watchdog
  {
  	struct xhci_hcd *xhci;
  	struct xhci_virt_ep *ep;
@@ -157,7 +153,7 @@
  	unsigned long flags;
  
  	ep = (struct xhci_virt_ep *) arg;
-@@ -911,52 +942,22 @@ void xhci_stop_endpoint_command_watchdog(unsigned long arg)
+@@ -914,52 +945,22 @@ void xhci_stop_endpoint_command_watchdog
  	}
  
  	xhci_warn(xhci, "xHCI host not responding to stop endpoint command.\n");
@@ -217,7 +213,7 @@
  static void update_ring_for_set_deq_completion(struct xhci_hcd *xhci,
  		struct xhci_virt_device *dev,
  		struct xhci_ring *ep_ring,
-@@ -1291,7 +1292,6 @@ void xhci_cleanup_command_queue(struct xhci_hcd *xhci)
+@@ -1294,7 +1295,6 @@ void xhci_cleanup_command_queue(struct x
  void xhci_handle_command_timeout(struct work_struct *work)
  {
  	struct xhci_hcd *xhci;
@@ -225,7 +221,7 @@
  	unsigned long flags;
  	u64 hw_ring_state;
  
-@@ -1312,22 +1312,17 @@ void xhci_handle_command_timeout(struct work_struct *work)
+@@ -1315,22 +1315,17 @@ void xhci_handle_command_timeout(struct
  
  	/* Make sure command ring is running before aborting it */
  	hw_ring_state = xhci_read_64(xhci, &xhci->op_regs->cmd_ring);
@@ -254,7 +250,7 @@
  		goto time_out_completed;
  	}
  
-@@ -2695,7 +2690,8 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
+@@ -2698,7 +2693,8 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
  	spin_lock(&xhci->lock);
  	/* Check if the xHC generated the interrupt, or the irq is shared */
  	status = readl(&xhci->op_regs->status);
@@ -264,11 +260,9 @@
  		ret = IRQ_HANDLED;
  		goto out;
  	}
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 8d8c02f4a3a6..388bf2f1b661 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -1501,10 +1501,16 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -1507,10 +1507,16 @@ int xhci_urb_dequeue(struct usb_hcd *hcd
  	if (!ep || !ep_ring)
  		goto err_giveback;
  
@@ -287,7 +281,7 @@
  		for (i = urb_priv->num_tds_done;
  		     i < urb_priv->num_tds;
  		     i++) {
-@@ -2595,6 +2601,12 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
+@@ -2601,6 +2607,12 @@ static int xhci_configure_endpoint(struc
  		return -EINVAL;
  
  	spin_lock_irqsave(&xhci->lock, flags);
@@ -300,11 +294,9 @@
  	virt_dev = xhci->devs[udev->slot_id];
  
  	ctrl_ctx = xhci_get_input_control_ctx(command->in_ctx);
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 82fce191b500..9e24d2890b4d 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -2132,6 +2132,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex,
+@@ -2134,6 +2134,7 @@ int xhci_hub_control(struct usb_hcd *hcd
  		char *buf, u16 wLength);
  int xhci_hub_status_data(struct usb_hcd *hcd, char *buf);
  int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1);
@@ -312,6 +304,3 @@
  
  #ifdef CONFIG_PM
  int xhci_bus_suspend(struct usb_hcd *hcd);
--- 
-2.13.3
-
diff --git a/patches.renesas/0188-usb-xhci-add-xhci_log_ring-trace-events.patch b/patches.renesas/0188-usb-xhci-add-xhci_log_ring-trace-events.patch
index ccb11ef..e3e78f3 100644
--- a/patches.renesas/0188-usb-xhci-add-xhci_log_ring-trace-events.patch
+++ b/patches.renesas/0188-usb-xhci-add-xhci_log_ring-trace-events.patch
@@ -21,16 +21,14 @@
 (cherry picked from commit b2d6edbb95487e90ffc22072879b0865ccb89a80)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-mem.c   |  4 +++
- drivers/usb/host/xhci-ring.c  |  5 ++++
- drivers/usb/host/xhci-trace.h | 65 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/usb/host/xhci-mem.c   |    4 ++
+ drivers/usb/host/xhci-ring.c  |    5 +++
+ drivers/usb/host/xhci-trace.h |   65 ++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 74 insertions(+)
 
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 4f28cfebe302..3fc323b92cc8 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -288,6 +288,8 @@ void xhci_ring_free(struct xhci_hcd *xhci, struct xhci_ring *ring)
+@@ -288,6 +288,8 @@ void xhci_ring_free(struct xhci_hcd *xhc
  	if (!ring)
  		return;
  
@@ -39,7 +37,7 @@
  	if (ring->first_seg) {
  		if (ring->type == TYPE_STREAM)
  			xhci_remove_stream_mapping(ring);
-@@ -400,6 +402,7 @@ static struct xhci_ring *xhci_ring_alloc(struct xhci_hcd *xhci,
+@@ -400,6 +402,7 @@ static struct xhci_ring *xhci_ring_alloc
  			cpu_to_le32(LINK_TOGGLE);
  	}
  	xhci_initialize_ring_info(ring, cycle_state);
@@ -47,7 +45,7 @@
  	return ring;
  
  fail:
-@@ -504,6 +507,7 @@ int xhci_ring_expansion(struct xhci_hcd *xhci, struct xhci_ring *ring,
+@@ -504,6 +507,7 @@ int xhci_ring_expansion(struct xhci_hcd
  	}
  
  	xhci_link_rings(xhci, ring, first, last, num_segs);
@@ -55,11 +53,9 @@
  	xhci_dbg_trace(xhci, trace_xhci_dbg_ring_expansion,
  			"ring expansion succeed, now has %d segments",
  			ring->num_segs);
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index c8910fd9b34c..28ea69338ed1 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -191,6 +191,9 @@ static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring)
+@@ -191,6 +191,9 @@ static void inc_deq(struct xhci_hcd *xhc
  		ring->deq_seg = ring->deq_seg->next;
  		ring->dequeue = ring->deq_seg->trbs;
  	}
@@ -69,7 +65,7 @@
  	return;
  }
  
-@@ -259,6 +262,8 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring,
+@@ -259,6 +262,8 @@ static void inc_enq(struct xhci_hcd *xhc
  		ring->enqueue = ring->enq_seg->trbs;
  		next = ring->enqueue;
  	}
@@ -78,11 +74,9 @@
  }
  
  /*
-diff --git a/drivers/usb/host/xhci-trace.h b/drivers/usb/host/xhci-trace.h
-index f24a45ae153d..3c14b9e27c49 100644
 --- a/drivers/usb/host/xhci-trace.h
 +++ b/drivers/usb/host/xhci-trace.h
-@@ -386,6 +386,71 @@ DEFINE_EVENT(xhci_log_slot_ctx, xhci_handle_cmd_set_deq,
+@@ -386,6 +386,71 @@ DEFINE_EVENT(xhci_log_slot_ctx, xhci_han
  	TP_ARGS(ctx)
  );
  
@@ -154,6 +148,3 @@
  #endif /* __XHCI_TRACE_H */
  
  /* this part must be outside header guard */
--- 
-2.13.3
-
diff --git a/patches.renesas/0189-usb-xhci-remove-xhci_dbg_ep_rings.patch b/patches.renesas/0189-usb-xhci-remove-xhci_dbg_ep_rings.patch
index 54b03f0..d9dd1cd 100644
--- a/patches.renesas/0189-usb-xhci-remove-xhci_dbg_ep_rings.patch
+++ b/patches.renesas/0189-usb-xhci-remove-xhci_dbg_ep_rings.patch
@@ -12,15 +12,13 @@
 (cherry picked from commit b7d09fe863561014085503986cb202f4111be347)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-dbg.c | 24 ------------------------
- drivers/usb/host/xhci.h     |  3 ---
+ drivers/usb/host/xhci-dbg.c |   24 ------------------------
+ drivers/usb/host/xhci.h     |    3 ---
  2 files changed, 27 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
-index 4cfdd51340d4..f6d30314348d 100644
 --- a/drivers/usb/host/xhci-dbg.c
 +++ b/drivers/usb/host/xhci-dbg.c
-@@ -381,30 +381,6 @@ void xhci_debug_ring(struct xhci_hcd *xhci, struct xhci_ring *ring)
+@@ -381,30 +381,6 @@ void xhci_debug_ring(struct xhci_hcd *xh
  		xhci_debug_segment(xhci, seg);
  }
  
@@ -51,11 +49,9 @@
  void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst)
  {
  	u64 addr = erst->erst_dma_addr;
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 9e24d2890b4d..f5ed359ad8e9 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1934,9 +1934,6 @@ void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring);
+@@ -1936,9 +1936,6 @@ void xhci_dbg_ring_ptrs(struct xhci_hcd
  void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep);
  char *xhci_get_slot_state(struct xhci_hcd *xhci,
  		struct xhci_container_ctx *ctx);
@@ -65,6 +61,3 @@
  void xhci_dbg_trace(struct xhci_hcd *xhci, void (*trace)(struct va_format *),
  			const char *fmt, ...);
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0190-usb-xhci-make-several-functions-static.patch b/patches.renesas/0190-usb-xhci-make-several-functions-static.patch
index f117db1..a7eb73b 100644
--- a/patches.renesas/0190-usb-xhci-make-several-functions-static.patch
+++ b/patches.renesas/0190-usb-xhci-make-several-functions-static.patch
@@ -12,15 +12,13 @@
 (cherry picked from commit 3969384cf88aa2726afb05ad5d1c6ec27e670f07)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci.c | 59 +++++++++++++++++++++++++------------------------
- drivers/usb/host/xhci.h | 41 ----------------------------------
+ drivers/usb/host/xhci.c |   59 ++++++++++++++++++++++++------------------------
+ drivers/usb/host/xhci.h |   41 ---------------------------------
  2 files changed, 30 insertions(+), 70 deletions(-)
 
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 388bf2f1b661..7867b2d3b693 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -539,7 +539,7 @@ static int xhci_all_ports_seen_u0(struct xhci_hcd *xhci)
+@@ -542,7 +542,7 @@ static int xhci_all_ports_seen_u0(struct
   * device contexts (?), set up a command ring segment (or two?), create event
   * ring (one for now).
   */
@@ -29,7 +27,7 @@
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
  	int retval = 0;
-@@ -682,7 +682,7 @@ EXPORT_SYMBOL_GPL(xhci_run);
+@@ -685,7 +685,7 @@ EXPORT_SYMBOL_GPL(xhci_run);
   * Disable device contexts, disable IRQs, and quiesce the HC.
   * Reset the HC, finish any completed transactions, and cleanup memory.
   */
@@ -38,7 +36,7 @@
  {
  	u32 temp;
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
-@@ -743,7 +743,7 @@ void xhci_stop(struct usb_hcd *hcd)
+@@ -746,7 +746,7 @@ void xhci_stop(struct usb_hcd *hcd)
   *
   * This will only ever be called with the main usb_hcd (the USB3 roothub).
   */
@@ -47,7 +45,7 @@
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
  
-@@ -1176,7 +1176,7 @@ unsigned int xhci_get_endpoint_address(unsigned int ep_index)
+@@ -1182,7 +1182,7 @@ unsigned int xhci_get_endpoint_address(u
   * endpoint index to create a bitmask.  The slot context is bit 0, endpoint 0 is
   * bit 1, etc.
   */
@@ -56,7 +54,7 @@
  {
  	return 1 << (xhci_get_endpoint_index(desc) + 1);
  }
-@@ -1185,7 +1185,7 @@ unsigned int xhci_get_endpoint_flag(struct usb_endpoint_descriptor *desc)
+@@ -1191,7 +1191,7 @@ unsigned int xhci_get_endpoint_flag(stru
   * endpoint index to create a bitmask.  The slot context is bit 0, endpoint 0 is
   * bit 1, etc.
   */
@@ -65,7 +63,7 @@
  {
  	return 1 << (ep_index + 1);
  }
-@@ -1329,7 +1329,7 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
+@@ -1335,7 +1335,7 @@ command_cleanup:
   * non-error returns are a promise to giveback() the urb later
   * we drop ownership so next owner (or urb unlink) can get it
   */
@@ -74,7 +72,7 @@
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
  	unsigned long flags;
-@@ -1465,7 +1465,7 @@ int xhci_urb_enqueue(struct usb_hcd *hcd, struct urb *urb, gfp_t mem_flags)
+@@ -1471,7 +1471,7 @@ free_priv:
   * Note that this function can be called in any context, or so says
   * usb_hcd_unlink_urb()
   */
@@ -83,7 +81,7 @@
  {
  	unsigned long flags;
  	int ret, i;
-@@ -1582,7 +1582,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
+@@ -1588,7 +1588,7 @@ err_giveback:
   * disabled, so there's no need for mutual exclusion to protect
   * the xhci->devs[slot_id] structure.
   */
@@ -92,7 +90,7 @@
  		struct usb_host_endpoint *ep)
  {
  	struct xhci_hcd *xhci;
-@@ -1665,7 +1665,7 @@ int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -1671,7 +1671,7 @@ int xhci_drop_endpoint(struct usb_hcd *h
   * configuration or alt setting is installed in the device, so there's no need
   * for mutual exclusion to protect the xhci->devs[slot_id] structure.
   */
@@ -101,7 +99,7 @@
  		struct usb_host_endpoint *ep)
  {
  	struct xhci_hcd *xhci;
-@@ -2336,7 +2336,7 @@ static unsigned int xhci_get_ss_bw_consumed(struct xhci_bw_info *ep_bw)
+@@ -2342,7 +2342,7 @@ static unsigned int xhci_get_ss_bw_consu
  
  }
  
@@ -110,7 +108,7 @@
  		struct xhci_bw_info *ep_bw,
  		struct xhci_interval_bw_table *bw_table,
  		struct usb_device *udev,
-@@ -2701,7 +2701,7 @@ static void xhci_check_bw_drop_ep_streams(struct xhci_hcd *xhci,
+@@ -2707,7 +2707,7 @@ static void xhci_check_bw_drop_ep_stream
   * else should be touching the xhci->devs[slot_id] structure, so we
   * don't need to take the xhci->lock for manipulating that.
   */
@@ -119,7 +117,7 @@
  {
  	int i;
  	int ret = 0;
-@@ -2805,7 +2805,7 @@ int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -2811,7 +2811,7 @@ command_cleanup:
  	return ret;
  }
  
@@ -128,7 +126,7 @@
  {
  	struct xhci_hcd *xhci;
  	struct xhci_virt_device	*virt_dev;
-@@ -2931,7 +2931,7 @@ void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
+@@ -2937,7 +2937,7 @@ void xhci_cleanup_stalled_ring(struct xh
   * Context: in_interrupt
   */
  
@@ -137,7 +135,7 @@
  		struct usb_host_endpoint *ep)
  {
  	struct xhci_hcd *xhci;
-@@ -3107,7 +3107,7 @@ static u32 xhci_calculate_no_streams_bitmask(struct xhci_hcd *xhci,
+@@ -3113,7 +3113,7 @@ static u32 xhci_calculate_no_streams_bit
   * hardware or endpoints claim they can't support the number of requested
   * stream IDs.
   */
@@ -146,7 +144,7 @@
  		struct usb_host_endpoint **eps, unsigned int num_eps,
  		unsigned int num_streams, gfp_t mem_flags)
  {
-@@ -3271,7 +3271,7 @@ int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3277,7 +3277,7 @@ cleanup:
   * Modify the endpoint context state, submit a configure endpoint command,
   * and free all endpoint rings for streams if that completes successfully.
   */
@@ -155,7 +153,7 @@
  		struct usb_host_endpoint **eps, unsigned int num_eps,
  		gfp_t mem_flags)
  {
-@@ -3403,7 +3403,8 @@ void xhci_free_device_endpoint_resources(struct xhci_hcd *xhci,
+@@ -3409,7 +3409,8 @@ void xhci_free_device_endpoint_resources
   * re-initialization during S3/S4. In this case, call xhci_alloc_dev() to
   * re-allocate the device.
   */
@@ -165,7 +163,7 @@
  {
  	int ret, i;
  	unsigned long flags;
-@@ -3568,7 +3569,7 @@ int xhci_discover_or_reset_device(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -3574,7 +3575,7 @@ command_cleanup:
   * disconnected, and all traffic has been stopped and the endpoints have been
   * disabled.  Free any HC data structures associated with that device.
   */
@@ -174,7 +172,7 @@
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
  	struct xhci_virt_device *virt_dev;
-@@ -3957,12 +3958,12 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3963,12 +3964,12 @@ out:
  	return ret;
  }
  
@@ -189,7 +187,7 @@
  {
  	return xhci_setup_device(hcd, udev, SETUP_CONTEXT_ONLY);
  }
-@@ -4119,7 +4120,7 @@ static int xhci_calculate_usb2_hw_lpm_params(struct usb_device *udev)
+@@ -4125,7 +4126,7 @@ static int xhci_calculate_usb2_hw_lpm_pa
  	return PORT_BESLD(besld) | PORT_L1_TIMEOUT(l1) | PORT_HIRDM(hirdm);
  }
  
@@ -198,7 +196,7 @@
  			struct usb_device *udev, int enable)
  {
  	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
-@@ -4243,7 +4244,7 @@ static int xhci_check_usb2_port_capability(struct xhci_hcd *xhci, int port,
+@@ -4249,7 +4250,7 @@ static int xhci_check_usb2_port_capabili
  	return 0;
  }
  
@@ -207,7 +205,7 @@
  {
  	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
  	int		portnum = udev->portnum - 1;
-@@ -4652,7 +4653,7 @@ static int calculate_max_exit_latency(struct usb_device *udev,
+@@ -4658,7 +4659,7 @@ static int calculate_max_exit_latency(st
  }
  
  /* Returns the USB3 hub-encoded value for the U1/U2 timeout. */
@@ -216,7 +214,7 @@
  			struct usb_device *udev, enum usb3_link_state state)
  {
  	struct xhci_hcd	*xhci;
-@@ -4683,7 +4684,7 @@ int xhci_enable_usb3_lpm_timeout(struct usb_hcd *hcd,
+@@ -4689,7 +4690,7 @@ int xhci_enable_usb3_lpm_timeout(struct
  	return hub_encoded_timeout;
  }
  
@@ -225,7 +223,7 @@
  			struct usb_device *udev, enum usb3_link_state state)
  {
  	struct xhci_hcd	*xhci;
-@@ -4699,24 +4700,24 @@ int xhci_disable_usb3_lpm_timeout(struct usb_hcd *hcd,
+@@ -4705,24 +4706,24 @@ int xhci_disable_usb3_lpm_timeout(struct
  }
  #else /* CONFIG_PM */
  
@@ -254,7 +252,7 @@
  			struct usb_device *udev, enum usb3_link_state state)
  {
  	return 0;
-@@ -4728,7 +4729,7 @@ int xhci_disable_usb3_lpm_timeout(struct usb_hcd *hcd,
+@@ -4734,7 +4735,7 @@ int xhci_disable_usb3_lpm_timeout(struct
  /* Once a hub descriptor is fetched for a device, we need to update the xHC's
   * internal data structures for the device.
   */
@@ -263,7 +261,7 @@
  			struct usb_tt *tt, gfp_t mem_flags)
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
-@@ -4834,7 +4835,7 @@ int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
+@@ -4840,7 +4841,7 @@ int xhci_update_hub_device(struct usb_hc
  	return ret;
  }
  
@@ -272,11 +270,9 @@
  {
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
  	/* EHCI mods by the periodic size.  Why? */
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index f5ed359ad8e9..8b360f60d81e 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1947,16 +1947,8 @@ void xhci_copy_ep0_dequeue_into_input_ctx(struct xhci_hcd *xhci,
+@@ -1949,16 +1949,8 @@ void xhci_copy_ep0_dequeue_into_input_ct
  		struct usb_device *udev);
  unsigned int xhci_get_endpoint_index(struct usb_endpoint_descriptor *desc);
  unsigned int xhci_get_endpoint_address(unsigned int ep_index);
@@ -293,7 +289,7 @@
  void xhci_update_tt_active_eps(struct xhci_hcd *xhci,
  		struct xhci_virt_device *virt_dev,
  		int old_active_eps);
-@@ -2015,10 +2007,7 @@ void xhci_quiesce(struct xhci_hcd *xhci);
+@@ -2017,10 +2009,7 @@ void xhci_quiesce(struct xhci_hcd *xhci)
  int xhci_halt(struct xhci_hcd *xhci);
  int xhci_start(struct xhci_hcd *xhci);
  int xhci_reset(struct xhci_hcd *xhci);
@@ -304,7 +300,7 @@
  int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks);
  void xhci_init_driver(struct hc_driver *drv,
  		      const struct xhci_driver_overrides *over);
-@@ -2033,36 +2022,13 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated);
+@@ -2035,36 +2024,13 @@ int xhci_resume(struct xhci_hcd *xhci, b
  #define	xhci_resume	NULL
  #endif
  
@@ -341,7 +337,7 @@
  
  /* xHCI ring, segment, TRB, and TD functions */
  dma_addr_t xhci_trb_virt_to_dma(struct xhci_segment *seg, union xhci_trb *trb);
-@@ -2106,9 +2072,6 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
+@@ -2108,9 +2074,6 @@ void xhci_queue_new_dequeue_state(struct
  		struct xhci_dequeue_state *deq_state);
  void xhci_cleanup_stalled_ring(struct xhci_hcd *xhci,
  		unsigned int ep_index, struct xhci_td *td);
@@ -351,7 +347,7 @@
  void xhci_stop_endpoint_command_watchdog(unsigned long arg);
  void xhci_handle_command_timeout(struct work_struct *work);
  
-@@ -2119,10 +2082,6 @@ void xhci_cleanup_command_queue(struct xhci_hcd *xhci);
+@@ -2121,10 +2084,6 @@ void xhci_cleanup_command_queue(struct x
  /* xHCI roothub code */
  void xhci_set_link_state(struct xhci_hcd *xhci, __le32 __iomem **port_array,
  				int port_id, u32 link_state);
@@ -362,6 +358,3 @@
  void xhci_test_and_clear_bit(struct xhci_hcd *xhci, __le32 __iomem **port_array,
  				int port_id, u32 port_bit);
  int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex,
--- 
-2.13.3
-
diff --git a/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch b/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch
index e0c607a..9be3727 100644
--- a/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch
+++ b/patches.renesas/0191-usb-xhci-remove-error-messages-for-failed-memory-all.patch
@@ -12,17 +12,15 @@
 (cherry picked from commit 74e0b5649c26428a4b87f496cef0df8307eff364)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-hub.c  |  4 +---
- drivers/usb/host/xhci-mem.c  |  1 -
- drivers/usb/host/xhci-ring.c | 10 ++++------
- drivers/usb/host/xhci.c      | 13 +++++++------
+ drivers/usb/host/xhci-hub.c  |    4 +---
+ drivers/usb/host/xhci-mem.c  |    1 -
+ drivers/usb/host/xhci-ring.c |   10 ++++------
+ drivers/usb/host/xhci.c      |   13 +++++++------
  4 files changed, 12 insertions(+), 16 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index 0b88e76251eb..ab818bd5d0ac 100644
 --- a/drivers/usb/host/xhci-hub.c
 +++ b/drivers/usb/host/xhci-hub.c
-@@ -392,10 +392,8 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)
+@@ -392,10 +392,8 @@ static int xhci_stop_device(struct xhci_
  	trace_xhci_stop_device(virt_dev);
  
  	cmd = xhci_alloc_command(xhci, false, true, GFP_NOIO);
@@ -34,11 +32,9 @@
  
  	spin_lock_irqsave(&xhci->lock, flags);
  	for (i = LAST_EP_INDEX; i > 0; i--) {
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 3fc323b92cc8..e2e27a332e9a 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -2619,7 +2619,6 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
+@@ -2619,7 +2619,6 @@ int xhci_mem_init(struct xhci_hcd *xhci,
  	return 0;
  
  fail:
@@ -46,11 +42,9 @@
  	xhci_halt(xhci);
  	xhci_reset(xhci);
  	xhci_mem_cleanup(xhci);
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 28ea69338ed1..deb318e0c679 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -1135,11 +1135,11 @@ static void xhci_handle_cmd_reset_ep(struct xhci_hcd *xhci, int slot_id,
+@@ -1138,11 +1138,11 @@ static void xhci_handle_cmd_reset_ep(str
  	 */
  	if (xhci->quirks & XHCI_RESET_EP_QUIRK) {
  		struct xhci_command *command;
@@ -65,7 +59,7 @@
  		xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
  				"Queueing configure endpoint command");
  		xhci_queue_configure_endpoint(xhci, command,
-@@ -4015,10 +4015,8 @@ void xhci_queue_new_dequeue_state(struct xhci_hcd *xhci,
+@@ -4018,10 +4018,8 @@ void xhci_queue_new_dequeue_state(struct
  
  	/* This function gets called from contexts where it cannot sleep */
  	cmd = xhci_alloc_command(xhci, false, false, GFP_ATOMIC);
@@ -77,11 +71,9 @@
  
  	ep->queued_deq_seg = deq_state->new_deq_seg;
  	ep->queued_deq_ptr = deq_state->new_deq_ptr;
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 7867b2d3b693..e0392564ed33 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -661,9 +661,11 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -664,9 +664,11 @@ int xhci_run(struct usb_hcd *hcd)
  
  	if (xhci->quirks & XHCI_NEC_HOST) {
  		struct xhci_command *command;
@@ -93,7 +85,7 @@
  		xhci_queue_vendor_command(xhci, command, 0, 0, 0,
  				TRB_TYPE(TRB_NEC_GET_FW));
  	}
-@@ -3141,10 +3143,9 @@ static int xhci_alloc_streams(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3147,10 +3149,9 @@ static int xhci_alloc_streams(struct usb
  	}
  
  	config_cmd = xhci_alloc_command(xhci, true, true, mem_flags);
@@ -106,7 +98,7 @@
  	ctrl_ctx = xhci_get_input_control_ctx(config_cmd->in_ctx);
  	if (!ctrl_ctx) {
  		xhci_warn(xhci, "%s: Could not get input context, bad type.\n",
-@@ -4750,11 +4751,11 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
+@@ -4756,11 +4757,11 @@ static int xhci_update_hub_device(struct
  		xhci_warn(xhci, "Cannot update hub desc for unknown device.\n");
  		return -EINVAL;
  	}
@@ -121,6 +113,3 @@
  	ctrl_ctx = xhci_get_input_control_ctx(config_cmd->in_ctx);
  	if (!ctrl_ctx) {
  		xhci_warn(xhci, "%s: Could not get input context, bad type.\n",
--- 
-2.13.3
-
diff --git a/patches.renesas/0192-usb-xhci-remove-enq_updates-and-deq_updates-from-rin.patch b/patches.renesas/0192-usb-xhci-remove-enq_updates-and-deq_updates-from-rin.patch
index 94ab3fa..433ba58 100644
--- a/patches.renesas/0192-usb-xhci-remove-enq_updates-and-deq_updates-from-rin.patch
+++ b/patches.renesas/0192-usb-xhci-remove-enq_updates-and-deq_updates-from-rin.patch
@@ -16,17 +16,15 @@
 (cherry picked from commit cd12fd9f6d05d1b2b9ff2630802c55b5fd2e534c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-dbg.c  | 8 --------
- drivers/usb/host/xhci-mem.c  | 3 ---
- drivers/usb/host/xhci-ring.c | 3 ---
- drivers/usb/host/xhci.h      | 2 --
+ drivers/usb/host/xhci-dbg.c  |    8 --------
+ drivers/usb/host/xhci-mem.c  |    3 ---
+ drivers/usb/host/xhci-ring.c |    3 ---
+ drivers/usb/host/xhci.h      |    2 --
  4 files changed, 16 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
-index f6d30314348d..21c563f9a98d 100644
 --- a/drivers/usb/host/xhci-dbg.c
 +++ b/drivers/usb/host/xhci-dbg.c
-@@ -347,14 +347,10 @@ void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring)
+@@ -347,14 +347,10 @@ void xhci_dbg_ring_ptrs(struct xhci_hcd
  			ring->dequeue,
  			(unsigned long long)xhci_trb_virt_to_dma(ring->deq_seg,
  							    ring->dequeue));
@@ -41,7 +39,7 @@
  }
  
  /**
-@@ -373,10 +369,6 @@ void xhci_debug_ring(struct xhci_hcd *xhci, struct xhci_ring *ring)
+@@ -373,10 +369,6 @@ void xhci_debug_ring(struct xhci_hcd *xh
  	struct xhci_segment *first_seg = ring->first_seg;
  	xhci_debug_segment(xhci, first_seg);
  
@@ -52,11 +50,9 @@
  	for (seg = first_seg->next; seg != first_seg; seg = seg->next)
  		xhci_debug_segment(xhci, seg);
  }
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index e2e27a332e9a..9b37ef13bf3a 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -315,9 +315,6 @@ static void xhci_initialize_ring_info(struct xhci_ring *ring,
+@@ -315,9 +315,6 @@ static void xhci_initialize_ring_info(st
  	 * handling ring expansion, set the cycle state equal to the old ring.
  	 */
  	ring->cycle_state = cycle_state;
@@ -66,11 +62,9 @@
  
  	/*
  	 * Each segment has a link TRB, and leave an extra TRB for SW
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index deb318e0c679..b382cf071562 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -167,8 +167,6 @@ static void next_trb(struct xhci_hcd *xhci,
+@@ -167,8 +167,6 @@ static void next_trb(struct xhci_hcd *xh
   */
  static void inc_deq(struct xhci_hcd *xhci, struct xhci_ring *ring)
  {
@@ -79,7 +73,7 @@
  	/* event ring doesn't have link trbs, check for last trb */
  	if (ring->type == TYPE_EVENT) {
  		if (!last_trb_on_seg(ring->deq_seg, ring->dequeue)) {
-@@ -226,7 +224,6 @@ static void inc_enq(struct xhci_hcd *xhci, struct xhci_ring *ring,
+@@ -226,7 +224,6 @@ static void inc_enq(struct xhci_hcd *xhc
  		ring->num_trbs_free--;
  	next = ++(ring->enqueue);
  
@@ -87,8 +81,6 @@
  	/* Update the dequeue pointer further if that was a link TRB */
  	while (trb_is_link(next)) {
  
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 8b360f60d81e..770947b4e9a8 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
 @@ -1566,10 +1566,8 @@ struct xhci_ring {
@@ -102,6 +94,3 @@
  	struct list_head	td_list;
  	/*
  	 * Write the cycle state into the TRB cycle field to give ownership of
--- 
-2.13.3
-
diff --git a/patches.renesas/0193-usb-xhci-remove-ring-debugging-code.patch b/patches.renesas/0193-usb-xhci-remove-ring-debugging-code.patch
index d23bd94..771c667 100644
--- a/patches.renesas/0193-usb-xhci-remove-ring-debugging-code.patch
+++ b/patches.renesas/0193-usb-xhci-remove-ring-debugging-code.patch
@@ -13,17 +13,15 @@
 (cherry picked from commit 121dcf11908ecea252776c8268aab117f91aa1f5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-dbg.c  | 62 --------------------------------------------
- drivers/usb/host/xhci-ring.c |  4 ---
- drivers/usb/host/xhci.c      |  6 -----
- drivers/usb/host/xhci.h      |  3 ---
+ drivers/usb/host/xhci-dbg.c  |   62 -------------------------------------------
+ drivers/usb/host/xhci-ring.c |    4 --
+ drivers/usb/host/xhci.c      |    6 ----
+ drivers/usb/host/xhci.h      |    3 --
  4 files changed, 75 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
-index 21c563f9a98d..77f80ceeccab 100644
 --- a/drivers/usb/host/xhci-dbg.c
 +++ b/drivers/usb/host/xhci-dbg.c
-@@ -311,68 +311,6 @@ void xhci_debug_trb(struct xhci_hcd *xhci, union xhci_trb *trb)
+@@ -311,68 +311,6 @@ void xhci_debug_trb(struct xhci_hcd *xhc
  	}
  }
  
@@ -92,11 +90,9 @@
  void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst)
  {
  	u64 addr = erst->erst_dma_addr;
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index b382cf071562..a2bfd75b1ae6 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -2292,8 +2292,6 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2295,8 +2295,6 @@ static int handle_tx_event(struct xhci_h
  			 upper_32_bits(le64_to_cpu(event->buffer)),
  			 le32_to_cpu(event->transfer_len),
  			 le32_to_cpu(event->flags));
@@ -105,7 +101,7 @@
  		return -ENODEV;
  	}
  
-@@ -2314,8 +2312,6 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2317,8 +2315,6 @@ static int handle_tx_event(struct xhci_h
  			 upper_32_bits(le64_to_cpu(event->buffer)),
  			 le32_to_cpu(event->transfer_len),
  			 le32_to_cpu(event->flags));
@@ -114,11 +110,9 @@
  		return -ENODEV;
  	}
  
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index e0392564ed33..7ac9a84376dc 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -619,16 +619,10 @@ int xhci_run(struct usb_hcd *hcd)
+@@ -622,16 +622,10 @@ int xhci_run(struct usb_hcd *hcd)
  	if (ret)
  		return ret;
  
@@ -135,11 +129,9 @@
  	temp_64 = xhci_read_64(xhci, &xhci->ir_set->erst_dequeue);
  	temp_64 &= ~ERST_PTR_MASK;
  	xhci_dbg_trace(xhci, trace_xhci_dbg_init,
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 770947b4e9a8..b7338a303e40 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1924,11 +1924,8 @@ void xhci_dbg_regs(struct xhci_hcd *xhci);
+@@ -1926,11 +1926,8 @@ void xhci_dbg_regs(struct xhci_hcd *xhci
  void xhci_print_run_regs(struct xhci_hcd *xhci);
  void xhci_print_trb_offsets(struct xhci_hcd *xhci, union xhci_trb *trb);
  void xhci_debug_trb(struct xhci_hcd *xhci, union xhci_trb *trb);
@@ -151,6 +143,3 @@
  void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep);
  char *xhci_get_slot_state(struct xhci_hcd *xhci,
  		struct xhci_container_ctx *ctx);
--- 
-2.13.3
-
diff --git a/patches.renesas/0194-usb-xhci-remove-xhci_debug_trb.patch b/patches.renesas/0194-usb-xhci-remove-xhci_debug_trb.patch
index 7b29940..99fa7b3 100644
--- a/patches.renesas/0194-usb-xhci-remove-xhci_debug_trb.patch
+++ b/patches.renesas/0194-usb-xhci-remove-xhci_debug_trb.patch
@@ -13,16 +13,14 @@
 (cherry picked from commit 8c10152ec52b850f9806c5c2f5a93ebe38838959)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-dbg.c  | 57 --------------------------------------------
- drivers/usb/host/xhci-ring.c |  4 ----
- drivers/usb/host/xhci.h      |  2 --
+ drivers/usb/host/xhci-dbg.c  |   57 -------------------------------------------
+ drivers/usb/host/xhci-ring.c |    4 ---
+ drivers/usb/host/xhci.h      |    2 -
  3 files changed, 63 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
-index 77f80ceeccab..dc0194b87b74 100644
 --- a/drivers/usb/host/xhci-dbg.c
 +++ b/drivers/usb/host/xhci-dbg.c
-@@ -254,63 +254,6 @@ void xhci_print_registers(struct xhci_hcd *xhci)
+@@ -254,63 +254,6 @@ void xhci_print_registers(struct xhci_hc
  	xhci_print_ports(xhci);
  }
  
@@ -86,11 +84,9 @@
  void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst)
  {
  	u64 addr = erst->erst_dma_addr;
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index a2bfd75b1ae6..74bf5c60a260 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -2463,10 +2463,6 @@ static int handle_tx_event(struct xhci_hcd *xhci,
+@@ -2466,10 +2466,6 @@ static int handle_tx_event(struct xhci_h
  				xhci_warn(xhci, "WARN Event TRB for slot %d ep %d with no TDs queued?\n",
  						TRB_TO_SLOT_ID(le32_to_cpu(event->flags)),
  						ep_index);
@@ -101,11 +97,9 @@
  			}
  			if (ep->skip) {
  				ep->skip = false;
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index b7338a303e40..ed6d094381af 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1922,8 +1922,6 @@ void xhci_print_ir_set(struct xhci_hcd *xhci, int set_num);
+@@ -1924,8 +1924,6 @@ void xhci_print_ir_set(struct xhci_hcd *
  void xhci_print_registers(struct xhci_hcd *xhci);
  void xhci_dbg_regs(struct xhci_hcd *xhci);
  void xhci_print_run_regs(struct xhci_hcd *xhci);
@@ -114,6 +108,3 @@
  void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst);
  void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci);
  void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep);
--- 
-2.13.3
-
diff --git a/patches.renesas/0195-usb-xhci-remove-xhci_dbg_ctx.patch b/patches.renesas/0195-usb-xhci-remove-xhci_dbg_ctx.patch
index f380edf..636a6ab 100644
--- a/patches.renesas/0195-usb-xhci-remove-xhci_dbg_ctx.patch
+++ b/patches.renesas/0195-usb-xhci-remove-xhci_dbg_ctx.patch
@@ -13,16 +13,14 @@
 (cherry picked from commit c8844f2ddb0d2bc42a813c567ad4240759f373bd)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-dbg.c | 143 --------------------------------------------
- drivers/usb/host/xhci.c     |  37 ------------
- drivers/usb/host/xhci.h     |   1 -
+ drivers/usb/host/xhci-dbg.c |  143 --------------------------------------------
+ drivers/usb/host/xhci.c     |   37 -----------
+ drivers/usb/host/xhci.h     |    1 
  3 files changed, 181 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c
-index dc0194b87b74..2c83b37ae8f2 100644
 --- a/drivers/usb/host/xhci-dbg.c
 +++ b/drivers/usb/host/xhci-dbg.c
-@@ -283,19 +283,6 @@ void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci)
+@@ -283,19 +283,6 @@ void xhci_dbg_cmd_ptrs(struct xhci_hcd *
  			upper_32_bits(val));
  }
  
@@ -42,7 +40,7 @@
  char *xhci_get_slot_state(struct xhci_hcd *xhci,
  		struct xhci_container_ctx *ctx)
  {
-@@ -305,136 +292,6 @@ char *xhci_get_slot_state(struct xhci_hcd *xhci,
+@@ -305,136 +292,6 @@ char *xhci_get_slot_state(struct xhci_hc
  	return xhci_slot_state_string(state);
  }
  
@@ -179,11 +177,9 @@
  void xhci_dbg_trace(struct xhci_hcd *xhci, void (*trace)(struct va_format *),
  			const char *fmt, ...)
  {
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 7ac9a84376dc..dd2b42f52d99 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -1302,11 +1302,6 @@ static int xhci_check_maxpacket(struct xhci_hcd *xhci, unsigned int slot_id,
+@@ -1308,11 +1308,6 @@ static int xhci_check_maxpacket(struct x
  		ctrl_ctx->add_flags = cpu_to_le32(EP0_FLAG);
  		ctrl_ctx->drop_flags = 0;
  
@@ -195,7 +191,7 @@
  		ret = xhci_configure_endpoint(xhci, urb->dev, command,
  				true, false);
  
-@@ -1854,7 +1849,6 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
+@@ -1860,7 +1855,6 @@ static int xhci_evaluate_context_result(
  		struct usb_device *udev, u32 *cmd_status)
  {
  	int ret;
@@ -203,7 +199,7 @@
  
  	switch (*cmd_status) {
  	case COMP_COMMAND_ABORTED:
-@@ -1875,7 +1869,6 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
+@@ -1881,7 +1875,6 @@ static int xhci_evaluate_context_result(
  	case COMP_CONTEXT_STATE_ERROR:
  		dev_warn(&udev->dev,
  			"WARN: invalid context state for evaluate context command.\n");
@@ -211,7 +207,7 @@
  		ret = -EINVAL;
  		break;
  	case COMP_INCOMPATIBLE_DEVICE_ERROR:
-@@ -2754,9 +2747,6 @@ static int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -2760,9 +2753,6 @@ static int xhci_check_bandwidth(struct u
  			break;
  		}
  	}
@@ -221,7 +217,7 @@
  
  	ret = xhci_configure_endpoint(xhci, udev, command,
  			false, false);
-@@ -2764,10 +2754,6 @@ static int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev)
+@@ -2770,10 +2760,6 @@ static int xhci_check_bandwidth(struct u
  		/* Callee should call reset_bandwidth() */
  		goto command_cleanup;
  
@@ -232,7 +228,7 @@
  	/* Free any rings that were dropped, but not changed. */
  	for (i = 1; i < 31; i++) {
  		if ((le32_to_cpu(ctrl_ctx->drop_flags) & (1 << (i + 1))) &&
-@@ -2834,9 +2820,6 @@ static void xhci_setup_input_ctx_for_config_ep(struct xhci_hcd *xhci,
+@@ -2840,9 +2826,6 @@ static void xhci_setup_input_ctx_for_con
  	ctrl_ctx->drop_flags = cpu_to_le32(drop_flags);
  	xhci_slot_copy(xhci, in_ctx, out_ctx);
  	ctrl_ctx->add_flags |= cpu_to_le32(SLOT_FLAG);
@@ -242,7 +238,7 @@
  }
  
  static void xhci_setup_input_ctx_for_quirk(struct xhci_hcd *xhci,
-@@ -3549,9 +3532,6 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
+@@ -3555,9 +3538,6 @@ static int xhci_discover_or_reset_device
  	}
  	/* If necessary, update the number of active TTs on this root port */
  	xhci_update_tt_active_eps(xhci, virt_dev, old_active_eps);
@@ -252,7 +248,7 @@
  	ret = 0;
  
  command_cleanup:
-@@ -3851,8 +3831,6 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3857,8 +3837,6 @@ static int xhci_setup_device(struct usb_
  	ctrl_ctx->add_flags = cpu_to_le32(SLOT_FLAG | EP0_FLAG);
  	ctrl_ctx->drop_flags = 0;
  
@@ -261,7 +257,7 @@
  	trace_xhci_address_ctx(xhci, virt_dev->in_ctx,
  				le32_to_cpu(slot_ctx->dev_info) >> 27);
  
-@@ -3905,8 +3883,6 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3911,8 +3889,6 @@ static int xhci_setup_device(struct usb_
  		xhci_err(xhci,
  			 "ERROR: unexpected setup %s command completion code 0x%x.\n",
  			 act, command->status);
@@ -270,7 +266,7 @@
  		trace_xhci_address_ctx(xhci, virt_dev->out_ctx, 1);
  		ret = -EINVAL;
  		break;
-@@ -3925,12 +3901,8 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3931,12 +3907,8 @@ static int xhci_setup_device(struct usb_
  	xhci_dbg_trace(xhci, trace_xhci_dbg_address,
  			"Output Context DMA address = %#08llx",
  			(unsigned long long)virt_dev->out_ctx->dma);
@@ -283,7 +279,7 @@
  	/*
  	 * USB core uses address 1 for the roothubs, so we add one to the
  	 * address given back to us by the HC.
-@@ -4035,14 +4007,10 @@ static int __maybe_unused xhci_change_max_exit_latency(struct xhci_hcd *xhci,
+@@ -4041,14 +4013,10 @@ static int __maybe_unused xhci_change_ma
  
  	xhci_dbg_trace(xhci, trace_xhci_dbg_context_change,
  			"Set up evaluate context for LPM MEL change.");
@@ -298,7 +294,7 @@
  
  	if (!ret) {
  		spin_lock_irqsave(&xhci->lock, flags);
-@@ -4810,8 +4778,6 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
+@@ -4816,8 +4784,6 @@ static int xhci_update_hub_device(struct
  	xhci_dbg(xhci, "Set up %s for hub device.\n",
  			(xhci->hci_version > 0x95) ?
  			"configure endpoint" : "evaluate context");
@@ -307,7 +303,7 @@
  
  	/* Issue and wait for the configure endpoint or
  	 * evaluate context command.
-@@ -4823,9 +4789,6 @@ static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev,
+@@ -4829,9 +4795,6 @@ static int xhci_update_hub_device(struct
  		ret = xhci_configure_endpoint(xhci, hdev, config_cmd,
  				true, false);
  
@@ -317,11 +313,9 @@
  	xhci_free_command(xhci, config_cmd);
  	return ret;
  }
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index ed6d094381af..064d48afe496 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1924,7 +1924,6 @@ void xhci_dbg_regs(struct xhci_hcd *xhci);
+@@ -1926,7 +1926,6 @@ void xhci_dbg_regs(struct xhci_hcd *xhci
  void xhci_print_run_regs(struct xhci_hcd *xhci);
  void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst);
  void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci);
@@ -329,6 +323,3 @@
  char *xhci_get_slot_state(struct xhci_hcd *xhci,
  		struct xhci_container_ctx *ctx);
  void xhci_dbg_trace(struct xhci_hcd *xhci, void (*trace)(struct va_format *),
--- 
-2.13.3
-
diff --git a/patches.renesas/0196-usb-xhci-fix-link-trb-decoding.patch b/patches.renesas/0196-usb-xhci-fix-link-trb-decoding.patch
index c077d4d..18298f8 100644
--- a/patches.renesas/0196-usb-xhci-fix-link-trb-decoding.patch
+++ b/patches.renesas/0196-usb-xhci-fix-link-trb-decoding.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit 96d9a6eb97d77d6a3768f101f400c42743799bb2)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci.h | 12 +++++-------
+ drivers/usb/host/xhci.h |   12 +++++-------
  1 file changed, 5 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 064d48afe496..fcf72937e5ec 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -2136,14 +2136,12 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2138,14 +2138,12 @@ static inline const char *xhci_decode_tr
  	switch (type) {
  	case TRB_LINK:
  		sprintf(str,
@@ -40,6 +38,3 @@
  			field3 & TRB_CYCLE ? 'C' : 'c');
  		break;
  	case TRB_TRANSFER:
--- 
-2.13.3
-
diff --git a/patches.renesas/0197-usb-xhci-refine-xhci_decode_trb.patch b/patches.renesas/0197-usb-xhci-refine-xhci_decode_trb.patch
index 250d17a..c6f736b 100644
--- a/patches.renesas/0197-usb-xhci-refine-xhci_decode_trb.patch
+++ b/patches.renesas/0197-usb-xhci-refine-xhci_decode_trb.patch
@@ -12,14 +12,12 @@
 (cherry picked from commit d2561626b9d126a94753ad6f048114bab702f02f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci.h | 40 ++++++++++++++++++++--------------------
+ drivers/usb/host/xhci.h |   40 ++++++++++++++++++++--------------------
  1 file changed, 20 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index fcf72937e5ec..914968c662c9 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -2138,7 +2138,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2140,7 +2140,7 @@ static inline const char *xhci_decode_tr
  		sprintf(str,
  			"LINK %08x%08x intr %d type '%s' flags %c:%c:%c:%c",
  			field1, field0, GET_INTR_TARGET(field2),
@@ -28,7 +26,7 @@
  			field3 & TRB_IOC ? 'I' : 'i',
  			field3 & TRB_CHAIN ? 'C' : 'c',
  			field3 & TRB_TC ? 'T' : 't',
-@@ -2159,7 +2159,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2161,7 +2161,7 @@ static inline const char *xhci_decode_tr
  			EVENT_TRB_LEN(field2), TRB_TO_SLOT_ID(field3),
  			/* Macro decrements 1, maybe it shouldn't?!? */
  			TRB_TO_EP_INDEX(field3) + 1,
@@ -37,7 +35,7 @@
  			field3 & EVENT_DATA ? 'E' : 'e',
  			field3 & TRB_CYCLE ? 'C' : 'c');
  
-@@ -2176,7 +2176,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2178,7 +2178,7 @@ static inline const char *xhci_decode_tr
  				(field1 & 0xff0000) >> 16,
  				TRB_LEN(field2), GET_TD_SIZE(field2),
  				GET_INTR_TARGET(field2),
@@ -46,7 +44,7 @@
  				field3 & TRB_IDT ? 'I' : 'i',
  				field3 & TRB_IOC ? 'I' : 'i',
  				field3 & TRB_CYCLE ? 'C' : 'c');
-@@ -2185,7 +2185,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2187,7 +2187,7 @@ static inline const char *xhci_decode_tr
  		sprintf(str, "Buffer %08x%08x length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c:%c:%c:%c",
  				field1, field0, TRB_LEN(field2), GET_TD_SIZE(field2),
  				GET_INTR_TARGET(field2),
@@ -55,7 +53,7 @@
  				field3 & TRB_IDT ? 'I' : 'i',
  				field3 & TRB_IOC ? 'I' : 'i',
  				field3 & TRB_CHAIN ? 'C' : 'c',
-@@ -2198,7 +2198,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2200,7 +2200,7 @@ static inline const char *xhci_decode_tr
  		sprintf(str, "Buffer %08x%08x length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c",
  				field1, field0, TRB_LEN(field2), GET_TD_SIZE(field2),
  				GET_INTR_TARGET(field2),
@@ -64,7 +62,7 @@
  				field3 & TRB_IOC ? 'I' : 'i',
  				field3 & TRB_CHAIN ? 'C' : 'c',
  				field3 & TRB_ENT ? 'E' : 'e',
-@@ -2212,7 +2212,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2214,7 +2214,7 @@ static inline const char *xhci_decode_tr
  			"Buffer %08x%08x length %d TD size %d intr %d type '%s' flags %c:%c:%c:%c:%c:%c:%c:%c",
  			field1, field0, TRB_LEN(field2), GET_TD_SIZE(field2),
  			GET_INTR_TARGET(field2),
@@ -73,7 +71,7 @@
  			field3 & TRB_BEI ? 'B' : 'b',
  			field3 & TRB_IDT ? 'I' : 'i',
  			field3 & TRB_IOC ? 'I' : 'i',
-@@ -2227,21 +2227,21 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2229,21 +2229,21 @@ static inline const char *xhci_decode_tr
  	case TRB_ENABLE_SLOT:
  		sprintf(str,
  			"%s: flags %c",
@@ -98,7 +96,7 @@
  			field1, field0,
  			TRB_TO_SLOT_ID(field3),
  			field3 & TRB_BSR ? 'B' : 'b',
-@@ -2250,7 +2250,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2252,7 +2252,7 @@ static inline const char *xhci_decode_tr
  	case TRB_CONFIG_EP:
  		sprintf(str,
  			"%s: ctx %08x%08x slot %d flags %c:%c",
@@ -107,7 +105,7 @@
  			field1, field0,
  			TRB_TO_SLOT_ID(field3),
  			field3 & TRB_DC ? 'D' : 'd',
-@@ -2259,7 +2259,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2261,7 +2261,7 @@ static inline const char *xhci_decode_tr
  	case TRB_EVAL_CONTEXT:
  		sprintf(str,
  			"%s: ctx %08x%08x slot %d flags %c",
@@ -116,7 +114,7 @@
  			field1, field0,
  			TRB_TO_SLOT_ID(field3),
  			field3 & TRB_CYCLE ? 'C' : 'c');
-@@ -2267,7 +2267,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2269,7 +2269,7 @@ static inline const char *xhci_decode_tr
  	case TRB_RESET_EP:
  		sprintf(str,
  			"%s: ctx %08x%08x slot %d ep %d flags %c",
@@ -125,7 +123,7 @@
  			field1, field0,
  			TRB_TO_SLOT_ID(field3),
  			/* Macro decrements 1, maybe it shouldn't?!? */
-@@ -2277,7 +2277,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2279,7 +2279,7 @@ static inline const char *xhci_decode_tr
  	case TRB_STOP_RING:
  		sprintf(str,
  			"%s: slot %d sp %d ep %d flags %c",
@@ -134,7 +132,7 @@
  			TRB_TO_SLOT_ID(field3),
  			TRB_TO_SUSPEND_PORT(field3),
  			/* Macro decrements 1, maybe it shouldn't?!? */
-@@ -2287,7 +2287,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2289,7 +2289,7 @@ static inline const char *xhci_decode_tr
  	case TRB_SET_DEQ:
  		sprintf(str,
  			"%s: deq %08x%08x stream %d slot %d ep %d flags %c",
@@ -143,7 +141,7 @@
  			field1, field0,
  			TRB_TO_STREAM_ID(field2),
  			TRB_TO_SLOT_ID(field3),
-@@ -2298,14 +2298,14 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2300,14 +2300,14 @@ static inline const char *xhci_decode_tr
  	case TRB_RESET_DEV:
  		sprintf(str,
  			"%s: slot %d flags %c",
@@ -160,7 +158,7 @@
  			field1, field0,
  			TRB_TO_VF_INTR_TARGET(field2),
  			TRB_TO_VF_ID(field3),
-@@ -2314,14 +2314,14 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2316,14 +2316,14 @@ static inline const char *xhci_decode_tr
  	case TRB_SET_LT:
  		sprintf(str,
  			"%s: belt %d flags %c",
@@ -177,7 +175,7 @@
  			field1, field0,
  			TRB_TO_SLOT_ID(field3),
  			TRB_TO_DEV_SPEED(field3),
-@@ -2330,7 +2330,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2332,7 +2332,7 @@ static inline const char *xhci_decode_tr
  	case TRB_FORCE_HEADER:
  		sprintf(str,
  			"%s: info %08x%08x%08x pkt type %d roothub port %d flags %c",
@@ -186,7 +184,7 @@
  			field2, field1, field0 & 0xffffffe0,
  			TRB_TO_PACKET_TYPE(field0),
  			TRB_TO_ROOTHUB_PORT(field3),
-@@ -2339,7 +2339,7 @@ static inline const char *xhci_decode_trb(u32 field0, u32 field1, u32 field2,
+@@ -2341,7 +2341,7 @@ static inline const char *xhci_decode_tr
  	default:
  		sprintf(str,
  			"type '%s' -> raw %08x %08x %08x %08x",
@@ -195,6 +193,3 @@
  			field0, field1, field2, field3);
  	}
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0198-usb-xhci-bInterval-quirk-for-TI-TUSB73x0.patch b/patches.renesas/0198-usb-xhci-bInterval-quirk-for-TI-TUSB73x0.patch
index 3f795fe..fff638a 100644
--- a/patches.renesas/0198-usb-xhci-bInterval-quirk-for-TI-TUSB73x0.patch
+++ b/patches.renesas/0198-usb-xhci-bInterval-quirk-for-TI-TUSB73x0.patch
@@ -28,14 +28,12 @@
 (cherry picked from commit 69307ccb9ad7ccb653e332de68effdeaaab6907d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-pci.c | 3 +++
+ drivers/usb/host/xhci-pci.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
-index 69864ba38698..8b390cc5167f 100644
 --- a/drivers/usb/host/xhci-pci.c
 +++ b/drivers/usb/host/xhci-pci.c
-@@ -208,6 +208,9 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
+@@ -226,6 +226,9 @@ static void xhci_pci_quirks(struct devic
  	if (pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241)
  		xhci->quirks |= XHCI_LIMIT_ENDPOINT_INTERVAL_7;
  
@@ -45,6 +43,3 @@
  	if (xhci->quirks & XHCI_RESET_ON_RESUME)
  		xhci_dbg_trace(xhci, trace_xhci_dbg_quirks,
  				"QUIRK: Resetting on resume");
--- 
-2.13.3
-
diff --git a/patches.renesas/0199-xhci-use-correct-flags-for-spin_lock_irqrestore-when.patch b/patches.renesas/0199-xhci-use-correct-flags-for-spin_lock_irqrestore-when.patch
index c4229fb..5550476 100644
--- a/patches.renesas/0199-xhci-use-correct-flags-for-spin_lock_irqrestore-when.patch
+++ b/patches.renesas/0199-xhci-use-correct-flags-for-spin_lock_irqrestore-when.patch
@@ -23,14 +23,12 @@
 (cherry picked from commit ec1dafe8ec5f846d6b1b280309d8b03d25b096fd)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-hub.c | 20 ++++++++++----------
+ drivers/usb/host/xhci-hub.c |   20 ++++++++++----------
  1 file changed, 10 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index ab818bd5d0ac..5e3e9d4c6956 100644
 --- a/drivers/usb/host/xhci-hub.c
 +++ b/drivers/usb/host/xhci-hub.c
-@@ -552,11 +552,10 @@ static __le32 __iomem *xhci_get_port_io_addr(struct usb_hcd *hcd, int index)
+@@ -552,11 +552,10 @@ static __le32 __iomem *xhci_get_port_io_
   * method.
   */
  static void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd,
@@ -43,7 +41,7 @@
  
  	addr = xhci_get_port_io_addr(hcd, index);
  	temp = readl(addr);
-@@ -572,13 +571,13 @@ static void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd,
+@@ -572,13 +571,13 @@ static void xhci_set_port_power(struct x
  		writel(temp & ~PORT_POWER, addr);
  	}
  
@@ -59,7 +57,7 @@
  }
  
  static void xhci_port_set_test_mode(struct xhci_hcd *xhci,
-@@ -598,7 +597,7 @@ static void xhci_port_set_test_mode(struct xhci_hcd *xhci,
+@@ -598,7 +597,7 @@ static void xhci_port_set_test_mode(stru
  }
  
  static int xhci_enter_test_mode(struct xhci_hcd *xhci,
@@ -68,7 +66,7 @@
  {
  	int i, retval;
  
-@@ -614,10 +613,10 @@ static int xhci_enter_test_mode(struct xhci_hcd *xhci,
+@@ -614,10 +613,10 @@ static int xhci_enter_test_mode(struct x
  	xhci_dbg(xhci, "Disable all port (PP = 0)\n");
  	/* Power off USB3 ports*/
  	for (i = 0; i < xhci->num_usb3_ports; i++)
@@ -81,7 +79,7 @@
  	/* Stop the controller */
  	xhci_dbg(xhci, "Stop controller\n");
  	retval = xhci_halt(xhci);
-@@ -1209,7 +1208,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1212,7 +1211,7 @@ int xhci_hub_control(struct usb_hcd *hcd
  			 * However, hub_wq will ignore the roothub events until
  			 * the roothub is registered.
  			 */
@@ -90,7 +88,7 @@
  			break;
  		case USB_PORT_FEAT_RESET:
  			temp = (temp | PORT_RESET);
-@@ -1254,7 +1253,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1257,7 +1256,8 @@ int xhci_hub_control(struct usb_hcd *hcd
  				goto error;
  			if (test_mode > TEST_FORCE_EN || test_mode < TEST_J)
  				goto error;
@@ -100,7 +98,7 @@
  			break;
  		default:
  			goto error;
-@@ -1322,7 +1322,7 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
+@@ -1325,7 +1325,7 @@ int xhci_hub_control(struct usb_hcd *hcd
  					port_array[wIndex], temp);
  			break;
  		case USB_PORT_FEAT_POWER:
@@ -109,6 +107,3 @@
  			break;
  		case USB_PORT_FEAT_TEST:
  			retval = xhci_exit_test_mode(xhci);
--- 
-2.13.3
-
diff --git a/patches.renesas/0200-usb-host-plat-Enable-xHCI-plat-runtime-PM.patch b/patches.renesas/0200-usb-host-plat-Enable-xHCI-plat-runtime-PM.patch
index 4a86a8a..9bcf411 100644
--- a/patches.renesas/0200-usb-host-plat-Enable-xHCI-plat-runtime-PM.patch
+++ b/patches.renesas/0200-usb-host-plat-Enable-xHCI-plat-runtime-PM.patch
@@ -18,14 +18,12 @@
 Conflicts:
 	drivers/usb/host/xhci-plat.c
 ---
- drivers/usb/host/xhci-plat.c | 53 ++++++++++++++++++++++++++++++++++++++------
+ drivers/usb/host/xhci-plat.c |   53 +++++++++++++++++++++++++++++++++++++------
  1 file changed, 46 insertions(+), 7 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 37f59a975dd9..6046ae3712fa 100644
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
-@@ -179,9 +179,15 @@ static int xhci_plat_probe(struct platform_device *pdev)
+@@ -179,9 +179,15 @@ static int xhci_plat_probe(struct platfo
  			return ret;
  	}
  
@@ -43,7 +41,7 @@
  
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	hcd->regs = devm_ioremap_resource(&pdev->dev, res);
-@@ -259,6 +265,13 @@ static int xhci_plat_probe(struct platform_device *pdev)
+@@ -259,6 +265,13 @@ static int xhci_plat_probe(struct platfo
  		goto dealloc_usb2_hcd;
  
  	device_enable_async_suspend(&pdev->dev);
@@ -57,7 +55,7 @@
  
  	return 0;
  
-@@ -279,6 +292,10 @@ static int xhci_plat_probe(struct platform_device *pdev)
+@@ -279,6 +292,10 @@ disable_clk:
  put_hcd:
  	usb_put_hcd(hcd);
  
@@ -68,7 +66,7 @@
  	return ret;
  }
  
-@@ -300,6 +317,9 @@ static int xhci_plat_remove(struct platform_device *dev)
+@@ -300,6 +317,9 @@ static int xhci_plat_remove(struct platf
  		clk_disable_unprepare(clk);
  	usb_put_hcd(hcd);
  
@@ -78,7 +76,7 @@
  	return 0;
  }
  
-@@ -327,14 +347,33 @@ static int xhci_plat_resume(struct device *dev)
+@@ -327,14 +347,33 @@ static int xhci_plat_resume(struct devic
  
  	return xhci_resume(xhci, 0);
  }
@@ -116,7 +114,7 @@
  
  static const struct acpi_device_id usb_xhci_acpi_match[] = {
  	/* XHCI-compliant USB Controller */
-@@ -349,7 +388,7 @@ static struct platform_driver usb_xhci_driver = {
+@@ -349,7 +388,7 @@ static struct platform_driver usb_xhci_d
  	.shutdown	= usb_hcd_platform_shutdown,
  	.driver	= {
  		.name = "xhci-hcd",
@@ -125,6 +123,3 @@
  		.of_match_table = of_match_ptr(usb_xhci_of_match),
  		.acpi_match_table = ACPI_PTR(usb_xhci_acpi_match),
  	},
--- 
-2.13.3
-
diff --git a/patches.renesas/0201-usb-host-xhci-plat-enable-clk-in-resume-timing.patch b/patches.renesas/0201-usb-host-xhci-plat-enable-clk-in-resume-timing.patch
index 0e6e666..277ee0e 100644
--- a/patches.renesas/0201-usb-host-xhci-plat-enable-clk-in-resume-timing.patch
+++ b/patches.renesas/0201-usb-host-xhci-plat-enable-clk-in-resume-timing.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit 835e4241e714fbd659838618466766b132823da3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-plat.c | 11 ++++++++++-
+ drivers/usb/host/xhci-plat.c |   11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 6046ae3712fa..89898eae82ae 100644
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
-@@ -328,6 +328,7 @@ static int xhci_plat_suspend(struct device *dev)
+@@ -328,6 +328,7 @@ static int xhci_plat_suspend(struct devi
  {
  	struct usb_hcd	*hcd = dev_get_drvdata(dev);
  	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
@@ -28,7 +26,7 @@
  
  	/*
  	 * xhci_suspend() needs `do_wakeup` to know whether host is allowed
-@@ -337,7 +338,12 @@ static int xhci_plat_suspend(struct device *dev)
+@@ -337,7 +338,12 @@ static int xhci_plat_suspend(struct devi
  	 * reconsider this when xhci_plat_suspend enlarges its scope, e.g.,
  	 * also applies to runtime suspend.
  	 */
@@ -42,7 +40,7 @@
  }
  
  static int xhci_plat_resume(struct device *dev)
-@@ -345,6 +351,9 @@ static int xhci_plat_resume(struct device *dev)
+@@ -345,6 +351,9 @@ static int xhci_plat_resume(struct devic
  	struct usb_hcd	*hcd = dev_get_drvdata(dev);
  	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
  
@@ -52,6 +50,3 @@
  	return xhci_resume(xhci, 0);
  }
  #endif /* CONFIG_PM_SLEEP */
--- 
-2.13.3
-
diff --git a/patches.renesas/0202-usb-host-xhci-plat-add-resume_quirk.patch b/patches.renesas/0202-usb-host-xhci-plat-add-resume_quirk.patch
index 1213638..2b49631 100644
--- a/patches.renesas/0202-usb-host-xhci-plat-add-resume_quirk.patch
+++ b/patches.renesas/0202-usb-host-xhci-plat-add-resume_quirk.patch
@@ -12,15 +12,13 @@
 (cherry picked from commit 98c0a3ffa30c4b389257f7e7ee80ab9e90b78924)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-plat.c | 15 +++++++++++++++
- drivers/usb/host/xhci-plat.h |  1 +
+ drivers/usb/host/xhci-plat.c |   15 +++++++++++++++
+ drivers/usb/host/xhci-plat.h |    1 +
  2 files changed, 16 insertions(+)
 
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 89898eae82ae..96fcba325b93 100644
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
-@@ -54,6 +54,16 @@ static int xhci_priv_init_quirk(struct usb_hcd *hcd)
+@@ -54,6 +54,16 @@ static int xhci_priv_init_quirk(struct u
  	return priv->init_quirk(hcd);
  }
  
@@ -37,7 +35,7 @@
  static void xhci_plat_quirks(struct device *dev, struct xhci_hcd *xhci)
  {
  	/*
-@@ -350,10 +360,15 @@ static int xhci_plat_resume(struct device *dev)
+@@ -350,10 +360,15 @@ static int xhci_plat_resume(struct devic
  {
  	struct usb_hcd	*hcd = dev_get_drvdata(dev);
  	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
@@ -53,8 +51,6 @@
  	return xhci_resume(xhci, 0);
  }
  #endif /* CONFIG_PM_SLEEP */
-diff --git a/drivers/usb/host/xhci-plat.h b/drivers/usb/host/xhci-plat.h
-index 9af0cb48053f..29b227895b07 100644
 --- a/drivers/usb/host/xhci-plat.h
 +++ b/drivers/usb/host/xhci-plat.h
 @@ -17,6 +17,7 @@ struct xhci_plat_priv {
@@ -65,6 +61,3 @@
  };
  
  #define hcd_to_xhci_priv(h) ((struct xhci_plat_priv *)hcd_to_xhci(h)->priv)
--- 
-2.13.3
-
diff --git a/patches.renesas/0203-usb-host-xhci-plat-set-resume_quirk-for-R-Car-contro.patch b/patches.renesas/0203-usb-host-xhci-plat-set-resume_quirk-for-R-Car-contro.patch
index 830b48c..9df971b 100644
--- a/patches.renesas/0203-usb-host-xhci-plat-set-resume_quirk-for-R-Car-contro.patch
+++ b/patches.renesas/0203-usb-host-xhci-plat-set-resume_quirk-for-R-Car-contro.patch
@@ -15,16 +15,14 @@
 (cherry picked from commit 435cc1138ec94af7497ea68c8eb8b0c17cfcf002)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-plat.c |  3 +++
- drivers/usb/host/xhci-rcar.c | 11 +++++++++++
- drivers/usb/host/xhci-rcar.h |  6 ++++++
+ drivers/usb/host/xhci-plat.c |    3 +++
+ drivers/usb/host/xhci-rcar.c |   11 +++++++++++
+ drivers/usb/host/xhci-rcar.h |    6 ++++++
  3 files changed, 20 insertions(+)
 
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 96fcba325b93..8728ce7bf245 100644
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
-@@ -102,18 +102,21 @@ static const struct xhci_plat_priv xhci_plat_renesas_rcar_gen2 = {
+@@ -102,18 +102,21 @@ static const struct xhci_plat_priv xhci_
  	.firmware_name = XHCI_RCAR_FIRMWARE_NAME_V1,
  	.init_quirk = xhci_rcar_init_quirk,
  	.plat_start = xhci_rcar_start,
@@ -46,11 +44,9 @@
  };
  
  static const struct of_device_id usb_xhci_of_match[] = {
-diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c
-index d28df386e780..07278228214b 100644
 --- a/drivers/usb/host/xhci-rcar.c
 +++ b/drivers/usb/host/xhci-rcar.c
-@@ -198,3 +198,14 @@ int xhci_rcar_init_quirk(struct usb_hcd *hcd)
+@@ -198,3 +198,14 @@ int xhci_rcar_init_quirk(struct usb_hcd
  
  	return xhci_rcar_download_firmware(hcd);
  }
@@ -65,8 +61,6 @@
 +
 +	return ret;
 +}
-diff --git a/drivers/usb/host/xhci-rcar.h b/drivers/usb/host/xhci-rcar.h
-index d2ffe20401cf..d247951147a1 100644
 --- a/drivers/usb/host/xhci-rcar.h
 +++ b/drivers/usb/host/xhci-rcar.h
 @@ -18,6 +18,7 @@
@@ -77,7 +71,7 @@
  #else
  static inline void xhci_rcar_start(struct usb_hcd *hcd)
  {
-@@ -27,5 +28,10 @@ static inline int xhci_rcar_init_quirk(struct usb_hcd *hcd)
+@@ -27,5 +28,10 @@ static inline int xhci_rcar_init_quirk(s
  {
  	return 0;
  }
@@ -88,6 +82,3 @@
 +}
  #endif
  #endif /* _XHCI_RCAR_H */
--- 
-2.13.3
-
diff --git a/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch b/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch
index 08c2a63..9735f18 100644
--- a/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch
+++ b/patches.renesas/0204-usb-host-xhci-using-correct-specification-chapter-re.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit 724e882daeb67d58d04a3d0f8cccdd33775bb9bb)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-mem.c | 2 +-
+ drivers/usb/host/xhci-mem.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 9b37ef13bf3a..87169f5dd4de 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -2434,7 +2434,7 @@ int xhci_mem_init(struct xhci_hcd *xhci, gfp_t flags)
+@@ -2434,7 +2434,7 @@ int xhci_mem_init(struct xhci_hcd *xhci,
  	writel(val, &xhci->op_regs->config_reg);
  
  	/*
@@ -29,6 +27,3 @@
  	 * "physically contiguous and 64-byte (cache line) aligned".
  	 */
  	xhci->dcbaa = dma_alloc_coherent(dev, sizeof(*xhci->dcbaa), &dma,
--- 
-2.13.3
-
diff --git a/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch b/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch
index 26a3c8c..2cf8277 100644
--- a/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch
+++ b/patches.renesas/0205-usb-host-xhci-delete-sp_dma_buffers-for-scratchpad.patch
@@ -12,15 +12,13 @@
 (cherry picked from commit 314eaf7dec13b975e51c8faf980f7b0f4e20b3e9)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-mem.c | 18 ++++--------------
- drivers/usb/host/xhci.h     |  1 -
+ drivers/usb/host/xhci-mem.c |   18 ++++--------------
+ drivers/usb/host/xhci.h     |    1 -
  2 files changed, 4 insertions(+), 15 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index 87169f5dd4de..ea1308a7b814 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -1721,36 +1721,27 @@ static int scratchpad_alloc(struct xhci_hcd *xhci, gfp_t flags)
+@@ -1721,36 +1721,27 @@ static int scratchpad_alloc(struct xhci_
  	if (!xhci->scratchpad->sp_buffers)
  		goto fail_sp3;
  
@@ -60,7 +58,7 @@
  	kfree(xhci->scratchpad->sp_buffers);
  
   fail_sp3:
-@@ -1780,9 +1771,8 @@ static void scratchpad_free(struct xhci_hcd *xhci)
+@@ -1780,9 +1771,8 @@ static void scratchpad_free(struct xhci_
  	for (i = 0; i < num_sp; i++) {
  		dma_free_coherent(dev, xhci->page_size,
  				    xhci->scratchpad->sp_buffers[i],
@@ -71,8 +69,6 @@
  	kfree(xhci->scratchpad->sp_buffers);
  	dma_free_coherent(dev, num_sp * sizeof(u64),
  			    xhci->scratchpad->sp_array,
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 914968c662c9..c23d5312c714 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
 @@ -1606,7 +1606,6 @@ struct xhci_scratchpad {
@@ -83,6 +79,3 @@
  };
  
  struct urb_priv {
--- 
-2.13.3
-
diff --git a/patches.renesas/0206-usb-host-xhci-remove-ifdef-around-PM-functions.patch b/patches.renesas/0206-usb-host-xhci-remove-ifdef-around-PM-functions.patch
index 21489a1..60d79cc 100644
--- a/patches.renesas/0206-usb-host-xhci-remove-ifdef-around-PM-functions.patch
+++ b/patches.renesas/0206-usb-host-xhci-remove-ifdef-around-PM-functions.patch
@@ -19,15 +19,13 @@
 (cherry picked from commit d852ed98f62e0d44f594adb850b3d6cedb5c9292)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-plat.c | 12 ++++--------
- drivers/usb/host/xhci.h      |  5 -----
+ drivers/usb/host/xhci-plat.c |   12 ++++--------
+ drivers/usb/host/xhci.h      |    5 -----
  2 files changed, 4 insertions(+), 13 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 8728ce7bf245..f6a97f67f5ad 100644
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
-@@ -336,8 +336,7 @@ static int xhci_plat_remove(struct platform_device *dev)
+@@ -336,8 +336,7 @@ static int xhci_plat_remove(struct platf
  	return 0;
  }
  
@@ -37,7 +35,7 @@
  {
  	struct usb_hcd	*hcd = dev_get_drvdata(dev);
  	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
-@@ -359,7 +358,7 @@ static int xhci_plat_suspend(struct device *dev)
+@@ -359,7 +358,7 @@ static int xhci_plat_suspend(struct devi
  	return ret;
  }
  
@@ -46,7 +44,7 @@
  {
  	struct usb_hcd	*hcd = dev_get_drvdata(dev);
  	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
-@@ -374,10 +373,8 @@ static int xhci_plat_resume(struct device *dev)
+@@ -374,10 +373,8 @@ static int xhci_plat_resume(struct devic
  
  	return xhci_resume(xhci, 0);
  }
@@ -58,7 +56,7 @@
  {
  	struct usb_hcd  *hcd = dev_get_drvdata(dev);
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
-@@ -385,14 +382,13 @@ static int xhci_plat_runtime_suspend(struct device *dev)
+@@ -385,14 +382,13 @@ static int xhci_plat_runtime_suspend(str
  	return xhci_suspend(xhci, true);
  }
  
@@ -74,11 +72,9 @@
  
  static const struct dev_pm_ops xhci_plat_pm_ops = {
  	SET_SYSTEM_SLEEP_PM_OPS(xhci_plat_suspend, xhci_plat_resume)
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index c23d5312c714..88350319b952 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -2005,13 +2005,8 @@ void xhci_init_driver(struct hc_driver *drv,
+@@ -2007,13 +2007,8 @@ void xhci_init_driver(struct hc_driver *
  int xhci_disable_slot(struct xhci_hcd *xhci,
  			struct xhci_command *command, u32 slot_id);
  
@@ -92,6 +88,3 @@
  
  irqreturn_t xhci_irq(struct usb_hcd *hcd);
  irqreturn_t xhci_msi_irq(int irq, void *hcd);
--- 
-2.13.3
-
diff --git a/patches.renesas/0207-media-v4l-Add-metadata-buffer-type-and-format.patch b/patches.renesas/0207-media-v4l-Add-metadata-buffer-type-and-format.patch
index cdd036c..019841f 100644
--- a/patches.renesas/0207-media-v4l-Add-metadata-buffer-type-and-format.patch
+++ b/patches.renesas/0207-media-v4l-Add-metadata-buffer-type-and-format.patch
@@ -18,23 +18,21 @@
 (cherry picked from commit fb9ffa6a7f7ef39cc0f14f417b66411be5492512)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/media/uapi/v4l/buffer.rst          |  3 ++
- Documentation/media/uapi/v4l/dev-meta.rst        | 58 ++++++++++++++++++++++++
- Documentation/media/uapi/v4l/devices.rst         |  1 +
- Documentation/media/uapi/v4l/vidioc-querycap.rst |  3 ++
- Documentation/media/videodev2.h.rst.exceptions   |  2 +
- drivers/media/v4l2-core/v4l2-compat-ioctl32.c    | 19 ++++++++
- drivers/media/v4l2-core/v4l2-dev.c               | 16 ++++---
- drivers/media/v4l2-core/v4l2-ioctl.c             | 34 ++++++++++++++
- drivers/media/v4l2-core/videobuf2-v4l2.c         |  3 ++
- include/media/v4l2-ioctl.h                       | 17 +++++++
- include/trace/events/v4l2.h                      |  1 +
- include/uapi/linux/videodev2.h                   | 13 ++++++
+ Documentation/media/uapi/v4l/buffer.rst          |    3 +
+ Documentation/media/uapi/v4l/dev-meta.rst        |   58 +++++++++++++++++++++++
+ Documentation/media/uapi/v4l/devices.rst         |    1 
+ Documentation/media/uapi/v4l/vidioc-querycap.rst |    3 +
+ Documentation/media/videodev2.h.rst.exceptions   |    2 
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c    |   19 +++++++
+ drivers/media/v4l2-core/v4l2-dev.c               |   16 +++---
+ drivers/media/v4l2-core/v4l2-ioctl.c             |   34 +++++++++++++
+ drivers/media/v4l2-core/videobuf2-v4l2.c         |    3 +
+ include/media/v4l2-ioctl.h                       |   17 ++++++
+ include/trace/events/v4l2.h                      |    1 
+ include/uapi/linux/videodev2.h                   |   13 +++++
  12 files changed, 164 insertions(+), 6 deletions(-)
  create mode 100644 Documentation/media/uapi/v4l/dev-meta.rst
 
-diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
-index ac58966ccb9b..537fd65daffd 100644
 --- a/Documentation/media/uapi/v4l/buffer.rst
 +++ b/Documentation/media/uapi/v4l/buffer.rst
 @@ -330,6 +330,9 @@ enum v4l2_buf_type
@@ -47,9 +45,6 @@
  
  
  
-diff --git a/Documentation/media/uapi/v4l/dev-meta.rst b/Documentation/media/uapi/v4l/dev-meta.rst
-new file mode 100644
-index 000000000000..62518adfe37b
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/dev-meta.rst
 @@ -0,0 +1,58 @@
@@ -111,8 +106,6 @@
 +      - ``buffersize``
 +      - Maximum buffer size in bytes required for data. The value is set by the
 +        driver.
-diff --git a/Documentation/media/uapi/v4l/devices.rst b/Documentation/media/uapi/v4l/devices.rst
-index 5c3d6c29e12c..fb7f8c26cf09 100644
 --- a/Documentation/media/uapi/v4l/devices.rst
 +++ b/Documentation/media/uapi/v4l/devices.rst
 @@ -25,3 +25,4 @@ Interfaces
@@ -120,11 +113,9 @@
      dev-event
      dev-subdev
 +    dev-meta
-diff --git a/Documentation/media/uapi/v4l/vidioc-querycap.rst b/Documentation/media/uapi/v4l/vidioc-querycap.rst
-index 165d8314327e..12e0d9a63cd8 100644
 --- a/Documentation/media/uapi/v4l/vidioc-querycap.rst
 +++ b/Documentation/media/uapi/v4l/vidioc-querycap.rst
-@@ -236,6 +236,9 @@ specification the ioctl returns an ``EINVAL`` error code.
+@@ -236,6 +236,9 @@ specification the ioctl returns an ``EIN
      * - ``V4L2_CAP_SDR_OUTPUT``
        - 0x00400000
        - The device supports the :ref:`SDR Output <sdr>` interface.
@@ -134,11 +125,9 @@
      * - ``V4L2_CAP_READWRITE``
        - 0x01000000
        - The device supports the :ref:`read() <rw>` and/or
-diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
-index 1d3f27d922b2..20f72a201ca5 100644
 --- a/Documentation/media/videodev2.h.rst.exceptions
 +++ b/Documentation/media/videodev2.h.rst.exceptions
-@@ -27,6 +27,7 @@ replace symbol V4L2_FIELD_SEQ_TB :c:type:`v4l2_field`
+@@ -27,6 +27,7 @@ replace symbol V4L2_FIELD_SEQ_TB :c:type
  replace symbol V4L2_FIELD_TOP :c:type:`v4l2_field`
  
  # Documented enum v4l2_buf_type
@@ -146,7 +135,7 @@
  replace symbol V4L2_BUF_TYPE_SDR_CAPTURE :c:type:`v4l2_buf_type`
  replace symbol V4L2_BUF_TYPE_SDR_OUTPUT :c:type:`v4l2_buf_type`
  replace symbol V4L2_BUF_TYPE_SLICED_VBI_CAPTURE :c:type:`v4l2_buf_type`
-@@ -148,6 +149,7 @@ replace define V4L2_CAP_MODULATOR device-capabilities
+@@ -148,6 +149,7 @@ replace define V4L2_CAP_MODULATOR device
  replace define V4L2_CAP_SDR_CAPTURE device-capabilities
  replace define V4L2_CAP_EXT_PIX_FORMAT device-capabilities
  replace define V4L2_CAP_SDR_OUTPUT device-capabilities
@@ -154,11 +143,9 @@
  replace define V4L2_CAP_READWRITE device-capabilities
  replace define V4L2_CAP_ASYNCIO device-capabilities
  replace define V4L2_CAP_STREAMING device-capabilities
-diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-index bacecbd68a6d..da2d836e8887 100644
 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-@@ -161,6 +161,20 @@ static inline int put_v4l2_sdr_format(struct v4l2_sdr_format *kp, struct v4l2_sd
+@@ -161,6 +161,20 @@ static inline int put_v4l2_sdr_format(st
  	return 0;
  }
  
@@ -187,7 +174,7 @@
  		__u8	raw_data[200];        /* user-defined */
  	} fmt;
  };
-@@ -216,6 +231,8 @@ static int __get_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
+@@ -216,6 +231,8 @@ static int __get_v4l2_format32(struct v4
  	case V4L2_BUF_TYPE_SDR_CAPTURE:
  	case V4L2_BUF_TYPE_SDR_OUTPUT:
  		return get_v4l2_sdr_format(&kp->fmt.sdr, &up->fmt.sdr);
@@ -196,7 +183,7 @@
  	default:
  		pr_info("compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
  								kp->type);
-@@ -263,6 +280,8 @@ static int __put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
+@@ -263,6 +280,8 @@ static int __put_v4l2_format32(struct v4
  	case V4L2_BUF_TYPE_SDR_CAPTURE:
  	case V4L2_BUF_TYPE_SDR_OUTPUT:
  		return put_v4l2_sdr_format(&kp->fmt.sdr, &up->fmt.sdr);
@@ -205,11 +192,9 @@
  	default:
  		pr_info("compat_ioctl32: unexpected VIDIOC_FMT type %d\n",
  								kp->type);
-diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
-index 8be561ab2615..6541d5597966 100644
 --- a/drivers/media/v4l2-core/v4l2-dev.c
 +++ b/drivers/media/v4l2-core/v4l2-dev.c
-@@ -575,30 +575,34 @@ static void determine_valid_ioctls(struct video_device *vdev)
+@@ -575,30 +575,34 @@ static void determine_valid_ioctls(struc
  		set_bit(_IOC_NR(VIDIOC_ENUM_FREQ_BANDS), valid_ioctls);
  
  	if (is_vid || is_tch) {
@@ -249,7 +234,7 @@
  		    (is_tx && (ops->vidioc_try_fmt_vid_out ||
  			       ops->vidioc_try_fmt_vid_out_mplane ||
  			       ops->vidioc_try_fmt_vid_out_overlay)))
-@@ -664,7 +668,7 @@ static void determine_valid_ioctls(struct video_device *vdev)
+@@ -664,7 +668,7 @@ static void determine_valid_ioctls(struc
  	}
  
  	if (is_vid || is_vbi || is_sdr || is_tch) {
@@ -258,8 +243,6 @@
  		SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs);
  		SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf);
  		SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf);
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 5c49351af7ae..b1e4fff556f0 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
 @@ -155,6 +155,7 @@ const char *v4l2_type_names[] = {
@@ -270,7 +253,7 @@
  };
  EXPORT_SYMBOL(v4l2_type_names);
  
-@@ -249,6 +250,7 @@ static void v4l_print_format(const void *arg, bool write_only)
+@@ -249,6 +250,7 @@ static void v4l_print_format(const void
  	const struct v4l2_sliced_vbi_format *sliced;
  	const struct v4l2_window *win;
  	const struct v4l2_sdr_format *sdr;
@@ -278,7 +261,7 @@
  	unsigned i;
  
  	pr_cont("type=%s", prt_names(p->type, v4l2_type_names));
-@@ -336,6 +338,15 @@ static void v4l_print_format(const void *arg, bool write_only)
+@@ -336,6 +338,15 @@ static void v4l_print_format(const void
  			(sdr->pixelformat >> 16) & 0xff,
  			(sdr->pixelformat >> 24) & 0xff);
  		break;
@@ -294,7 +277,7 @@
  	}
  }
  
-@@ -982,6 +993,10 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
+@@ -982,6 +993,10 @@ static int check_fmt(struct file *file,
  		if (is_sdr && is_tx && ops->vidioc_g_fmt_sdr_out)
  			return 0;
  		break;
@@ -305,7 +288,7 @@
  	default:
  		break;
  	}
-@@ -1357,6 +1372,11 @@ static int v4l_enum_fmt(const struct v4l2_ioctl_ops *ops,
+@@ -1357,6 +1372,11 @@ static int v4l_enum_fmt(const struct v4l
  			break;
  		ret = ops->vidioc_enum_fmt_sdr_out(file, fh, arg);
  		break;
@@ -317,7 +300,7 @@
  	}
  	if (ret == 0)
  		v4l_fill_fmtdesc(p);
-@@ -1456,6 +1476,10 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
+@@ -1456,6 +1476,10 @@ static int v4l_g_fmt(const struct v4l2_i
  		if (unlikely(!is_tx || !is_sdr || !ops->vidioc_g_fmt_sdr_out))
  			break;
  		return ops->vidioc_g_fmt_sdr_out(file, fh, arg);
@@ -328,7 +311,7 @@
  	}
  	return -EINVAL;
  }
-@@ -1561,6 +1585,11 @@ static int v4l_s_fmt(const struct v4l2_ioctl_ops *ops,
+@@ -1561,6 +1585,11 @@ static int v4l_s_fmt(const struct v4l2_i
  			break;
  		CLEAR_AFTER_FIELD(p, fmt.sdr);
  		return ops->vidioc_s_fmt_sdr_out(file, fh, arg);
@@ -340,7 +323,7 @@
  	}
  	return -EINVAL;
  }
-@@ -1646,6 +1675,11 @@ static int v4l_try_fmt(const struct v4l2_ioctl_ops *ops,
+@@ -1646,6 +1675,11 @@ static int v4l_try_fmt(const struct v4l2
  			break;
  		CLEAR_AFTER_FIELD(p, fmt.sdr);
  		return ops->vidioc_try_fmt_sdr_out(file, fh, arg);
@@ -352,11 +335,9 @@
  	}
  	return -EINVAL;
  }
-diff --git a/drivers/media/v4l2-core/videobuf2-v4l2.c b/drivers/media/v4l2-core/videobuf2-v4l2.c
-index 52ef8833f6b6..12e12f932b6b 100644
 --- a/drivers/media/v4l2-core/videobuf2-v4l2.c
 +++ b/drivers/media/v4l2-core/videobuf2-v4l2.c
-@@ -546,6 +546,9 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create)
+@@ -546,6 +546,9 @@ int vb2_create_bufs(struct vb2_queue *q,
  	case V4L2_BUF_TYPE_SDR_OUTPUT:
  		requested_sizes[0] = f->fmt.sdr.buffersize;
  		break;
@@ -366,8 +347,6 @@
  	default:
  		return -EINVAL;
  	}
-diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h
-index 574ff2ae94be..b6433cc5964b 100644
 --- a/include/media/v4l2-ioctl.h
 +++ b/include/media/v4l2-ioctl.h
 @@ -43,6 +43,9 @@ struct v4l2_fh;
@@ -443,8 +422,6 @@
  
  	/* Buffer handlers */
  	int (*vidioc_reqbufs)(struct file *file, void *fh,
-diff --git a/include/trace/events/v4l2.h b/include/trace/events/v4l2.h
-index ee7754c6e4a1..b3a85b3df53e 100644
 --- a/include/trace/events/v4l2.h
 +++ b/include/trace/events/v4l2.h
 @@ -29,6 +29,7 @@
@@ -455,8 +432,6 @@
  	EMe(V4L2_BUF_TYPE_PRIVATE,		"PRIVATE" )
  
  SHOW_TYPE
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 803e58c1c0b1..2e0c8a9df8af 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -143,6 +143,7 @@ enum v4l2_buf_type {
@@ -500,6 +475,3 @@
  		__u8	raw_data[200];                   /* user-defined */
  	} fmt;
  };
--- 
-2.13.3
-
diff --git a/patches.renesas/0208-media-v4l-vsp1-Add-histogram-support.patch b/patches.renesas/0208-media-v4l-vsp1-Add-histogram-support.patch
index 2d14d80..a9cd9e4 100644
--- a/patches.renesas/0208-media-v4l-vsp1-Add-histogram-support.patch
+++ b/patches.renesas/0208-media-v4l-vsp1-Add-histogram-support.patch
@@ -11,16 +11,14 @@
 (cherry picked from commit 99362e32332b5ce591a67a632073668754f28b0d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/Kconfig           |   1 +
- drivers/media/platform/vsp1/Makefile     |   1 +
- drivers/media/platform/vsp1/vsp1_histo.c | 646 +++++++++++++++++++++++++++++++
- drivers/media/platform/vsp1/vsp1_histo.h |  84 ++++
+ drivers/media/platform/Kconfig           |    1 
+ drivers/media/platform/vsp1/Makefile     |    1 
+ drivers/media/platform/vsp1/vsp1_histo.c |  646 +++++++++++++++++++++++++++++++
+ drivers/media/platform/vsp1/vsp1_histo.h |   84 ++++
  4 files changed, 732 insertions(+)
  create mode 100644 drivers/media/platform/vsp1/vsp1_histo.c
  create mode 100644 drivers/media/platform/vsp1/vsp1_histo.h
 
-diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
-index f898862e2c69..d5f9e18b09af 100644
 --- a/drivers/media/platform/Kconfig
 +++ b/drivers/media/platform/Kconfig
 @@ -334,6 +334,7 @@ config VIDEO_RENESAS_VSP1
@@ -31,11 +29,9 @@
  	---help---
  	  This is a V4L2 driver for the Renesas VSP1 video processing engine.
  
-diff --git a/drivers/media/platform/vsp1/Makefile b/drivers/media/platform/vsp1/Makefile
-index 1328e1bd2143..c559536f7867 100644
 --- a/drivers/media/platform/vsp1/Makefile
 +++ b/drivers/media/platform/vsp1/Makefile
-@@ -3,6 +3,7 @@ vsp1-y					+= vsp1_dl.o vsp1_drm.o vsp1_video.o
+@@ -3,6 +3,7 @@ vsp1-y					+= vsp1_dl.o vsp1_drm.o vsp1_
  vsp1-y					+= vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o
  vsp1-y					+= vsp1_clu.o vsp1_hsit.o vsp1_lut.o
  vsp1-y					+= vsp1_bru.o vsp1_sru.o vsp1_uds.o
@@ -43,9 +39,6 @@
  vsp1-y					+= vsp1_lif.o
  
  obj-$(CONFIG_VIDEO_RENESAS_VSP1)	+= vsp1.o
-diff --git a/drivers/media/platform/vsp1/vsp1_histo.c b/drivers/media/platform/vsp1/vsp1_histo.c
-new file mode 100644
-index 000000000000..afab77cf4fa5
 --- /dev/null
 +++ b/drivers/media/platform/vsp1/vsp1_histo.c
 @@ -0,0 +1,646 @@
@@ -695,9 +688,6 @@
 +	vsp1_histogram_cleanup(histo);
 +	return ret;
 +}
-diff --git a/drivers/media/platform/vsp1/vsp1_histo.h b/drivers/media/platform/vsp1/vsp1_histo.h
-new file mode 100644
-index 000000000000..af2874f6031d
 --- /dev/null
 +++ b/drivers/media/platform/vsp1/vsp1_histo.h
 @@ -0,0 +1,84 @@
@@ -785,6 +775,3 @@
 +				    size_t size);
 +
 +#endif /* __VSP1_HISTO_H__ */
--- 
-2.13.3
-
diff --git a/patches.renesas/0209-media-v4l-vsp1-Support-histogram-generators-in-pipel.patch b/patches.renesas/0209-media-v4l-vsp1-Support-histogram-generators-in-pipel.patch
index 607c802..b705c12 100644
--- a/patches.renesas/0209-media-v4l-vsp1-Support-histogram-generators-in-pipel.patch
+++ b/patches.renesas/0209-media-v4l-vsp1-Support-histogram-generators-in-pipel.patch
@@ -15,19 +15,17 @@
 (cherry picked from commit c8663c8e15c95a351296d9d284b0cad5d373234c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_drm.c    |   2 +-
- drivers/media/platform/vsp1/vsp1_drv.c    |   4 +-
- drivers/media/platform/vsp1/vsp1_entity.c | 124 ++++++++++++++++++++++++++----
- drivers/media/platform/vsp1/vsp1_entity.h |   8 +-
- drivers/media/platform/vsp1/vsp1_pipe.c   |   6 +-
- drivers/media/platform/vsp1/vsp1_video.c  |  18 ++---
+ drivers/media/platform/vsp1/vsp1_drm.c    |    2 
+ drivers/media/platform/vsp1/vsp1_drv.c    |    4 
+ drivers/media/platform/vsp1/vsp1_entity.c |  124 ++++++++++++++++++++++++++----
+ drivers/media/platform/vsp1/vsp1_entity.h |    8 +
+ drivers/media/platform/vsp1/vsp1_pipe.c   |    6 -
+ drivers/media/platform/vsp1/vsp1_video.c  |   18 ++--
  6 files changed, 134 insertions(+), 28 deletions(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_drm.c b/drivers/media/platform/vsp1/vsp1_drm.c
-index 6e161347088e..14215051cef4 100644
 --- a/drivers/media/platform/vsp1/vsp1_drm.c
 +++ b/drivers/media/platform/vsp1/vsp1_drm.c
-@@ -496,7 +496,7 @@ void vsp1_du_atomic_flush(struct device *dev)
+@@ -496,7 +496,7 @@ void vsp1_du_atomic_flush(struct device
  			}
  		}
  
@@ -36,11 +34,9 @@
  
  		if (entity->ops->configure) {
  			entity->ops->configure(entity, pipe, dl,
-diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
-index 8d1e61b353bb..83a6669a6328 100644
 --- a/drivers/media/platform/vsp1/vsp1_drv.c
 +++ b/drivers/media/platform/vsp1/vsp1_drv.c
-@@ -105,7 +105,9 @@ static int vsp1_create_sink_links(struct vsp1_device *vsp1,
+@@ -105,7 +105,9 @@ static int vsp1_create_sink_links(struct
  		if (source->type == sink->type)
  			continue;
  
@@ -51,8 +47,6 @@
  		    source->type == VSP1_ENTITY_WPF)
  			continue;
  
-diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/platform/vsp1/vsp1_entity.c
-index 12eca5660d6e..88a2aae182ba 100644
 --- a/drivers/media/platform/vsp1/vsp1_entity.c
 +++ b/drivers/media/platform/vsp1/vsp1_entity.c
 @@ -21,6 +21,8 @@
@@ -64,7 +58,7 @@
  
  static inline struct vsp1_entity *
  media_entity_to_vsp1_entity(struct media_entity *entity)
-@@ -28,11 +30,14 @@ media_entity_to_vsp1_entity(struct media_entity *entity)
+@@ -28,11 +30,14 @@ media_entity_to_vsp1_entity(struct media
  	return container_of(entity, struct vsp1_entity, subdev.entity);
  }
  
@@ -80,7 +74,7 @@
  	if (source->route->reg == 0)
  		return;
  
-@@ -283,25 +288,32 @@ int vsp1_subdev_enum_frame_size(struct v4l2_subdev *subdev,
+@@ -283,25 +288,32 @@ done:
   * Media Operations
   */
  
@@ -124,7 +118,7 @@
  	} else {
  		source->sink = NULL;
  		source->sink_pad = 0;
-@@ -310,6 +322,85 @@ int vsp1_entity_link_setup(struct media_entity *entity,
+@@ -310,6 +322,85 @@ int vsp1_entity_link_setup(struct media_
  	return 0;
  }
  
@@ -210,7 +204,7 @@
  /* -----------------------------------------------------------------------------
   * Initialization
   */
-@@ -388,7 +479,14 @@ int vsp1_entity_init(struct vsp1_device *vsp1, struct vsp1_entity *entity,
+@@ -388,7 +479,14 @@ int vsp1_entity_init(struct vsp1_device
  	for (i = 0; i < num_pads - 1; ++i)
  		entity->pads[i].flags = MEDIA_PAD_FL_SINK;
  
@@ -226,8 +220,6 @@
  
  	/* Initialize the media entity. */
  	ret = media_entity_pads_init(&entity->subdev.entity, num_pads,
-diff --git a/drivers/media/platform/vsp1/vsp1_entity.h b/drivers/media/platform/vsp1/vsp1_entity.h
-index 901146f807b9..c169a060b6d2 100644
 --- a/drivers/media/platform/vsp1/vsp1_entity.h
 +++ b/drivers/media/platform/vsp1/vsp1_entity.h
 @@ -25,6 +25,8 @@ struct vsp1_pipeline;
@@ -247,7 +239,7 @@
  	struct media_entity *sink;
  	unsigned int sink_pad;
  
-@@ -142,9 +145,12 @@ vsp1_entity_get_pad_selection(struct vsp1_entity *entity,
+@@ -142,9 +145,12 @@ vsp1_entity_get_pad_selection(struct vsp
  int vsp1_entity_init_cfg(struct v4l2_subdev *subdev,
  			 struct v4l2_subdev_pad_config *cfg);
  
@@ -261,11 +253,9 @@
  int vsp1_subdev_get_pad_format(struct v4l2_subdev *subdev,
  			       struct v4l2_subdev_pad_config *cfg,
  			       struct v4l2_subdev_format *fmt);
-diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c
-index 35364f594e19..b5a765cbfc86 100644
 --- a/drivers/media/platform/vsp1/vsp1_pipe.c
 +++ b/drivers/media/platform/vsp1/vsp1_pipe.c
-@@ -252,6 +252,7 @@ bool vsp1_pipeline_stopped(struct vsp1_pipeline *pipe)
+@@ -252,6 +252,7 @@ bool vsp1_pipeline_stopped(struct vsp1_p
  
  int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
  {
@@ -273,7 +263,7 @@
  	struct vsp1_entity *entity;
  	unsigned long flags;
  	int ret;
-@@ -261,8 +262,7 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
+@@ -261,8 +262,7 @@ int vsp1_pipeline_stop(struct vsp1_pipel
  		 * When using display lists in continuous frame mode the only
  		 * way to stop the pipeline is to reset the hardware.
  		 */
@@ -283,7 +273,7 @@
  		if (ret == 0) {
  			spin_lock_irqsave(&pipe->irqlock, flags);
  			pipe->state = VSP1_PIPELINE_STOPPED;
-@@ -282,7 +282,7 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
+@@ -282,7 +282,7 @@ int vsp1_pipeline_stop(struct vsp1_pipel
  
  	list_for_each_entry(entity, &pipe->entities, list_pipe) {
  		if (entity->route && entity->route->reg)
@@ -292,11 +282,9 @@
  				   VI6_DPR_NODE_UNUSED);
  	}
  
-diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
-index 79f48a025546..1a98bc91d1e2 100644
 --- a/drivers/media/platform/vsp1/vsp1_video.c
 +++ b/drivers/media/platform/vsp1/vsp1_video.c
-@@ -486,7 +486,12 @@ static int vsp1_video_pipeline_build_branch(struct vsp1_pipeline *pipe,
+@@ -486,7 +486,12 @@ static int vsp1_video_pipeline_build_bra
  	if (ret < 0)
  		return ret;
  
@@ -310,7 +298,7 @@
  
  	while (1) {
  		if (pad == NULL) {
-@@ -539,14 +544,9 @@ static int vsp1_video_pipeline_build_branch(struct vsp1_pipeline *pipe,
+@@ -539,14 +544,9 @@ static int vsp1_video_pipeline_build_bra
  					: &input->entity;
  		}
  
@@ -327,7 +315,7 @@
  	}
  
  	/* The last entity must be the output WPF. */
-@@ -800,7 +800,7 @@ static int vsp1_video_setup_pipeline(struct vsp1_pipeline *pipe)
+@@ -800,7 +800,7 @@ static int vsp1_video_setup_pipeline(str
  	}
  
  	list_for_each_entry(entity, &pipe->entities, list_pipe) {
@@ -336,6 +324,3 @@
  
  		if (entity->ops->configure)
  			entity->ops->configure(entity, pipe, pipe->dl,
--- 
-2.13.3
-
diff --git a/patches.renesas/0210-media-v4l-vsp1-Fix-HGO-and-HGT-routing-register-addr.patch b/patches.renesas/0210-media-v4l-vsp1-Fix-HGO-and-HGT-routing-register-addr.patch
index d830c96..ed9d627 100644
--- a/patches.renesas/0210-media-v4l-vsp1-Fix-HGO-and-HGT-routing-register-addr.patch
+++ b/patches.renesas/0210-media-v4l-vsp1-Fix-HGO-and-HGT-routing-register-addr.patch
@@ -11,11 +11,9 @@
 (cherry picked from commit 98eee2550f7b5e800641e90469f400a8c06fde73)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_regs.h | 4 ++--
+ drivers/media/platform/vsp1/vsp1_regs.h |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
-index 47b1dee044fb..61369e267667 100644
 --- a/drivers/media/platform/vsp1/vsp1_regs.h
 +++ b/drivers/media/platform/vsp1/vsp1_regs.h
 @@ -328,8 +328,8 @@
@@ -29,6 +27,3 @@
  #define VI6_DPR_SMPPT_TGW_MASK		(7 << 8)
  #define VI6_DPR_SMPPT_TGW_SHIFT		8
  #define VI6_DPR_SMPPT_PT_MASK		(0x3f << 0)
--- 
-2.13.3
-
diff --git a/patches.renesas/0211-media-v4l-Define-a-pixel-format-for-the-R-Car-VSP1-1.patch b/patches.renesas/0211-media-v4l-Define-a-pixel-format-for-the-R-Car-VSP1-1.patch
index 56f1870..3ffc34d 100644
--- a/patches.renesas/0211-media-v4l-Define-a-pixel-format-for-the-R-Car-VSP1-1.patch
+++ b/patches.renesas/0211-media-v4l-Define-a-pixel-format-for-the-R-Car-VSP1-1.patch
@@ -13,18 +13,15 @@
 (cherry picked from commit 14d66538716574f8899b22bff24a68301e65f08d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/media/uapi/v4l/meta-formats.rst      |  15 ++
- .../media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst        | 168 +++++++++++++++++++++
- Documentation/media/uapi/v4l/pixfmt.rst            |   1 +
- drivers/media/v4l2-core/v4l2-ioctl.c               |   1 +
- include/uapi/linux/videodev2.h                     |   3 +
+ Documentation/media/uapi/v4l/meta-formats.rst         |   15 +
+ Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst |  168 ++++++++++++++++++
+ Documentation/media/uapi/v4l/pixfmt.rst               |    1 
+ drivers/media/v4l2-core/v4l2-ioctl.c                  |    1 
+ include/uapi/linux/videodev2.h                        |    3 
  5 files changed, 188 insertions(+)
  create mode 100644 Documentation/media/uapi/v4l/meta-formats.rst
  create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst
 
-diff --git a/Documentation/media/uapi/v4l/meta-formats.rst b/Documentation/media/uapi/v4l/meta-formats.rst
-new file mode 100644
-index 000000000000..05ab91e12f10
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/meta-formats.rst
 @@ -0,0 +1,15 @@
@@ -43,9 +40,6 @@
 +    :maxdepth: 1
 +
 +    pixfmt-meta-vsp1-hgo
-diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst b/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst
-new file mode 100644
-index 000000000000..8d37bb313493
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst
 @@ -0,0 +1,168 @@
@@ -217,21 +211,17 @@
 +      - :cspan:`4` ...
 +    * - 1028
 +      - :cspan:`4` max(R,G,B) bin 255 [31:0]
-diff --git a/Documentation/media/uapi/v4l/pixfmt.rst b/Documentation/media/uapi/v4l/pixfmt.rst
-index 4d297f6eb5f1..126fcd0faa7f 100644
 --- a/Documentation/media/uapi/v4l/pixfmt.rst
 +++ b/Documentation/media/uapi/v4l/pixfmt.rst
-@@ -33,4 +33,5 @@ see also :ref:`VIDIOC_G_FBUF <VIDIOC_G_FBUF>`.)
+@@ -33,4 +33,5 @@ see also :ref:`VIDIOC_G_FBUF <VIDIOC_G_F
      pixfmt-013
      sdr-formats
      tch-formats
 +    meta-formats
      pixfmt-reserved
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index b1e4fff556f0..9f51ae56e4c3 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1265,6 +1265,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
+@@ -1265,6 +1265,7 @@ static void v4l_fill_fmtdesc(struct v4l2
  	case V4L2_TCH_FMT_DELTA_TD08:	descr = "8-bit signed deltas"; break;
  	case V4L2_TCH_FMT_TU16:		descr = "16-bit unsigned touch data"; break;
  	case V4L2_TCH_FMT_TU08:		descr = "8-bit unsigned touch data"; break;
@@ -239,8 +229,6 @@
  
  	default:
  		/* Compressed formats */
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 2e0c8a9df8af..b4dc1bea942c 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -672,6 +672,9 @@ struct v4l2_pix_format {
@@ -253,6 +241,3 @@
  /* priv field value to indicates that subsequent fields are valid. */
  #define V4L2_PIX_FMT_PRIV_MAGIC		0xfeedcafe
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0212-media-v4l-vsp1-Add-HGO-support.patch b/patches.renesas/0212-media-v4l-vsp1-Add-HGO-support.patch
index 1f8e2dd..a92dcd4 100644
--- a/patches.renesas/0212-media-v4l-vsp1-Add-HGO-support.patch
+++ b/patches.renesas/0212-media-v4l-vsp1-Add-HGO-support.patch
@@ -12,25 +12,23 @@
 (cherry picked from commit f2421521de185c0281799712863db8e23d29a375)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/Makefile      |   2 +-
- drivers/media/platform/vsp1/vsp1.h        |   3 +
- drivers/media/platform/vsp1/vsp1_drv.c    |  42 ++++--
- drivers/media/platform/vsp1/vsp1_entity.c |  16 +++
- drivers/media/platform/vsp1/vsp1_hgo.c    | 228 ++++++++++++++++++++++++++++++
- drivers/media/platform/vsp1/vsp1_hgo.h    |  45 ++++++
- drivers/media/platform/vsp1/vsp1_pipe.c   |  16 +++
- drivers/media/platform/vsp1/vsp1_pipe.h   |   2 +
- drivers/media/platform/vsp1/vsp1_regs.h   |  20 ++-
- drivers/media/platform/vsp1/vsp1_video.c  |   6 +
+ drivers/media/platform/vsp1/Makefile      |    2 
+ drivers/media/platform/vsp1/vsp1.h        |    3 
+ drivers/media/platform/vsp1/vsp1_drv.c    |   42 ++++-
+ drivers/media/platform/vsp1/vsp1_entity.c |   16 ++
+ drivers/media/platform/vsp1/vsp1_hgo.c    |  228 ++++++++++++++++++++++++++++++
+ drivers/media/platform/vsp1/vsp1_hgo.h    |   45 +++++
+ drivers/media/platform/vsp1/vsp1_pipe.c   |   16 ++
+ drivers/media/platform/vsp1/vsp1_pipe.h   |    2 
+ drivers/media/platform/vsp1/vsp1_regs.h   |   20 ++
+ drivers/media/platform/vsp1/vsp1_video.c  |    6 
  10 files changed, 367 insertions(+), 13 deletions(-)
  create mode 100644 drivers/media/platform/vsp1/vsp1_hgo.c
  create mode 100644 drivers/media/platform/vsp1/vsp1_hgo.h
 
-diff --git a/drivers/media/platform/vsp1/Makefile b/drivers/media/platform/vsp1/Makefile
-index c559536f7867..8ab6a063569e 100644
 --- a/drivers/media/platform/vsp1/Makefile
 +++ b/drivers/media/platform/vsp1/Makefile
-@@ -3,7 +3,7 @@ vsp1-y					+= vsp1_dl.o vsp1_drm.o vsp1_video.o
+@@ -3,7 +3,7 @@ vsp1-y					+= vsp1_dl.o vsp1_drm.o vsp1_
  vsp1-y					+= vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o
  vsp1-y					+= vsp1_clu.o vsp1_hsit.o vsp1_lut.o
  vsp1-y					+= vsp1_bru.o vsp1_sru.o vsp1_uds.o
@@ -39,8 +37,6 @@
  vsp1-y					+= vsp1_lif.o
  
  obj-$(CONFIG_VIDEO_RENESAS_VSP1)	+= vsp1.o
-diff --git a/drivers/media/platform/vsp1/vsp1.h b/drivers/media/platform/vsp1/vsp1.h
-index b23fa879a9aa..0ba7521c01b4 100644
 --- a/drivers/media/platform/vsp1/vsp1.h
 +++ b/drivers/media/platform/vsp1/vsp1.h
 @@ -32,6 +32,7 @@ struct vsp1_entity;
@@ -67,8 +63,6 @@
  	struct vsp1_hsit *hsi;
  	struct vsp1_hsit *hst;
  	struct vsp1_lif *lif;
-diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
-index 83a6669a6328..0acc8ed6ac59 100644
 --- a/drivers/media/platform/vsp1/vsp1_drv.c
 +++ b/drivers/media/platform/vsp1/vsp1_drv.c
 @@ -30,6 +30,7 @@
@@ -79,7 +73,7 @@
  #include "vsp1_hsit.h"
  #include "vsp1_lif.h"
  #include "vsp1_lut.h"
-@@ -150,6 +151,16 @@ static int vsp1_uapi_create_links(struct vsp1_device *vsp1)
+@@ -150,6 +151,16 @@ static int vsp1_uapi_create_links(struct
  			return ret;
  	}
  
@@ -96,7 +90,7 @@
  	if (vsp1->lif) {
  		ret = media_create_pad_link(&vsp1->wpf[0]->entity.subdev.entity,
  					    RWPF_PAD_SOURCE,
-@@ -283,6 +294,17 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
+@@ -283,6 +294,17 @@ static int vsp1_create_entities(struct v
  
  	list_add_tail(&vsp1->hst->entity.list_dev, &vsp1->entities);
  
@@ -114,7 +108,7 @@
  	/*
  	 * The LIF is only supported when used in conjunction with the DU, in
  	 * which case the userspace API is disabled. If the userspace API is
-@@ -568,8 +590,8 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
+@@ -568,8 +590,8 @@ static const struct vsp1_device_info vsp
  		.version = VI6_IP_VERSION_MODEL_VSPS_H2,
  		.model = "VSP1-S",
  		.gen = 2,
@@ -125,7 +119,7 @@
  		.rpf_count = 5,
  		.uds_count = 3,
  		.wpf_count = 4,
-@@ -589,7 +611,8 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
+@@ -589,7 +611,8 @@ static const struct vsp1_device_info vsp
  		.version = VI6_IP_VERSION_MODEL_VSPD_GEN2,
  		.model = "VSP1-D",
  		.gen = 2,
@@ -135,7 +129,7 @@
  		.rpf_count = 4,
  		.uds_count = 1,
  		.wpf_count = 1,
-@@ -599,8 +622,8 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
+@@ -599,8 +622,8 @@ static const struct vsp1_device_info vsp
  		.version = VI6_IP_VERSION_MODEL_VSPS_M2,
  		.model = "VSP1-S",
  		.gen = 2,
@@ -146,7 +140,7 @@
  		.rpf_count = 5,
  		.uds_count = 1,
  		.wpf_count = 4,
-@@ -632,8 +655,9 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
+@@ -632,8 +655,9 @@ static const struct vsp1_device_info vsp
  		.version = VI6_IP_VERSION_MODEL_VSPI_GEN3,
  		.model = "VSP2-I",
  		.gen = 3,
@@ -158,7 +152,7 @@
  		.rpf_count = 1,
  		.uds_count = 1,
  		.wpf_count = 1,
-@@ -651,8 +675,8 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
+@@ -651,8 +675,8 @@ static const struct vsp1_device_info vsp
  		.version = VI6_IP_VERSION_MODEL_VSPBC_GEN3,
  		.model = "VSP2-BC",
  		.gen = 3,
@@ -169,11 +163,9 @@
  		.rpf_count = 5,
  		.wpf_count = 1,
  		.num_bru_inputs = 5,
-diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/platform/vsp1/vsp1_entity.c
-index 88a2aae182ba..c1587e3f01cb 100644
 --- a/drivers/media/platform/vsp1/vsp1_entity.c
 +++ b/drivers/media/platform/vsp1/vsp1_entity.c
-@@ -37,6 +37,21 @@ void vsp1_entity_route_setup(struct vsp1_entity *entity,
+@@ -37,6 +37,21 @@ void vsp1_entity_route_setup(struct vsp1
  	struct vsp1_entity *source;
  	struct vsp1_entity *sink;
  
@@ -195,7 +187,7 @@
  	source = entity;
  	if (source->route->reg == 0)
  		return;
-@@ -427,6 +442,7 @@ static const struct vsp1_route vsp1_routes[] = {
+@@ -427,6 +442,7 @@ static const struct vsp1_route vsp1_rout
  	    VI6_DPR_NODE_BRU_IN(2), VI6_DPR_NODE_BRU_IN(3),
  	    VI6_DPR_NODE_BRU_IN(4) }, VI6_DPR_NODE_BRU_OUT },
  	VSP1_ENTITY_ROUTE(CLU),
@@ -203,9 +195,6 @@
  	VSP1_ENTITY_ROUTE(HSI),
  	VSP1_ENTITY_ROUTE(HST),
  	{ VSP1_ENTITY_LIF, 0, 0, { VI6_DPR_NODE_LIF, }, VI6_DPR_NODE_LIF },
-diff --git a/drivers/media/platform/vsp1/vsp1_hgo.c b/drivers/media/platform/vsp1/vsp1_hgo.c
-new file mode 100644
-index 000000000000..a138c6b7fb05
 --- /dev/null
 +++ b/drivers/media/platform/vsp1/vsp1_hgo.c
 @@ -0,0 +1,228 @@
@@ -437,9 +426,6 @@
 +
 +	return hgo;
 +}
-diff --git a/drivers/media/platform/vsp1/vsp1_hgo.h b/drivers/media/platform/vsp1/vsp1_hgo.h
-new file mode 100644
-index 000000000000..c6c0b7a80e0c
 --- /dev/null
 +++ b/drivers/media/platform/vsp1/vsp1_hgo.h
 @@ -0,0 +1,45 @@
@@ -488,8 +474,6 @@
 +void vsp1_hgo_frame_end(struct vsp1_entity *hgo);
 +
 +#endif /* __VSP1_HGO_H__ */
-diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c
-index b5a765cbfc86..bc0460c24397 100644
 --- a/drivers/media/platform/vsp1/vsp1_pipe.c
 +++ b/drivers/media/platform/vsp1/vsp1_pipe.c
 @@ -23,6 +23,7 @@
@@ -500,7 +484,7 @@
  #include "vsp1_pipe.h"
  #include "vsp1_rwpf.h"
  #include "vsp1_uds.h"
-@@ -204,11 +205,18 @@ void vsp1_pipeline_reset(struct vsp1_pipeline *pipe)
+@@ -204,11 +205,18 @@ void vsp1_pipeline_reset(struct vsp1_pip
  		pipe->output = NULL;
  	}
  
@@ -519,7 +503,7 @@
  	pipe->lif = NULL;
  	pipe->uds = NULL;
  }
-@@ -286,6 +294,11 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
+@@ -286,6 +294,11 @@ int vsp1_pipeline_stop(struct vsp1_pipel
  				   VI6_DPR_NODE_UNUSED);
  	}
  
@@ -531,7 +515,7 @@
  	v4l2_subdev_call(&pipe->output->entity.subdev, video, s_stream, 0);
  
  	return ret;
-@@ -309,6 +322,9 @@ void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe)
+@@ -309,6 +322,9 @@ void vsp1_pipeline_frame_end(struct vsp1
  
  	vsp1_dlm_irq_frame_end(pipe->output->dlm);
  
@@ -541,8 +525,6 @@
  	if (pipe->frame_end)
  		pipe->frame_end(pipe);
  
-diff --git a/drivers/media/platform/vsp1/vsp1_pipe.h b/drivers/media/platform/vsp1/vsp1_pipe.h
-index 1144bf1e671a..4d91088c386b 100644
 --- a/drivers/media/platform/vsp1/vsp1_pipe.h
 +++ b/drivers/media/platform/vsp1/vsp1_pipe.h
 @@ -73,6 +73,7 @@ enum vsp1_pipeline_state {
@@ -561,8 +543,6 @@
  	struct vsp1_entity *lif;
  	struct vsp1_entity *uds;
  	struct vsp1_entity *uds_input;
-diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
-index 61369e267667..5414e519f7d8 100644
 --- a/drivers/media/platform/vsp1/vsp1_regs.h
 +++ b/drivers/media/platform/vsp1/vsp1_regs.h
 @@ -590,24 +590,38 @@
@@ -607,8 +587,6 @@
  
  /* -----------------------------------------------------------------------------
   * HGT Control Registers
-diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
-index 1a98bc91d1e2..d47b93f2af79 100644
 --- a/drivers/media/platform/vsp1/vsp1_video.c
 +++ b/drivers/media/platform/vsp1/vsp1_video.c
 @@ -31,6 +31,7 @@
@@ -619,7 +597,7 @@
  #include "vsp1_pipe.h"
  #include "vsp1_rwpf.h"
  #include "vsp1_uds.h"
-@@ -601,6 +602,11 @@ static int vsp1_video_pipeline_build(struct vsp1_pipeline *pipe,
+@@ -601,6 +602,11 @@ static int vsp1_video_pipeline_build(str
  			pipe->lif = e;
  		} else if (e->type == VSP1_ENTITY_BRU) {
  			pipe->bru = e;
@@ -631,6 +609,3 @@
  		}
  	}
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0213-media-v4l-Define-a-pixel-format-for-the-R-Car-VSP1-2.patch b/patches.renesas/0213-media-v4l-Define-a-pixel-format-for-the-R-Car-VSP1-2.patch
index ae9d960..fb4ed2e 100644
--- a/patches.renesas/0213-media-v4l-Define-a-pixel-format-for-the-R-Car-VSP1-2.patch
+++ b/patches.renesas/0213-media-v4l-Define-a-pixel-format-for-the-R-Car-VSP1-2.patch
@@ -18,25 +18,20 @@
 (cherry picked from commit 5deb1c04c9f2cc3fe4b355a55a8fad244683a54a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/media/uapi/v4l/meta-formats.rst      |   1 +
- .../media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst        | 120 +++++++++++++++++++++
- drivers/media/v4l2-core/v4l2-ioctl.c               |   1 +
- include/uapi/linux/videodev2.h                     |   3 +-
+ Documentation/media/uapi/v4l/meta-formats.rst         |    1 
+ Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst |  120 ++++++++++++++++++
+ drivers/media/v4l2-core/v4l2-ioctl.c                  |    1 
+ include/uapi/linux/videodev2.h                        |    3 
  4 files changed, 124 insertions(+), 1 deletion(-)
  create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst
 
-diff --git a/Documentation/media/uapi/v4l/meta-formats.rst b/Documentation/media/uapi/v4l/meta-formats.rst
-index 05ab91e12f10..01e24e3df571 100644
 --- a/Documentation/media/uapi/v4l/meta-formats.rst
 +++ b/Documentation/media/uapi/v4l/meta-formats.rst
-@@ -13,3 +13,4 @@ These formats are used for the :ref:`metadata` interface only.
+@@ -13,3 +13,4 @@ These formats are used for the :ref:`met
      :maxdepth: 1
  
      pixfmt-meta-vsp1-hgo
 +    pixfmt-meta-vsp1-hgt
-diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst b/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst
-new file mode 100644
-index 000000000000..fb9f79466319
 --- /dev/null
 +++ b/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst
 @@ -0,0 +1,120 @@
@@ -160,11 +155,9 @@
 +      - :cspan:`4` ...
 +    * - 772
 +      - :cspan:`4` Histogram bucket (m=5, n=31) [31:0]
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 9f51ae56e4c3..89567468f4e8 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1266,6 +1266,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
+@@ -1266,6 +1266,7 @@ static void v4l_fill_fmtdesc(struct v4l2
  	case V4L2_TCH_FMT_TU16:		descr = "16-bit unsigned touch data"; break;
  	case V4L2_TCH_FMT_TU08:		descr = "8-bit unsigned touch data"; break;
  	case V4L2_META_FMT_VSP1_HGO:	descr = "R-Car VSP1 1-D Histogram"; break;
@@ -172,8 +165,6 @@
  
  	default:
  		/* Compressed formats */
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index b4dc1bea942c..0a875bab5c54 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -673,7 +673,8 @@ struct v4l2_pix_format {
@@ -186,6 +177,3 @@
  
  /* priv field value to indicates that subsequent fields are valid. */
  #define V4L2_PIX_FMT_PRIV_MAGIC		0xfeedcafe
--- 
-2.13.3
-
diff --git a/patches.renesas/0214-media-v4l-vsp1-Add-HGT-support.patch b/patches.renesas/0214-media-v4l-vsp1-Add-HGT-support.patch
index 7fb6aef..d7c385f 100644
--- a/patches.renesas/0214-media-v4l-vsp1-Add-HGT-support.patch
+++ b/patches.renesas/0214-media-v4l-vsp1-Add-HGT-support.patch
@@ -18,25 +18,23 @@
 (cherry picked from commit 0ac702d5b903d441ef64e61f453de7c0ce1322fa)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/Makefile      |   2 +-
- drivers/media/platform/vsp1/vsp1.h        |   3 +
- drivers/media/platform/vsp1/vsp1_drv.c    |  32 ++++-
- drivers/media/platform/vsp1/vsp1_entity.c |  14 ++
- drivers/media/platform/vsp1/vsp1_hgt.c    | 222 ++++++++++++++++++++++++++++++
- drivers/media/platform/vsp1/vsp1_hgt.h    |  42 ++++++
- drivers/media/platform/vsp1/vsp1_pipe.c   |  16 +++
- drivers/media/platform/vsp1/vsp1_pipe.h   |   2 +
- drivers/media/platform/vsp1/vsp1_regs.h   |   9 ++
- drivers/media/platform/vsp1/vsp1_video.c  |   6 +
+ drivers/media/platform/vsp1/Makefile      |    2 
+ drivers/media/platform/vsp1/vsp1.h        |    3 
+ drivers/media/platform/vsp1/vsp1_drv.c    |   32 +++-
+ drivers/media/platform/vsp1/vsp1_entity.c |   14 +
+ drivers/media/platform/vsp1/vsp1_hgt.c    |  222 ++++++++++++++++++++++++++++++
+ drivers/media/platform/vsp1/vsp1_hgt.h    |   42 +++++
+ drivers/media/platform/vsp1/vsp1_pipe.c   |   16 ++
+ drivers/media/platform/vsp1/vsp1_pipe.h   |    2 
+ drivers/media/platform/vsp1/vsp1_regs.h   |    9 +
+ drivers/media/platform/vsp1/vsp1_video.c  |    6 
  10 files changed, 343 insertions(+), 5 deletions(-)
  create mode 100644 drivers/media/platform/vsp1/vsp1_hgt.c
  create mode 100644 drivers/media/platform/vsp1/vsp1_hgt.h
 
-diff --git a/drivers/media/platform/vsp1/Makefile b/drivers/media/platform/vsp1/Makefile
-index 8ab6a063569e..a33afc385a48 100644
 --- a/drivers/media/platform/vsp1/Makefile
 +++ b/drivers/media/platform/vsp1/Makefile
-@@ -3,7 +3,7 @@ vsp1-y					+= vsp1_dl.o vsp1_drm.o vsp1_video.o
+@@ -3,7 +3,7 @@ vsp1-y					+= vsp1_dl.o vsp1_drm.o vsp1_
  vsp1-y					+= vsp1_rpf.o vsp1_rwpf.o vsp1_wpf.o
  vsp1-y					+= vsp1_clu.o vsp1_hsit.o vsp1_lut.o
  vsp1-y					+= vsp1_bru.o vsp1_sru.o vsp1_uds.o
@@ -45,8 +43,6 @@
  vsp1-y					+= vsp1_lif.o
  
  obj-$(CONFIG_VIDEO_RENESAS_VSP1)	+= vsp1.o
-diff --git a/drivers/media/platform/vsp1/vsp1.h b/drivers/media/platform/vsp1/vsp1.h
-index 0ba7521c01b4..85387a64179a 100644
 --- a/drivers/media/platform/vsp1/vsp1.h
 +++ b/drivers/media/platform/vsp1/vsp1.h
 @@ -33,6 +33,7 @@ struct vsp1_platform_data;
@@ -73,8 +69,6 @@
  	struct vsp1_hsit *hsi;
  	struct vsp1_hsit *hst;
  	struct vsp1_lif *lif;
-diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
-index 0acc8ed6ac59..048446af5ae7 100644
 --- a/drivers/media/platform/vsp1/vsp1_drv.c
 +++ b/drivers/media/platform/vsp1/vsp1_drv.c
 @@ -31,6 +31,7 @@
@@ -85,7 +79,7 @@
  #include "vsp1_hsit.h"
  #include "vsp1_lif.h"
  #include "vsp1_lut.h"
-@@ -161,6 +162,16 @@ static int vsp1_uapi_create_links(struct vsp1_device *vsp1)
+@@ -161,6 +162,16 @@ static int vsp1_uapi_create_links(struct
  			return ret;
  	}
  
@@ -102,7 +96,7 @@
  	if (vsp1->lif) {
  		ret = media_create_pad_link(&vsp1->wpf[0]->entity.subdev.entity,
  					    RWPF_PAD_SOURCE,
-@@ -305,6 +316,17 @@ static int vsp1_create_entities(struct vsp1_device *vsp1)
+@@ -305,6 +316,17 @@ static int vsp1_create_entities(struct v
  			      &vsp1->entities);
  	}
  
@@ -120,7 +114,7 @@
  	/*
  	 * The LIF is only supported when used in conjunction with the DU, in
  	 * which case the userspace API is disabled. If the userspace API is
-@@ -591,7 +613,8 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
+@@ -591,7 +613,8 @@ static const struct vsp1_device_info vsp
  		.model = "VSP1-S",
  		.gen = 2,
  		.features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_HGO
@@ -130,7 +124,7 @@
  		.rpf_count = 5,
  		.uds_count = 3,
  		.wpf_count = 4,
-@@ -623,7 +646,8 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
+@@ -623,7 +646,8 @@ static const struct vsp1_device_info vsp
  		.model = "VSP1-S",
  		.gen = 2,
  		.features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_HGO
@@ -140,7 +134,7 @@
  		.rpf_count = 5,
  		.uds_count = 1,
  		.wpf_count = 4,
-@@ -655,8 +679,8 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
+@@ -655,8 +679,8 @@ static const struct vsp1_device_info vsp
  		.version = VI6_IP_VERSION_MODEL_VSPI_GEN3,
  		.model = "VSP2-I",
  		.gen = 3,
@@ -151,11 +145,9 @@
  			  | VSP1_HAS_WPF_VFLIP,
  		.rpf_count = 1,
  		.uds_count = 1,
-diff --git a/drivers/media/platform/vsp1/vsp1_entity.c b/drivers/media/platform/vsp1/vsp1_entity.c
-index c1587e3f01cb..4bdb3b141611 100644
 --- a/drivers/media/platform/vsp1/vsp1_entity.c
 +++ b/drivers/media/platform/vsp1/vsp1_entity.c
-@@ -50,6 +50,19 @@ void vsp1_entity_route_setup(struct vsp1_entity *entity,
+@@ -50,6 +50,19 @@ void vsp1_entity_route_setup(struct vsp1
  
  		vsp1_dl_list_write(dl, VI6_DPR_HGO_SMPPT, smppt);
  		return;
@@ -175,7 +167,7 @@
  	}
  
  	source = entity;
-@@ -443,6 +456,7 @@ static const struct vsp1_route vsp1_routes[] = {
+@@ -443,6 +456,7 @@ static const struct vsp1_route vsp1_rout
  	    VI6_DPR_NODE_BRU_IN(4) }, VI6_DPR_NODE_BRU_OUT },
  	VSP1_ENTITY_ROUTE(CLU),
  	{ VSP1_ENTITY_HGO, 0, 0, { 0, }, 0 },
@@ -183,9 +175,6 @@
  	VSP1_ENTITY_ROUTE(HSI),
  	VSP1_ENTITY_ROUTE(HST),
  	{ VSP1_ENTITY_LIF, 0, 0, { VI6_DPR_NODE_LIF, }, VI6_DPR_NODE_LIF },
-diff --git a/drivers/media/platform/vsp1/vsp1_hgt.c b/drivers/media/platform/vsp1/vsp1_hgt.c
-new file mode 100644
-index 000000000000..b5ce305e3e6f
 --- /dev/null
 +++ b/drivers/media/platform/vsp1/vsp1_hgt.c
 @@ -0,0 +1,222 @@
@@ -411,9 +400,6 @@
 +
 +	return hgt;
 +}
-diff --git a/drivers/media/platform/vsp1/vsp1_hgt.h b/drivers/media/platform/vsp1/vsp1_hgt.h
-new file mode 100644
-index 000000000000..83f2e130942a
 --- /dev/null
 +++ b/drivers/media/platform/vsp1/vsp1_hgt.h
 @@ -0,0 +1,42 @@
@@ -459,8 +445,6 @@
 +void vsp1_hgt_frame_end(struct vsp1_entity *hgt);
 +
 +#endif /* __VSP1_HGT_H__ */
-diff --git a/drivers/media/platform/vsp1/vsp1_pipe.c b/drivers/media/platform/vsp1/vsp1_pipe.c
-index bc0460c24397..edebf3fa926f 100644
 --- a/drivers/media/platform/vsp1/vsp1_pipe.c
 +++ b/drivers/media/platform/vsp1/vsp1_pipe.c
 @@ -24,6 +24,7 @@
@@ -471,7 +455,7 @@
  #include "vsp1_pipe.h"
  #include "vsp1_rwpf.h"
  #include "vsp1_uds.h"
-@@ -211,12 +212,19 @@ void vsp1_pipeline_reset(struct vsp1_pipeline *pipe)
+@@ -211,12 +212,19 @@ void vsp1_pipeline_reset(struct vsp1_pip
  		hgo->histo.pipe = NULL;
  	}
  
@@ -491,7 +475,7 @@
  	pipe->lif = NULL;
  	pipe->uds = NULL;
  }
-@@ -299,6 +307,11 @@ int vsp1_pipeline_stop(struct vsp1_pipeline *pipe)
+@@ -299,6 +307,11 @@ int vsp1_pipeline_stop(struct vsp1_pipel
  			   (7 << VI6_DPR_SMPPT_TGW_SHIFT) |
  			   (VI6_DPR_NODE_UNUSED << VI6_DPR_SMPPT_PT_SHIFT));
  
@@ -503,7 +487,7 @@
  	v4l2_subdev_call(&pipe->output->entity.subdev, video, s_stream, 0);
  
  	return ret;
-@@ -325,6 +338,9 @@ void vsp1_pipeline_frame_end(struct vsp1_pipeline *pipe)
+@@ -325,6 +338,9 @@ void vsp1_pipeline_frame_end(struct vsp1
  	if (pipe->hgo)
  		vsp1_hgo_frame_end(pipe->hgo);
  
@@ -513,8 +497,6 @@
  	if (pipe->frame_end)
  		pipe->frame_end(pipe);
  
-diff --git a/drivers/media/platform/vsp1/vsp1_pipe.h b/drivers/media/platform/vsp1/vsp1_pipe.h
-index 4d91088c386b..91a784a13422 100644
 --- a/drivers/media/platform/vsp1/vsp1_pipe.h
 +++ b/drivers/media/platform/vsp1/vsp1_pipe.h
 @@ -74,6 +74,7 @@ enum vsp1_pipeline_state {
@@ -533,8 +515,6 @@
  	struct vsp1_entity *lif;
  	struct vsp1_entity *uds;
  	struct vsp1_entity *uds_input;
-diff --git a/drivers/media/platform/vsp1/vsp1_regs.h b/drivers/media/platform/vsp1/vsp1_regs.h
-index 5414e519f7d8..cd3e32af6e3b 100644
 --- a/drivers/media/platform/vsp1/vsp1_regs.h
 +++ b/drivers/media/platform/vsp1/vsp1_regs.h
 @@ -628,9 +628,17 @@
@@ -563,8 +543,6 @@
  
  /* -----------------------------------------------------------------------------
   * LIF Control Registers
-diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
-index d47b93f2af79..58593f13d246 100644
 --- a/drivers/media/platform/vsp1/vsp1_video.c
 +++ b/drivers/media/platform/vsp1/vsp1_video.c
 @@ -32,6 +32,7 @@
@@ -575,7 +553,7 @@
  #include "vsp1_pipe.h"
  #include "vsp1_rwpf.h"
  #include "vsp1_uds.h"
-@@ -607,6 +608,11 @@ static int vsp1_video_pipeline_build(struct vsp1_pipeline *pipe,
+@@ -607,6 +608,11 @@ static int vsp1_video_pipeline_build(str
  
  			pipe->hgo = e;
  			hgo->histo.pipe = pipe;
@@ -587,6 +565,3 @@
  		}
  	}
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0215-media-videodev.h-add-V4L2_CTRL_FLAG_MODIFY_LAYOUT.patch b/patches.renesas/0215-media-videodev.h-add-V4L2_CTRL_FLAG_MODIFY_LAYOUT.patch
index 15daae1..53cb195 100644
--- a/patches.renesas/0215-media-videodev.h-add-V4L2_CTRL_FLAG_MODIFY_LAYOUT.patch
+++ b/patches.renesas/0215-media-videodev.h-add-V4L2_CTRL_FLAG_MODIFY_LAYOUT.patch
@@ -12,11 +12,9 @@
 (cherry picked from commit 6df8be763115a0ce6b486ea304742e5646f74287)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- include/uapi/linux/videodev2.h | 1 +
+ include/uapi/linux/videodev2.h |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 0a875bab5c54..dd3778256d0d 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -1622,6 +1622,7 @@ struct v4l2_querymenu {
@@ -27,6 +25,3 @@
  
  /*  Query flags, to be ORed with the control ID */
  #define V4L2_CTRL_FLAG_NEXT_CTRL	0x80000000
--- 
-2.13.3
-
diff --git a/patches.renesas/0216-media-vsp1-set-V4L2_CTRL_FLAG_MODIFY_LAYOUT-for-hist.patch b/patches.renesas/0216-media-vsp1-set-V4L2_CTRL_FLAG_MODIFY_LAYOUT-for-hist.patch
index ab2de7a..42ca18e 100644
--- a/patches.renesas/0216-media-vsp1-set-V4L2_CTRL_FLAG_MODIFY_LAYOUT-for-hist.patch
+++ b/patches.renesas/0216-media-vsp1-set-V4L2_CTRL_FLAG_MODIFY_LAYOUT-for-hist.patch
@@ -13,14 +13,12 @@
 (cherry picked from commit 6c1c0afd19317a15d6f2ae4965a73be7240aba18)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/media/platform/vsp1/vsp1_hgo.c | 2 ++
+ drivers/media/platform/vsp1/vsp1_hgo.c |    2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/media/platform/vsp1/vsp1_hgo.c b/drivers/media/platform/vsp1/vsp1_hgo.c
-index a138c6b7fb05..50309c053b78 100644
 --- a/drivers/media/platform/vsp1/vsp1_hgo.c
 +++ b/drivers/media/platform/vsp1/vsp1_hgo.c
-@@ -111,6 +111,7 @@ static const struct v4l2_ctrl_config hgo_max_rgb_control = {
+@@ -111,6 +111,7 @@ static const struct v4l2_ctrl_config hgo
  	.max = 1,
  	.def = 0,
  	.step = 1,
@@ -28,7 +26,7 @@
  };
  
  static const s64 hgo_num_bins[] = {
-@@ -125,6 +126,7 @@ static const struct v4l2_ctrl_config hgo_num_bins_control = {
+@@ -125,6 +126,7 @@ static const struct v4l2_ctrl_config hgo
  	.max = 1,
  	.def = 0,
  	.qmenu_int = hgo_num_bins,
@@ -36,6 +34,3 @@
  };
  
  /* -----------------------------------------------------------------------------
--- 
-2.13.3
-
diff --git a/patches.renesas/0217-media-pixfmt-meta-vsp1-hgo.rst-remove-spurious.patch b/patches.renesas/0217-media-pixfmt-meta-vsp1-hgo.rst-remove-spurious.patch
index 920fa28..ad77623 100644
--- a/patches.renesas/0217-media-pixfmt-meta-vsp1-hgo.rst-remove-spurious.patch
+++ b/patches.renesas/0217-media-pixfmt-meta-vsp1-hgo.rst-remove-spurious.patch
@@ -17,11 +17,9 @@
 (cherry picked from commit 242b0c4cc96f97d0a3b96343acd21613b63fa4a6)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- .../media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst        | 24 +++++++++++-----------
+ Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst |   24 +++++++++---------
  1 file changed, 12 insertions(+), 12 deletions(-)
 
-diff --git a/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst b/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst
-index 8d37bb313493..67796594fd48 100644
 --- a/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst
 +++ b/Documentation/media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst
 @@ -53,19 +53,19 @@ contains one byte.
@@ -86,6 +84,3 @@
        - max(R,G,B) min [7:0]
      * - 4
        - :cspan:`4` max(R,G,B) sum [31:0]
--- 
-2.13.3
-
diff --git a/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch b/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch
index d6664e8..76ea11c 100644
--- a/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch
+++ b/patches.renesas/0218-USB-host-xhci-use-max-port-define.patch
@@ -11,14 +11,12 @@
 (cherry picked from commit 5120a266928a07231d198bb518f6fe73148786a3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-mem.c | 7 ++++---
+ drivers/usb/host/xhci-mem.c |    7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
-index ea1308a7b814..66e67355d84d 100644
 --- a/drivers/usb/host/xhci-mem.c
 +++ b/drivers/usb/host/xhci-mem.c
-@@ -2310,10 +2310,11 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)
+@@ -2310,10 +2310,11 @@ static int xhci_setup_port_arrays(struct
  	/* Place limits on the number of roothub ports so that the hub
  	 * descriptors aren't longer than the USB core will allocate.
  	 */
@@ -33,6 +31,3 @@
  	}
  	if (xhci->num_usb2_ports > USB_MAXCHILDREN) {
  		xhci_dbg_trace(xhci, trace_xhci_dbg_init,
--- 
-2.13.3
-
diff --git a/patches.renesas/0219-usb-xhci-trace-URB-before-giving-it-back-instead-of-.patch b/patches.renesas/0219-usb-xhci-trace-URB-before-giving-it-back-instead-of-.patch
index 5545e44..e274449 100644
--- a/patches.renesas/0219-usb-xhci-trace-URB-before-giving-it-back-instead-of-.patch
+++ b/patches.renesas/0219-usb-xhci-trace-URB-before-giving-it-back-instead-of-.patch
@@ -12,14 +12,12 @@
 (cherry picked from commit 7bc5d5aff356f3ba16c4d1e9eaf95cc99b7574ab)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-ring.c | 2 +-
+ drivers/usb/host/xhci-ring.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 74bf5c60a260..507ba7734b94 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -641,8 +641,8 @@ static void xhci_giveback_urb_in_irq(struct xhci_hcd *xhci,
+@@ -641,8 +641,8 @@ static void xhci_giveback_urb_in_irq(str
  	xhci_urb_free_priv(urb_priv);
  	usb_hcd_unlink_urb_from_ep(hcd, urb);
  	spin_unlock(&xhci->lock);
@@ -29,6 +27,3 @@
  	spin_lock(&xhci->lock);
  }
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0220-usb-host-xhci-ring-don-t-need-to-clear-interrupt-pen.patch b/patches.renesas/0220-usb-host-xhci-ring-don-t-need-to-clear-interrupt-pen.patch
index 1c31e96..a41bb1d 100644
--- a/patches.renesas/0220-usb-host-xhci-ring-don-t-need-to-clear-interrupt-pen.patch
+++ b/patches.renesas/0220-usb-host-xhci-ring-don-t-need-to-clear-interrupt-pen.patch
@@ -23,16 +23,14 @@
 (cherry picked from commit 6a29beef9d1b16c762e469d77e28c3de3f5c3dbb)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-ring.c | 5 +----
- drivers/usb/host/xhci.c      | 5 +++--
- include/linux/usb/hcd.h      | 1 +
+ drivers/usb/host/xhci-ring.c |    5 +----
+ drivers/usb/host/xhci.c      |    5 +++--
+ include/linux/usb/hcd.h      |    1 +
  3 files changed, 5 insertions(+), 6 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 507ba7734b94..0830b25f9499 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -2707,12 +2707,9 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
+@@ -2710,12 +2710,9 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
  	 */
  	status |= STS_EINT;
  	writel(status, &xhci->op_regs->status);
@@ -46,11 +44,9 @@
  		irq_pending = readl(&xhci->ir_set->irq_pending);
  		irq_pending |= IMAN_IP;
  		writel(irq_pending, &xhci->ir_set->irq_pending);
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index dd2b42f52d99..716bd2e7e674 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -398,9 +398,10 @@ static int xhci_try_enable_msi(struct usb_hcd *hcd)
+@@ -401,9 +401,10 @@ static int xhci_try_enable_msi(struct us
  		/* fall back to msi*/
  		ret = xhci_setup_msi(xhci);
  
@@ -63,8 +59,6 @@
  
  	if (!pdev->irq) {
  		xhci_err(xhci, "No msi-x/msi found and no IRQ in BIOS\n");
-diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
-index 66fc13705ab7..287cb491a887 100644
 --- a/include/linux/usb/hcd.h
 +++ b/include/linux/usb/hcd.h
 @@ -148,6 +148,7 @@ struct usb_hcd {
@@ -75,6 +69,3 @@
  	unsigned		remove_phy:1;	/* auto-remove USB phy */
  
  	/* The next flag is a stopgap, to be removed when all the HCDs
--- 
-2.13.3
-
diff --git a/patches.renesas/0221-USB-xhci-fix-lock-inversion-problem.patch b/patches.renesas/0221-USB-xhci-fix-lock-inversion-problem.patch
index 34a8b71..9eeacf5 100644
--- a/patches.renesas/0221-USB-xhci-fix-lock-inversion-problem.patch
+++ b/patches.renesas/0221-USB-xhci-fix-lock-inversion-problem.patch
@@ -60,14 +60,12 @@
 (cherry picked from commit 63aea0dbab90a2461faaae357cbc8cfd6c8de9fe)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-ring.c | 5 +++--
+ drivers/usb/host/xhci-ring.c |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 0830b25f9499..6d2492c1c643 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -2677,11 +2677,12 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
+@@ -2680,11 +2680,12 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
  	struct xhci_hcd *xhci = hcd_to_xhci(hcd);
  	union xhci_trb *event_ring_deq;
  	irqreturn_t ret = IRQ_NONE;
@@ -81,7 +79,7 @@
  	/* Check if the xHC generated the interrupt, or the irq is shared */
  	status = readl(&xhci->op_regs->status);
  	if (status == ~(u32)0) {
-@@ -2754,7 +2755,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd)
+@@ -2757,7 +2758,7 @@ irqreturn_t xhci_irq(struct usb_hcd *hcd
  	ret = IRQ_HANDLED;
  
  out:
@@ -90,6 +88,3 @@
  
  	return ret;
  }
--- 
-2.13.3
-
diff --git a/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch b/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch
index 4c1b718..daf00bd 100644
--- a/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch
+++ b/patches.renesas/0222-xhci-Fix-command-ring-stop-regression-in-4.11.patch
@@ -17,16 +17,14 @@
 (cherry picked from commit 604d02a2a66ab7f93fd3b2bde3698c29ef057b65)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-hub.c  | 2 +-
- drivers/usb/host/xhci-ring.c | 8 ++++----
- drivers/usb/host/xhci.c      | 8 ++++----
+ drivers/usb/host/xhci-hub.c  |    2 +-
+ drivers/usb/host/xhci-ring.c |    8 ++++----
+ drivers/usb/host/xhci.c      |    8 ++++----
  3 files changed, 9 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
-index 5e3e9d4c6956..0dde49c35dd2 100644
 --- a/drivers/usb/host/xhci-hub.c
 +++ b/drivers/usb/host/xhci-hub.c
-@@ -419,7 +419,7 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend)
+@@ -419,7 +419,7 @@ static int xhci_stop_device(struct xhci_
  	wait_for_completion(cmd->completion);
  
  	if (cmd->status == COMP_COMMAND_ABORTED ||
@@ -35,11 +33,9 @@
  		xhci_warn(xhci, "Timeout while waiting for stop endpoint command\n");
  		ret = -ETIME;
  	}
-diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
-index 6d2492c1c643..03f63f50afb6 100644
 --- a/drivers/usb/host/xhci-ring.c
 +++ b/drivers/usb/host/xhci-ring.c
-@@ -323,7 +323,7 @@ static void xhci_handle_stopped_cmd_ring(struct xhci_hcd *xhci,
+@@ -323,7 +323,7 @@ static void xhci_handle_stopped_cmd_ring
  		if (i_cmd->status != COMP_COMMAND_ABORTED)
  			continue;
  
@@ -48,7 +44,7 @@
  
  		xhci_dbg(xhci, "Turn aborted command %p to no-op\n",
  			 i_cmd->command_trb);
-@@ -1380,7 +1380,7 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
+@@ -1383,7 +1383,7 @@ static void handle_cmd_completion(struct
  	cmd_comp_code = GET_COMP_CODE(le32_to_cpu(event->status));
  
  	/* If CMD ring stopped we own the trbs between enqueue and dequeue */
@@ -57,7 +53,7 @@
  		complete_all(&xhci->cmd_ring_stop_completion);
  		return;
  	}
-@@ -1436,8 +1436,8 @@ static void handle_cmd_completion(struct xhci_hcd *xhci,
+@@ -1439,8 +1439,8 @@ static void handle_cmd_completion(struct
  		break;
  	case TRB_CMD_NOOP:
  		/* Is this an aborted command turned to NO-OP? */
@@ -68,11 +64,9 @@
  		break;
  	case TRB_RESET_EP:
  		WARN_ON(slot_id != TRB_TO_SLOT_ID(
-diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
-index 716bd2e7e674..5c9e69cb8ea6 100644
 --- a/drivers/usb/host/xhci.c
 +++ b/drivers/usb/host/xhci.c
-@@ -1803,7 +1803,7 @@ static int xhci_configure_endpoint_result(struct xhci_hcd *xhci,
+@@ -1809,7 +1809,7 @@ static int xhci_configure_endpoint_resul
  
  	switch (*cmd_status) {
  	case COMP_COMMAND_ABORTED:
@@ -81,7 +75,7 @@
  		xhci_warn(xhci, "Timeout while waiting for configure endpoint command\n");
  		ret = -ETIME;
  		break;
-@@ -1853,7 +1853,7 @@ static int xhci_evaluate_context_result(struct xhci_hcd *xhci,
+@@ -1859,7 +1859,7 @@ static int xhci_evaluate_context_result(
  
  	switch (*cmd_status) {
  	case COMP_COMMAND_ABORTED:
@@ -90,7 +84,7 @@
  		xhci_warn(xhci, "Timeout while waiting for evaluate context command\n");
  		ret = -ETIME;
  		break;
-@@ -3472,7 +3472,7 @@ static int xhci_discover_or_reset_device(struct usb_hcd *hcd,
+@@ -3478,7 +3478,7 @@ static int xhci_discover_or_reset_device
  	ret = reset_device_cmd->status;
  	switch (ret) {
  	case COMP_COMMAND_ABORTED:
@@ -99,7 +93,7 @@
  		xhci_warn(xhci, "Timeout waiting for reset device command\n");
  		ret = -ETIME;
  		goto command_cleanup;
-@@ -3857,7 +3857,7 @@ static int xhci_setup_device(struct usb_hcd *hcd, struct usb_device *udev,
+@@ -3863,7 +3863,7 @@ static int xhci_setup_device(struct usb_
  	 */
  	switch (command->status) {
  	case COMP_COMMAND_ABORTED:
@@ -108,6 +102,3 @@
  		xhci_warn(xhci, "Timeout while waiting for setup device command\n");
  		ret = -ETIME;
  		break;
--- 
-2.13.3
-
diff --git a/patches.renesas/0223-dt-bindings-net-sms911x-Add-missing-optional-VDD-reg.patch b/patches.renesas/0223-dt-bindings-net-sms911x-Add-missing-optional-VDD-reg.patch
index ec77dd5..f26f1b2 100644
--- a/patches.renesas/0223-dt-bindings-net-sms911x-Add-missing-optional-VDD-reg.patch
+++ b/patches.renesas/0223-dt-bindings-net-sms911x-Add-missing-optional-VDD-reg.patch
@@ -15,11 +15,9 @@
 (cherry picked from commit 7e113321eccba2b52c0e9d11129d370c9511e4db)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/net/smsc911x.txt | 1 +
+ Documentation/devicetree/bindings/net/smsc911x.txt |    1 +
  1 file changed, 1 insertion(+)
 
-diff --git a/Documentation/devicetree/bindings/net/smsc911x.txt b/Documentation/devicetree/bindings/net/smsc911x.txt
-index 16c3a9501f5d..acfafc8e143c 100644
 --- a/Documentation/devicetree/bindings/net/smsc911x.txt
 +++ b/Documentation/devicetree/bindings/net/smsc911x.txt
 @@ -27,6 +27,7 @@ Optional properties:
@@ -30,6 +28,3 @@
  
  Examples:
  
--- 
-2.13.3
-
diff --git a/patches.renesas/0224-net-phy-micrel-configure-intterupts-after-autoneg-wo.patch b/patches.renesas/0224-net-phy-micrel-configure-intterupts-after-autoneg-wo.patch
deleted file mode 100644
index a6f1e57..0000000
--- a/patches.renesas/0224-net-phy-micrel-configure-intterupts-after-autoneg-wo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 042ca95f3db