Update KERNEL_VERSION to 3.14.733.14-ltsi

44 files changed, 300 insertions, 684 deletions

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 3257727f2b4bd2..259ac530799f07 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-3.14.57
+3.14.73
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index 0dd19c6de5d0a3..eb17ad0ad154cb 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 14
- SUBLEVEL = 57
+ SUBLEVEL = 73
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Remembering Coco
diff --git a/patches.renesas/0002-of-fdt-update-of_get_flat_dt_prop-in-prep-for-libfdt.patch b/patches.renesas/0002-of-fdt-update-of_get_flat_dt_prop-in-prep-for-libfdt.patch
index 8b8d5464e8bff5..392e880b92349b 100644
--- a/patches.renesas/0002-of-fdt-update-of_get_flat_dt_prop-in-prep-for-libfdt.patch
+++ b/patches.renesas/0002-of-fdt-update-of_get_flat_dt_prop-in-prep-for-libfdt.patch
@@ -153,7 +153,7 @@ Conflicts:
 --- a/arch/powerpc/kernel/prom.c
 +++ b/arch/powerpc/kernel/prom.c
 @@ -162,7 +162,7 @@ static struct ibm_pa_feature {
- 	{CPU_FTR_REAL_LE, PPC_FEATURE_TRUE_LE, 5, 0, 0},
+ 	{CPU_FTR_REAL_LE, 0, PPC_FEATURE_TRUE_LE, 5, 0, 0},
  };
  
 -static void __init scan_features(unsigned long node, unsigned char *ftrs,
diff --git a/patches.renesas/0100-sh_eth-use-ETH_ZLEN-instead-of-home-grown-define.patch b/patches.renesas/0100-sh_eth-use-ETH_ZLEN-instead-of-home-grown-define.patch
index 3f1937f0672a26..847b56f9b615a6 100644
--- a/patches.renesas/0100-sh_eth-use-ETH_ZLEN-instead-of-home-grown-define.patch
+++ b/patches.renesas/0100-sh_eth-use-ETH_ZLEN-instead-of-home-grown-define.patch
@@ -12,15 +12,13 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 730c8c69bc8d4640336885e20e719b0842d0fcb2)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 4 ++--
- drivers/net/ethernet/renesas/sh_eth.h | 3 +--
+ drivers/net/ethernet/renesas/sh_eth.c |    4 ++--
+ drivers/net/ethernet/renesas/sh_eth.h |    3 +--
  2 files changed, 3 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 957f0ffe31c4..6f1884d7804b 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2112,8 +2112,8 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+@@ -2113,8 +2113,8 @@ static int sh_eth_start_xmit(struct sk_b
  				 skb->len + 2);
  	txdesc->addr = dma_map_single(&ndev->dev, skb->data, skb->len,
  				      DMA_TO_DEVICE);
@@ -31,8 +29,6 @@ index 957f0ffe31c4..6f1884d7804b 100644
  	else
  		txdesc->buffer_length = skb->len;
  
-diff --git a/drivers/net/ethernet/renesas/sh_eth.h b/drivers/net/ethernet/renesas/sh_eth.h
-index a096b4bf9799..b37c427144ee 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.h
 +++ b/drivers/net/ethernet/renesas/sh_eth.h
 @@ -27,8 +27,7 @@
@@ -45,6 +41,3 @@ index a096b4bf9799..b37c427144ee 100644
  #define SH_ETH_TSU_TIMEOUT_MS	500
  #define SH_ETH_TSU_CAM_ENTRIES	32
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0101-sh_eth-add-device-tree-support.patch b/patches.renesas/0101-sh_eth-add-device-tree-support.patch
index 8e6d8c7cf3da7b..3f7723f32f69ee 100644
--- a/patches.renesas/0101-sh_eth-add-device-tree-support.patch
+++ b/patches.renesas/0101-sh_eth-add-device-tree-support.patch
@@ -14,14 +14,11 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit b356e978e92fccd17a3e4620a4821bdbfb706c1a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/net/sh_eth.txt | 55 +++++++++++++++++++
- drivers/net/ethernet/renesas/sh_eth.c            | 69 ++++++++++++++++++++++--
+ Documentation/devicetree/bindings/net/sh_eth.txt |   55 ++++++++++++++++++
+ drivers/net/ethernet/renesas/sh_eth.c            |   69 ++++++++++++++++++++++-
  2 files changed, 121 insertions(+), 3 deletions(-)
  create mode 100644 Documentation/devicetree/bindings/net/sh_eth.txt
 
-diff --git a/Documentation/devicetree/bindings/net/sh_eth.txt b/Documentation/devicetree/bindings/net/sh_eth.txt
-new file mode 100644
-index 000000000000..e7106b50dbdc
 --- /dev/null
 +++ b/Documentation/devicetree/bindings/net/sh_eth.txt
 @@ -0,0 +1,55 @@
@@ -80,8 +77,6 @@ index 000000000000..e7106b50dbdc
 +			pinctrl-names = "default";
 +		};
 +	};
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 6f1884d7804b..b1afdaa7a466 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
 @@ -1,8 +1,8 @@
@@ -106,7 +101,7 @@ index 6f1884d7804b..b1afdaa7a466 100644
  #include <linux/phy.h>
  #include <linux/cache.h>
  #include <linux/io.h>
-@@ -2724,6 +2728,54 @@ static const struct net_device_ops sh_eth_netdev_ops_tsu = {
+@@ -2725,6 +2729,54 @@ static const struct net_device_ops sh_et
  	.ndo_change_mtu		= eth_change_mtu,
  };
  
@@ -161,7 +156,7 @@ index 6f1884d7804b..b1afdaa7a466 100644
  static int sh_eth_drv_probe(struct platform_device *pdev)
  {
  	int ret, devno = 0;
-@@ -2777,6 +2829,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2778,6 +2830,8 @@ static int sh_eth_drv_probe(struct platf
  	pm_runtime_enable(&pdev->dev);
  	pm_runtime_resume(&pdev->dev);
  
@@ -170,7 +165,7 @@ index 6f1884d7804b..b1afdaa7a466 100644
  	if (!pd) {
  		dev_err(&pdev->dev, "no platform data\n");
  		ret = -EINVAL;
-@@ -2792,7 +2846,15 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2793,7 +2847,15 @@ static int sh_eth_drv_probe(struct platf
  	mdp->ether_link_active_low = pd->ether_link_active_low;
  
  	/* set cpu data */
@@ -187,7 +182,7 @@ index 6f1884d7804b..b1afdaa7a466 100644
  	mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type);
  	sh_eth_set_default_cpu_data(mdp->cd);
  
-@@ -2934,6 +2996,7 @@ static struct platform_driver sh_eth_driver = {
+@@ -2935,6 +2997,7 @@ static struct platform_driver sh_eth_dri
  	.driver = {
  		   .name = CARDNAME,
  		   .pm = SH_ETH_PM_OPS,
@@ -195,6 +190,3 @@ index 6f1884d7804b..b1afdaa7a466 100644
  	},
  };
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0102-sh_eth-update-OF-PHY-registeration.patch b/patches.renesas/0102-sh_eth-update-OF-PHY-registeration.patch
index f45b643591dd5c..fbef605fca32b0 100644
--- a/patches.renesas/0102-sh_eth-update-OF-PHY-registeration.patch
+++ b/patches.renesas/0102-sh_eth-update-OF-PHY-registeration.patch
@@ -17,11 +17,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 702eca02b7c8574b42359512ebccfa777a71f66e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 59 +++++++++++++++++++++++------------
+ drivers/net/ethernet/renesas/sh_eth.c |   59 ++++++++++++++++++++++------------
  1 file changed, 39 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index b1afdaa7a466..5242fe81ecc7 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
 @@ -3,6 +3,7 @@
@@ -40,7 +38,7 @@ index b1afdaa7a466..5242fe81ecc7 100644
  
  #include "sh_eth.h"
  
-@@ -1775,22 +1777,37 @@ static void sh_eth_adjust_link(struct net_device *ndev)
+@@ -1776,22 +1778,37 @@ static void sh_eth_adjust_link(struct ne
  /* PHY init function */
  static int sh_eth_phy_init(struct net_device *ndev)
  {
@@ -85,7 +83,7 @@ index b1afdaa7a466..5242fe81ecc7 100644
  		return PTR_ERR(phydev);
  	}
  
-@@ -2652,13 +2669,19 @@ static int sh_mdio_init(struct net_device *ndev, int id,
+@@ -2653,13 +2670,19 @@ static int sh_mdio_init(struct net_devic
  		goto out_free_bus;
  	}
  
@@ -111,7 +109,7 @@ index b1afdaa7a466..5242fe81ecc7 100644
  	if (ret)
  		goto out_free_bus;
  
-@@ -2733,7 +2756,6 @@ static struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)
+@@ -2734,7 +2757,6 @@ static struct sh_eth_plat_data *sh_eth_p
  {
  	struct device_node *np = dev->of_node;
  	struct sh_eth_plat_data *pdata;
@@ -119,7 +117,7 @@ index b1afdaa7a466..5242fe81ecc7 100644
  	const char *mac_addr;
  
  	pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
-@@ -2742,11 +2764,6 @@ static struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)
+@@ -2743,11 +2765,6 @@ static struct sh_eth_plat_data *sh_eth_p
  
  	pdata->phy_interface = of_get_phy_mode(np);
  
@@ -131,7 +129,7 @@ index b1afdaa7a466..5242fe81ecc7 100644
  	mac_addr = of_get_mac_address(np);
  	if (mac_addr)
  		memcpy(pdata->mac_addr, mac_addr, ETH_ALEN);
-@@ -2910,8 +2927,10 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2911,8 +2928,10 @@ static int sh_eth_drv_probe(struct platf
  
  	/* mdio bus init */
  	ret = sh_mdio_init(ndev, pdev->id, pd);
@@ -143,6 +141,3 @@ index b1afdaa7a466..5242fe81ecc7 100644
  
  	/* print device information */
  	pr_info("Base address at 0x%x, %pM, IRQ %d.\n",
--- 
-2.1.2
-
diff --git a/patches.renesas/0103-sh_eth-exit-probe-with-unknown-register-layout.patch b/patches.renesas/0103-sh_eth-exit-probe-with-unknown-register-layout.patch
index 0f7d53c35e4aa7..01a1736e290dfc 100644
--- a/patches.renesas/0103-sh_eth-exit-probe-with-unknown-register-layout.patch
+++ b/patches.renesas/0103-sh_eth-exit-probe-with-unknown-register-layout.patch
@@ -15,14 +15,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 264be2f5a973cc85be3e31d6bf6234b55a256627)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 7 ++++++-
+ drivers/net/ethernet/renesas/sh_eth.c |    7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 5242fe81ecc7..4d3b5b704b39 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2717,7 +2717,6 @@ static const u16 *sh_eth_get_register_offset(int register_type)
+@@ -2718,7 +2718,6 @@ static const u16 *sh_eth_get_register_of
  		reg_offset = sh_eth_offset_fast_sh3_sh2;
  		break;
  	default:
@@ -30,7 +28,7 @@ index 5242fe81ecc7..4d3b5b704b39 100644
  		break;
  	}
  
-@@ -2873,6 +2872,12 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2874,6 +2873,12 @@ static int sh_eth_drv_probe(struct platf
  		mdp->cd = (struct sh_eth_cpu_data *)match->data;
  	}
  	mdp->reg_offset = sh_eth_get_register_offset(mdp->cd->register_type);
@@ -43,6 +41,3 @@ index 5242fe81ecc7..4d3b5b704b39 100644
  	sh_eth_set_default_cpu_data(mdp->cd);
  
  	/* set function */
--- 
-2.1.2
-
diff --git a/patches.renesas/0104-sh_eth-convert-pr_-to-netdev_-calls.patch b/patches.renesas/0104-sh_eth-convert-pr_-to-netdev_-calls.patch
index 9268a399aef233..4583711e0d84ff 100644
--- a/patches.renesas/0104-sh_eth-convert-pr_-to-netdev_-calls.patch
+++ b/patches.renesas/0104-sh_eth-convert-pr_-to-netdev_-calls.patch
@@ -11,14 +11,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit f75f14ec2f7b552dc87b4b57b2a19e487378f774)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 9 +++++----
+ drivers/net/ethernet/renesas/sh_eth.c |    9 +++++----
  1 file changed, 5 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 4d3b5b704b39..32daff7fa2d1 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -421,7 +421,8 @@ static void sh_eth_select_mii(struct net_device *ndev)
+@@ -421,7 +421,8 @@ static void sh_eth_select_mii(struct net
  		value = 0x0;
  		break;
  	default:
@@ -28,7 +26,7 @@ index 4d3b5b704b39..32daff7fa2d1 100644
  		value = 0x1;
  		break;
  	}
-@@ -868,7 +869,7 @@ static int sh_eth_check_reset(struct net_device *ndev)
+@@ -868,7 +869,7 @@ static int sh_eth_check_reset(struct net
  		cnt--;
  	}
  	if (cnt <= 0) {
@@ -37,7 +35,7 @@ index 4d3b5b704b39..32daff7fa2d1 100644
  		ret = -ETIMEDOUT;
  	}
  	return ret;
-@@ -2938,8 +2939,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2939,8 +2940,8 @@ static int sh_eth_drv_probe(struct platf
  	}
  
  	/* print device information */
@@ -48,6 +46,3 @@ index 4d3b5b704b39..32daff7fa2d1 100644
  
  	platform_set_drvdata(pdev, ndev);
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0105-sh_eth-convert-dev_-to-netdev_-calls.patch b/patches.renesas/0105-sh_eth-convert-dev_-to-netdev_-calls.patch
index a3b04fb04f409a..58936ea3b5f7ad 100644
--- a/patches.renesas/0105-sh_eth-convert-dev_-to-netdev_-calls.patch
+++ b/patches.renesas/0105-sh_eth-convert-dev_-to-netdev_-calls.patch
@@ -12,14 +12,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit da2468555643efbde3fb026cd46e5245800cc872)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 47 ++++++++++++++++++-----------------
+ drivers/net/ethernet/renesas/sh_eth.c |   47 +++++++++++++++++-----------------
  1 file changed, 24 insertions(+), 23 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 32daff7fa2d1..185f185b5f6d 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1572,7 +1572,7 @@ ignore_link:
+@@ -1573,7 +1573,7 @@ ignore_link:
  		if (intr_status & EESR_TABT) {	/* Transmit Abort int */
  			ndev->stats.tx_aborted_errors++;
  			if (netif_msg_tx_err(mdp))
@@ -28,7 +26,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  		}
  	}
  
-@@ -1582,7 +1582,7 @@ ignore_link:
+@@ -1583,7 +1583,7 @@ ignore_link:
  			/* Receive Frame Overflow int */
  			ndev->stats.rx_frame_errors++;
  			if (netif_msg_rx_err(mdp))
@@ -37,7 +35,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  		}
  	}
  
-@@ -1590,14 +1590,14 @@ ignore_link:
+@@ -1591,14 +1591,14 @@ ignore_link:
  		/* Transmit Descriptor Empty int */
  		ndev->stats.tx_fifo_errors++;
  		if (netif_msg_tx_err(mdp))
@@ -54,7 +52,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  	}
  
  	if (intr_status & EESR_RDE) {
-@@ -1605,21 +1605,21 @@ ignore_link:
+@@ -1606,21 +1606,21 @@ ignore_link:
  		ndev->stats.rx_over_errors++;
  
  		if (netif_msg_rx_err(mdp))
@@ -79,7 +77,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  	}
  
  	mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE;
-@@ -1630,9 +1630,9 @@ ignore_link:
+@@ -1631,9 +1631,9 @@ ignore_link:
  		u32 edtrr = sh_eth_read(ndev, EDTRR);
  
  		/* dmesg */
@@ -92,7 +90,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  		/* dirty buffer free */
  		sh_eth_txfree(ndev);
  
-@@ -1677,9 +1677,9 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev)
+@@ -1678,9 +1678,9 @@ static irqreturn_t sh_eth_interrupt(int
  				     EESIPR);
  			__napi_schedule(&mdp->napi);
  		} else {
@@ -105,7 +103,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  		}
  	}
  
-@@ -1808,12 +1808,12 @@ static int sh_eth_phy_init(struct net_device *ndev)
+@@ -1809,12 +1809,12 @@ static int sh_eth_phy_init(struct net_de
  	}
  
  	if (IS_ERR(phydev)) {
@@ -121,7 +119,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  
  	mdp->phydev = phydev;
  
-@@ -1994,12 +1994,12 @@ static int sh_eth_set_ringparam(struct net_device *ndev,
+@@ -1995,12 +1995,12 @@ static int sh_eth_set_ringparam(struct n
  
  	ret = sh_eth_ring_init(ndev);
  	if (ret < 0) {
@@ -136,7 +134,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  		return ret;
  	}
  
-@@ -2040,7 +2040,7 @@ static int sh_eth_open(struct net_device *ndev)
+@@ -2041,7 +2041,7 @@ static int sh_eth_open(struct net_device
  	ret = request_irq(ndev->irq, sh_eth_interrupt,
  			  mdp->cd->irq_flags, ndev->name, ndev);
  	if (ret) {
@@ -145,7 +143,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  		goto out_napi_off;
  	}
  
-@@ -2079,8 +2079,9 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
+@@ -2080,8 +2080,9 @@ static void sh_eth_tx_timeout(struct net
  	netif_stop_queue(ndev);
  
  	if (netif_msg_timer(mdp)) {
@@ -157,7 +155,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  	}
  
  	/* tx_errors count up */
-@@ -2117,7 +2118,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+@@ -2118,7 +2119,7 @@ static int sh_eth_start_xmit(struct sk_b
  	if ((mdp->cur_tx - mdp->dirty_tx) >= (mdp->num_tx_ring - 4)) {
  		if (!sh_eth_txfree(ndev)) {
  			if (netif_msg_tx_queued(mdp))
@@ -166,7 +164,7 @@ index 32daff7fa2d1..185f185b5f6d 100644
  			netif_stop_queue(ndev);
  			spin_unlock_irqrestore(&mdp->lock, flags);
  			return NETDEV_TX_BUSY;
-@@ -2287,7 +2288,7 @@ static int sh_eth_tsu_busy(struct net_device *ndev)
+@@ -2288,7 +2289,7 @@ static int sh_eth_tsu_busy(struct net_de
  		udelay(10);
  		timeout--;
  		if (timeout <= 0) {
@@ -175,6 +173,3 @@ index 32daff7fa2d1..185f185b5f6d 100644
  			return -ETIMEDOUT;
  		}
  	}
--- 
-2.1.2
-
diff --git a/patches.renesas/0106-sh_eth-fold-netif_msg_-and-netdev_-calls-into-netif_.patch b/patches.renesas/0106-sh_eth-fold-netif_msg_-and-netdev_-calls-into-netif_.patch
index 7bcbc924d7adca..39385e116595d2 100644
--- a/patches.renesas/0106-sh_eth-fold-netif_msg_-and-netdev_-calls-into-netif_.patch
+++ b/patches.renesas/0106-sh_eth-fold-netif_msg_-and-netdev_-calls-into-netif_.patch
@@ -13,14 +13,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 8d5009f6a9d9f4ef62a39bf68b53379b2b766c1c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 33 +++++++++++----------------------
+ drivers/net/ethernet/renesas/sh_eth.c |   33 +++++++++++----------------------
  1 file changed, 11 insertions(+), 22 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 185f185b5f6d..062a70f85068 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1571,8 +1571,7 @@ ignore_link:
+@@ -1572,8 +1572,7 @@ ignore_link:
  		/* Unused write back interrupt */
  		if (intr_status & EESR_TABT) {	/* Transmit Abort int */
  			ndev->stats.tx_aborted_errors++;
@@ -30,7 +28,7 @@ index 185f185b5f6d..062a70f85068 100644
  		}
  	}
  
-@@ -1581,45 +1580,38 @@ ignore_link:
+@@ -1582,45 +1581,38 @@ ignore_link:
  		if (intr_status & EESR_RFRMER) {
  			/* Receive Frame Overflow int */
  			ndev->stats.rx_frame_errors++;
@@ -82,7 +80,7 @@ index 185f185b5f6d..062a70f85068 100644
  	}
  
  	mask = EESR_TWB | EESR_TABT | EESR_ADE | EESR_TDE | EESR_TFE;
-@@ -2078,11 +2070,9 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
+@@ -2079,11 +2071,9 @@ static void sh_eth_tx_timeout(struct net
  
  	netif_stop_queue(ndev);
  
@@ -97,7 +95,7 @@ index 185f185b5f6d..062a70f85068 100644
  
  	/* tx_errors count up */
  	ndev->stats.tx_errors++;
-@@ -2117,8 +2107,7 @@ static int sh_eth_start_xmit(struct sk_buff *skb, struct net_device *ndev)
+@@ -2118,8 +2108,7 @@ static int sh_eth_start_xmit(struct sk_b
  	spin_lock_irqsave(&mdp->lock, flags);
  	if ((mdp->cur_tx - mdp->dirty_tx) >= (mdp->num_tx_ring - 4)) {
  		if (!sh_eth_txfree(ndev)) {
@@ -107,6 +105,3 @@ index 185f185b5f6d..062a70f85068 100644
  			netif_stop_queue(ndev);
  			spin_unlock_irqrestore(&mdp->lock, flags);
  			return NETDEV_TX_BUSY;
--- 
-2.1.2
-
diff --git a/patches.renesas/0107-sh_eth-Use-the-platform-device-for-memory-allocation.patch b/patches.renesas/0107-sh_eth-Use-the-platform-device-for-memory-allocation.patch
index 41debaae3f70be..101471fd8f0daf 100644
--- a/patches.renesas/0107-sh_eth-Use-the-platform-device-for-memory-allocation.patch
+++ b/patches.renesas/0107-sh_eth-Use-the-platform-device-for-memory-allocation.patch
@@ -19,14 +19,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit aa8d422510969b705656e49fc0166d862aca9246)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 7 +++----
+ drivers/net/ethernet/renesas/sh_eth.c |    7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 062a70f85068..361ac103297b 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2620,10 +2620,10 @@ static int sh_mdio_init(struct net_device *ndev, int id,
+@@ -2621,10 +2621,10 @@ static int sh_mdio_init(struct net_devic
  	int ret, i;
  	struct bb_info *bitbang;
  	struct sh_eth_private *mdp = netdev_priv(ndev);
@@ -39,7 +37,7 @@ index 062a70f85068..361ac103297b 100644
  	if (!bitbang) {
  		ret = -ENOMEM;
  		goto out;
-@@ -2652,8 +2652,7 @@ static int sh_mdio_init(struct net_device *ndev, int id,
+@@ -2653,8 +2653,7 @@ static int sh_mdio_init(struct net_devic
  		 mdp->pdev->name, id);
  
  	/* PHY IRQ */
@@ -49,6 +47,3 @@ index 062a70f85068..361ac103297b 100644
  					 GFP_KERNEL);
  	if (!mdp->mii_bus->irq) {
  		ret = -ENOMEM;
--- 
-2.1.2
-
diff --git a/patches.renesas/0108-sh_eth-Use-the-platform-device-as-the-MDIO-bus-paren.patch b/patches.renesas/0108-sh_eth-Use-the-platform-device-as-the-MDIO-bus-paren.patch
index daad9ddfcba1e4..1ff6f18d212c10 100644
--- a/patches.renesas/0108-sh_eth-Use-the-platform-device-as-the-MDIO-bus-paren.patch
+++ b/patches.renesas/0108-sh_eth-Use-the-platform-device-as-the-MDIO-bus-paren.patch
@@ -14,14 +14,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit a5bd60608936fbb84471a80592401ce29a68de71)
 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 361ac103297b..088d8c3edb89 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2647,7 +2647,7 @@ static int sh_mdio_init(struct net_device *ndev, int id,
+@@ -2648,7 +2648,7 @@ static int sh_mdio_init(struct net_devic
  
  	/* Hook up MII support for ethtool */
  	mdp->mii_bus->name = "sh_mii";
@@ -30,6 +28,3 @@ index 361ac103297b..088d8c3edb89 100644
  	snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
  		 mdp->pdev->name, id);
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0109-sh_eth-Simplify-MDIO-bus-initialization-and-release.patch b/patches.renesas/0109-sh_eth-Simplify-MDIO-bus-initialization-and-release.patch
index 497709444e7f59..42e54b8dc34fc1 100644
--- a/patches.renesas/0109-sh_eth-Simplify-MDIO-bus-initialization-and-release.patch
+++ b/patches.renesas/0109-sh_eth-Simplify-MDIO-bus-initialization-and-release.patch
@@ -13,14 +13,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit bd920ff553ba17f19372501a14e432d9d92b102b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 30 +++++++++++-------------------
+ drivers/net/ethernet/renesas/sh_eth.c |   30 +++++++++++-------------------
  1 file changed, 11 insertions(+), 19 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 088d8c3edb89..7067fdeb5bb3 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2597,29 +2597,24 @@ static void sh_eth_tsu_init(struct sh_eth_private *mdp)
+@@ -2598,29 +2598,24 @@ static void sh_eth_tsu_init(struct sh_et
  }
  
  /* MDIO bus release function */
@@ -55,7 +53,7 @@ index 088d8c3edb89..7067fdeb5bb3 100644
  	struct device *dev = &mdp->pdev->dev;
  
  	/* create bit control struct for PHY */
-@@ -2649,7 +2644,7 @@ static int sh_mdio_init(struct net_device *ndev, int id,
+@@ -2650,7 +2645,7 @@ static int sh_mdio_init(struct net_devic
  	mdp->mii_bus->name = "sh_mii";
  	mdp->mii_bus->parent = dev;
  	snprintf(mdp->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
@@ -64,7 +62,7 @@ index 088d8c3edb89..7067fdeb5bb3 100644
  
  	/* PHY IRQ */
  	mdp->mii_bus->irq = devm_kzalloc(dev, sizeof(int) * PHY_MAX_ADDR,
-@@ -2659,10 +2654,9 @@ static int sh_mdio_init(struct net_device *ndev, int id,
+@@ -2660,10 +2655,9 @@ static int sh_mdio_init(struct net_devic
  		goto out_free_bus;
  	}
  
@@ -78,7 +76,7 @@ index 088d8c3edb89..7067fdeb5bb3 100644
  	} else {
  		for (i = 0; i < PHY_MAX_ADDR; i++)
  			mdp->mii_bus->irq[i] = PHY_POLL;
-@@ -2675,8 +2669,6 @@ static int sh_mdio_init(struct net_device *ndev, int id,
+@@ -2676,8 +2670,6 @@ static int sh_mdio_init(struct net_devic
  	if (ret)
  		goto out_free_bus;
  
@@ -87,7 +85,7 @@ index 088d8c3edb89..7067fdeb5bb3 100644
  	return 0;
  
  out_free_bus:
-@@ -2921,7 +2913,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2922,7 +2914,7 @@ static int sh_eth_drv_probe(struct platf
  		goto out_napi_del;
  
  	/* mdio bus init */
@@ -96,7 +94,7 @@ index 088d8c3edb89..7067fdeb5bb3 100644
  	if (ret) {
  		dev_err(&ndev->dev, "failed to initialise MDIO\n");
  		goto out_unregister;
-@@ -2955,7 +2947,7 @@ static int sh_eth_drv_remove(struct platform_device *pdev)
+@@ -2956,7 +2948,7 @@ static int sh_eth_drv_remove(struct plat
  	struct net_device *ndev = platform_get_drvdata(pdev);
  	struct sh_eth_private *mdp = netdev_priv(ndev);
  
@@ -105,6 +103,3 @@ index 088d8c3edb89..7067fdeb5bb3 100644
  	unregister_netdev(ndev);
  	netif_napi_del(&mdp->napi);
  	pm_runtime_disable(&pdev->dev);
--- 
-2.1.2
-
diff --git a/patches.renesas/0110-sh_eth-Register-MDIO-bus-before-registering-the-netw.patch b/patches.renesas/0110-sh_eth-Register-MDIO-bus-before-registering-the-netw.patch
index 72993e5e1a93e4..99f0336a15891c 100644
--- a/patches.renesas/0110-sh_eth-Register-MDIO-bus-before-registering-the-netw.patch
+++ b/patches.renesas/0110-sh_eth-Register-MDIO-bus-before-registering-the-netw.patch
@@ -13,14 +13,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit daacf03f0bbfefee3df107c3f7659d22e22538a7)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 20 +++++++++-----------
+ drivers/net/ethernet/renesas/sh_eth.c |   20 +++++++++-----------
  1 file changed, 9 insertions(+), 11 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 7067fdeb5bb3..5fc66a52c471 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2905,6 +2905,13 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2906,6 +2906,13 @@ static int sh_eth_drv_probe(struct platf
  		}
  	}
  
@@ -34,7 +32,7 @@ index 7067fdeb5bb3..5fc66a52c471 100644
  	netif_napi_add(ndev, &mdp->napi, sh_eth_poll, 64);
  
  	/* network device register */
-@@ -2912,13 +2919,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2913,13 +2920,6 @@ static int sh_eth_drv_probe(struct platf
  	if (ret)
  		goto out_napi_del;
  
@@ -48,7 +46,7 @@ index 7067fdeb5bb3..5fc66a52c471 100644
  	/* print device information */
  	netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n",
  		    (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
-@@ -2927,11 +2927,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2928,11 +2928,9 @@ static int sh_eth_drv_probe(struct platf
  
  	return ret;
  
@@ -61,7 +59,7 @@ index 7067fdeb5bb3..5fc66a52c471 100644
  
  out_release:
  	/* net_dev free */
-@@ -2947,9 +2945,9 @@ static int sh_eth_drv_remove(struct platform_device *pdev)
+@@ -2948,9 +2946,9 @@ static int sh_eth_drv_remove(struct plat
  	struct net_device *ndev = platform_get_drvdata(pdev);
  	struct sh_eth_private *mdp = netdev_priv(ndev);
  
@@ -72,6 +70,3 @@ index 7067fdeb5bb3..5fc66a52c471 100644
  	pm_runtime_disable(&pdev->dev);
  	free_netdev(ndev);
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0111-sh_eth-Remove-goto-statements-that-jump-straight-to-.patch b/patches.renesas/0111-sh_eth-Remove-goto-statements-that-jump-straight-to-.patch
index 9653c062505f13..0f52bfb21805fe 100644
--- a/patches.renesas/0111-sh_eth-Remove-goto-statements-that-jump-straight-to-.patch
+++ b/patches.renesas/0111-sh_eth-Remove-goto-statements-that-jump-straight-to-.patch
@@ -13,14 +13,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit f738a13d8365b0f824f3f20450b413f55374f175)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 30 +++++++++---------------------
+ drivers/net/ethernet/renesas/sh_eth.c |   30 +++++++++---------------------
  1 file changed, 9 insertions(+), 21 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 5fc66a52c471..1043bbb30061 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -887,7 +887,7 @@ static int sh_eth_reset(struct net_device *ndev)
+@@ -887,7 +887,7 @@ static int sh_eth_reset(struct net_devic
  
  		ret = sh_eth_check_reset(ndev);
  		if (ret)
@@ -29,7 +27,7 @@ index 5fc66a52c471..1043bbb30061 100644
  
  		/* Table Init */
  		sh_eth_write(ndev, 0x0, TDLAR);
-@@ -914,7 +914,6 @@ static int sh_eth_reset(struct net_device *ndev)
+@@ -914,7 +914,6 @@ static int sh_eth_reset(struct net_devic
  			     EDMR);
  	}
  
@@ -37,7 +35,7 @@ index 5fc66a52c471..1043bbb30061 100644
  	return ret;
  }
  
-@@ -1278,7 +1277,7 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start)
+@@ -1279,7 +1278,7 @@ static int sh_eth_dev_init(struct net_de
  	/* Soft Reset */
  	ret = sh_eth_reset(ndev);
  	if (ret)
@@ -46,7 +44,7 @@ index 5fc66a52c471..1043bbb30061 100644
  
  	if (mdp->cd->rmiimode)
  		sh_eth_write(ndev, 0x1, RMIIMODE);
-@@ -1357,7 +1356,6 @@ static int sh_eth_dev_init(struct net_device *ndev, bool start)
+@@ -1358,7 +1357,6 @@ static int sh_eth_dev_init(struct net_de
  		netif_start_queue(ndev);
  	}
  
@@ -54,7 +52,7 @@ index 5fc66a52c471..1043bbb30061 100644
  	return ret;
  }
  
-@@ -2619,10 +2617,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp,
+@@ -2620,10 +2618,8 @@ static int sh_mdio_init(struct sh_eth_pr
  
  	/* create bit control struct for PHY */
  	bitbang = devm_kzalloc(dev, sizeof(struct bb_info), GFP_KERNEL);
@@ -67,7 +65,7 @@ index 5fc66a52c471..1043bbb30061 100644
  
  	/* bitbang init */
  	bitbang->addr = mdp->addr + mdp->reg_offset[PIR];
-@@ -2635,10 +2631,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp,
+@@ -2636,10 +2632,8 @@ static int sh_mdio_init(struct sh_eth_pr
  
  	/* MII controller setting */
  	mdp->mii_bus = alloc_mdio_bitbang(&bitbang->ctrl);
@@ -80,7 +78,7 @@ index 5fc66a52c471..1043bbb30061 100644
  
  	/* Hook up MII support for ethtool */
  	mdp->mii_bus->name = "sh_mii";
-@@ -2673,8 +2667,6 @@ static int sh_mdio_init(struct sh_eth_private *mdp,
+@@ -2674,8 +2668,6 @@ static int sh_mdio_init(struct sh_eth_pr
  
  out_free_bus:
  	free_mdio_bitbang(mdp->mii_bus);
@@ -89,7 +87,7 @@ index 5fc66a52c471..1043bbb30061 100644
  	return ret;
  }
  
-@@ -2787,15 +2779,12 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2788,15 +2780,12 @@ static int sh_eth_drv_probe(struct platf
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	if (unlikely(res == NULL)) {
  		dev_err(&pdev->dev, "invalid resource\n");
@@ -108,7 +106,7 @@ index 5fc66a52c471..1043bbb30061 100644
  
  	/* The sh Ether-specific entries in the device structure. */
  	ndev->base_addr = res->start;
-@@ -2936,7 +2925,6 @@ out_release:
+@@ -2937,7 +2926,6 @@ out_release:
  	if (ndev)
  		free_netdev(ndev);
  
@@ -116,6 +114,3 @@ index 5fc66a52c471..1043bbb30061 100644
  	return ret;
  }
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0112-sh_eth-ensure-pm_runtime-cannot-suspend-the-device-d.patch b/patches.renesas/0112-sh_eth-ensure-pm_runtime-cannot-suspend-the-device-d.patch
index 4dc96161073015..81d14ee650ca5a 100644
--- a/patches.renesas/0112-sh_eth-ensure-pm_runtime-cannot-suspend-the-device-d.patch
+++ b/patches.renesas/0112-sh_eth-ensure-pm_runtime-cannot-suspend-the-device-d.patch
@@ -29,14 +29,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit b5893a08812602de164fa5ac6494f84df8d09a4f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 8 ++++++--
+ drivers/net/ethernet/renesas/sh_eth.c |    8 ++++++--
  1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 1043bbb30061..08ed9a30c3a7 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2786,6 +2786,9 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2787,6 +2787,9 @@ static int sh_eth_drv_probe(struct platf
  	if (!ndev)
  		return -ENOMEM;
  
@@ -46,7 +44,7 @@ index 1043bbb30061..08ed9a30c3a7 100644
  	/* The sh Ether-specific entries in the device structure. */
  	ndev->base_addr = res->start;
  	devno = pdev->id;
-@@ -2813,8 +2816,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2814,8 +2817,6 @@ static int sh_eth_drv_probe(struct platf
  
  	spin_lock_init(&mdp->lock);
  	mdp->pdev = pdev;
@@ -55,7 +53,7 @@ index 1043bbb30061..08ed9a30c3a7 100644
  
  	if (pdev->dev.of_node)
  		pd = sh_eth_parse_dt(&pdev->dev);
-@@ -2912,6 +2913,7 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -2913,6 +2914,7 @@ static int sh_eth_drv_probe(struct platf
  	netdev_info(ndev, "Base address at 0x%x, %pM, IRQ %d.\n",
  		    (u32)ndev->base_addr, ndev->dev_addr, ndev->irq);
  
@@ -63,7 +61,7 @@ index 1043bbb30061..08ed9a30c3a7 100644
  	platform_set_drvdata(pdev, ndev);
  
  	return ret;
-@@ -2925,6 +2927,8 @@ out_release:
+@@ -2926,6 +2928,8 @@ out_release:
  	if (ndev)
  		free_netdev(ndev);
  
@@ -72,6 +70,3 @@ index 1043bbb30061..08ed9a30c3a7 100644
  	return ret;
  }
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0129-serial-sh-sci-Fix-cast-warning.patch b/patches.renesas/0129-serial-sh-sci-Fix-cast-warning.patch
index 9dc8cd5fecd4e0..b517ceb63b6e19 100644
--- a/patches.renesas/0129-serial-sh-sci-Fix-cast-warning.patch
+++ b/patches.renesas/0129-serial-sh-sci-Fix-cast-warning.patch
@@ -14,14 +14,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 3af4e960b8a12b3f07033f1c12504305e6d4df1a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 2 +-
+ drivers/tty/serial/sh-sci.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index be33d2b0613b..1668523d31fb 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -2018,7 +2018,7 @@ static int sci_remap_port(struct uart_port *port)
+@@ -1991,7 +1991,7 @@ static int sci_remap_port(struct uart_po
  		 * need to do any remapping, just cast the cookie
  		 * directly.
  		 */
@@ -30,6 +28,3 @@ index be33d2b0613b..1668523d31fb 100644
  	}
  
  	return 0;
--- 
-2.1.2
-
diff --git a/patches.renesas/0131-serial-sh-sci-Add-missing-call-to-uart_remove_one_po.patch b/patches.renesas/0131-serial-sh-sci-Add-missing-call-to-uart_remove_one_po.patch
deleted file mode 100644
index 3ba1a33f689d24..00000000000000
--- a/patches.renesas/0131-serial-sh-sci-Add-missing-call-to-uart_remove_one_po.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 2dc17f253c2627524da362ba6824f5098d76687d Mon Sep 17 00:00:00 2001
-From: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
-Date: Fri, 28 Feb 2014 14:21:33 +0100
-Subject: serial: sh-sci: Add missing call to uart_remove_one_port() in failure
- path
-
-If cpufreq_register_notifier() fails, we have to remove the port added by
-sci_probe_single(), which is not done by sci_cleanup_single().
-
-Else the serial port stays active from the point of view of the serial
-subsystem, and it may crash when userspace getty is started, or when the
-loadable driver module is unloaded.
-
-This was introduced by commit 6dae14216c85eea13db7b12c469475c5d30e5499
-("serial: sh-sci: Fix probe error paths").
-
-Signed-off-by: Geert Uytterhoeven <geert+renesas@linux-m68k.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-(cherry picked from commit bf13c9a894162a91c8bb7d9555933e9fc3ff7d0e)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/tty/serial/sh-sci.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 1668523d31fb..0cb52376f97d 100644
---- a/drivers/tty/serial/sh-sci.c
-+++ b/drivers/tty/serial/sh-sci.c
-@@ -2564,6 +2564,7 @@ static int sci_probe(struct platform_device *dev)
- 	ret = cpufreq_register_notifier(&sp->freq_transition,
- 					CPUFREQ_TRANSITION_NOTIFIER);
- 	if (unlikely(ret < 0)) {
-+		uart_remove_one_port(&sci_uart_driver, &sp->port);
- 		sci_cleanup_single(sp);
- 		return ret;
- 	}
--- 
-2.1.2
-
diff --git a/patches.renesas/0132-serial-sh-sci-Replace-printk-by-pr_.patch b/patches.renesas/0132-serial-sh-sci-Replace-printk-by-pr_.patch
index 7be75b360f4fe1..a67a0dd0f7eb53 100644
--- a/patches.renesas/0132-serial-sh-sci-Replace-printk-by-pr_.patch
+++ b/patches.renesas/0132-serial-sh-sci-Replace-printk-by-pr_.patch
@@ -12,14 +12,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 6c13d5d27c5ecd7a2ce7c104c7726b0d7aa7d7b5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 7 +++----
+ drivers/tty/serial/sh-sci.c |    7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 0cb52376f97d..60a8f7db2948 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -428,7 +428,7 @@ static int sci_probe_regmap(struct plat_sci_port *cfg)
+@@ -425,7 +425,7 @@ static int sci_probe_regmap(struct plat_
  		cfg->regtype = SCIx_HSCIF_REGTYPE;
  		break;
  	default:
@@ -28,7 +26,7 @@ index 0cb52376f97d..60a8f7db2948 100644
  		return -EINVAL;
  	}
  
-@@ -2389,8 +2389,7 @@ static inline int sci_probe_earlyprintk(struct platform_device *pdev)
+@@ -2362,8 +2362,7 @@ static inline int sci_probe_earlyprintk(
  
  #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */
  
@@ -38,7 +36,7 @@ index 0cb52376f97d..60a8f7db2948 100644
  
  static struct uart_driver sci_uart_driver = {
  	.owner		= THIS_MODULE,
-@@ -2616,7 +2615,7 @@ static int __init sci_init(void)
+@@ -2576,7 +2575,7 @@ static int __init sci_init(void)
  {
  	int ret;
  
@@ -47,6 +45,3 @@ index 0cb52376f97d..60a8f7db2948 100644
  
  	ret = uart_register_driver(&sci_uart_driver);
  	if (likely(ret == 0)) {
--- 
-2.1.2
-
diff --git a/patches.renesas/0133-serial-sh-sci-Remove-useless-casts.patch b/patches.renesas/0133-serial-sh-sci-Remove-useless-casts.patch
index 975e74ff85d031..5938084cfa4524 100644
--- a/patches.renesas/0133-serial-sh-sci-Remove-useless-casts.patch
+++ b/patches.renesas/0133-serial-sh-sci-Remove-useless-casts.patch
@@ -10,14 +10,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit ff43da00e0d407cd8e7faaf2ac150001d29827e4)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 8 ++++----
+ drivers/tty/serial/sh-sci.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 60a8f7db2948..c93154f690a6 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -2423,25 +2423,25 @@ struct sci_port_info {
+@@ -2393,25 +2393,25 @@ struct sci_port_info {
  static const struct of_device_id of_sci_match[] = {
  	{
  		.compatible = "renesas,scif",
@@ -47,6 +45,3 @@ index 60a8f7db2948..c93154f690a6 100644
  			.type = PORT_HSCIF,
  			.regtype = SCIx_HSCIF_REGTYPE,
  		},
--- 
-2.1.2
-
diff --git a/patches.renesas/0134-serial-sh-sci-Add-more-register-documentation.patch b/patches.renesas/0134-serial-sh-sci-Add-more-register-documentation.patch
index d9345bdd835119..ce2849e1b1ca0a 100644
--- a/patches.renesas/0134-serial-sh-sci-Add-more-register-documentation.patch
+++ b/patches.renesas/0134-serial-sh-sci-Add-more-register-documentation.patch
@@ -10,15 +10,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 26de4f1b2fb45e53a9e8f4f913b9cdf6c294070b)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 28 +++++++-------
- include/linux/serial_sci.h  | 93 ++++++++++++++++++++++++++++-----------------
+ drivers/tty/serial/sh-sci.c |   28 +++++++------
+ include/linux/serial_sci.h  |   93 +++++++++++++++++++++++++++-----------------
  2 files changed, 73 insertions(+), 48 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index c93154f690a6..22a508a638b9 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -911,7 +911,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
+@@ -908,7 +908,7 @@ static irqreturn_t sci_rx_interrupt(int
  		/* Disable future Rx interrupts */
  		if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
  			disable_irq_nosync(irq);
@@ -27,7 +25,7 @@ index c93154f690a6..22a508a638b9 100644
  		} else {
  			scr &= ~SCSCR_RIE;
  		}
-@@ -1200,7 +1200,9 @@ static void sci_set_mctrl(struct uart_port *port, unsigned int mctrl)
+@@ -1173,7 +1173,9 @@ static void sci_set_mctrl(struct uart_po
  		 */
  		reg = sci_getreg(port, SCFCR);
  		if (reg->size)
@@ -38,7 +36,7 @@ index c93154f690a6..22a508a638b9 100644
  	}
  }
  
-@@ -1496,9 +1498,9 @@ static void sci_start_tx(struct uart_port *port)
+@@ -1469,9 +1471,9 @@ static void sci_start_tx(struct uart_por
  	if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
  		u16 new, scr = serial_port_in(port, SCSCR);
  		if (s->chan_tx)
@@ -50,7 +48,7 @@ index c93154f690a6..22a508a638b9 100644
  		if (new != scr)
  			serial_port_out(port, SCSCR, new);
  	}
-@@ -1525,7 +1527,7 @@ static void sci_stop_tx(struct uart_port *port)
+@@ -1498,7 +1500,7 @@ static void sci_stop_tx(struct uart_port
  	ctrl = serial_port_in(port, SCSCR);
  
  	if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
@@ -59,7 +57,7 @@ index c93154f690a6..22a508a638b9 100644
  
  	ctrl &= ~SCSCR_TIE;
  
-@@ -1539,7 +1541,7 @@ static void sci_start_rx(struct uart_port *port)
+@@ -1512,7 +1514,7 @@ static void sci_start_rx(struct uart_por
  	ctrl = serial_port_in(port, SCSCR) | port_rx_irq_mask(port);
  
  	if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
@@ -68,7 +66,7 @@ index c93154f690a6..22a508a638b9 100644
  
  	serial_port_out(port, SCSCR, ctrl);
  }
-@@ -1551,7 +1553,7 @@ static void sci_stop_rx(struct uart_port *port)
+@@ -1524,7 +1526,7 @@ static void sci_stop_rx(struct uart_port
  	ctrl = serial_port_in(port, SCSCR);
  
  	if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
@@ -77,7 +75,7 @@ index c93154f690a6..22a508a638b9 100644
  
  	ctrl &= ~port_rx_irq_mask(port);
  
-@@ -1614,7 +1616,7 @@ static void rx_timer_fn(unsigned long arg)
+@@ -1587,7 +1589,7 @@ static void rx_timer_fn(unsigned long ar
  	u16 scr = serial_port_in(port, SCSCR);
  
  	if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
@@ -86,7 +84,7 @@ index c93154f690a6..22a508a638b9 100644
  		enable_irq(s->irqs[SCIx_RXI_IRQ]);
  	}
  	serial_port_out(port, SCSCR, scr | SCSCR_RIE);
-@@ -1871,13 +1873,13 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -1844,13 +1846,13 @@ static void sci_set_termios(struct uart_
  	smr_val = serial_port_in(port, SCSMR) & 3;
  
  	if ((termios->c_cflag & CSIZE) == CS7)
@@ -104,7 +102,7 @@ index c93154f690a6..22a508a638b9 100644
  
  	uart_update_timeout(port, termios->c_cflag, baud);
  
-@@ -1885,7 +1887,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -1858,7 +1860,7 @@ static void sci_set_termios(struct uart_
  		__func__, smr_val, cks, t, s->cfg->scscr);
  
  	if (t >= 0) {
@@ -113,8 +111,6 @@ index c93154f690a6..22a508a638b9 100644
  		serial_port_out(port, SCBRR, t);
  		reg = sci_getreg(port, HSSRR);
  		if (reg->size)
-diff --git a/include/linux/serial_sci.h b/include/linux/serial_sci.h
-index 22b3640c9424..6c5e3bb282b0 100644
 --- a/include/linux/serial_sci.h
 +++ b/include/linux/serial_sci.h
 @@ -10,45 +10,59 @@
@@ -232,6 +228,3 @@ index 22b3640c9424..6c5e3bb282b0 100644
  
  	SCIx_NR_REGS,
  };
--- 
-2.1.2
-
diff --git a/patches.renesas/0135-serial-sh-sci-Replace-hardcoded-3-by-UART_PM_STATE_O.patch b/patches.renesas/0135-serial-sh-sci-Replace-hardcoded-3-by-UART_PM_STATE_O.patch
index 77b118d93580d3..4f88da0a20c51c 100644
--- a/patches.renesas/0135-serial-sh-sci-Replace-hardcoded-3-by-UART_PM_STATE_O.patch
+++ b/patches.renesas/0135-serial-sh-sci-Replace-hardcoded-3-by-UART_PM_STATE_O.patch
@@ -10,14 +10,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit d3dfe5d9b4c8b3156b28f99f7a4a59ad8be09b15)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 2 +-
+ drivers/tty/serial/sh-sci.c |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 22a508a638b9..634ecae2efd4 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -1955,7 +1955,7 @@ static void sci_pm(struct uart_port *port, unsigned int state,
+@@ -1928,7 +1928,7 @@ static void sci_pm(struct uart_port *por
  	struct sci_port *sci_port = to_sci_port(port);
  
  	switch (state) {
@@ -26,6 +24,3 @@ index 22a508a638b9..634ecae2efd4 100644
  		sci_port_disable(sci_port);
  		break;
  	default:
--- 
-2.1.2
-
diff --git a/patches.renesas/0136-serial-sh-sci-Neaten-dev_-level-uses.patch b/patches.renesas/0136-serial-sh-sci-Neaten-dev_-level-uses.patch
index b7df895d34ef7d..3f7e72919108f2 100644
--- a/patches.renesas/0136-serial-sh-sci-Neaten-dev_-level-uses.patch
+++ b/patches.renesas/0136-serial-sh-sci-Neaten-dev_-level-uses.patch
@@ -13,14 +13,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 9b971cd206c019fc6aeeb7e04136a49f9312df4a)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 38 ++++++++++++++++++--------------------
+ drivers/tty/serial/sh-sci.c |   38 ++++++++++++++++++--------------------
  1 file changed, 18 insertions(+), 20 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 634ecae2efd4..7ee5a79222ff 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -788,7 +788,7 @@ static int sci_handle_errors(struct uart_port *port)
+@@ -785,7 +785,7 @@ static int sci_handle_errors(struct uart
  		if (tty_insert_flip_char(tport, 0, TTY_OVERRUN))
  			copied++;
  
@@ -29,7 +27,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  	}
  
  	if (status & SCxSR_FER(port)) {
-@@ -830,7 +830,7 @@ static int sci_handle_errors(struct uart_port *port)
+@@ -827,7 +827,7 @@ static int sci_handle_errors(struct uart
  		if (tty_insert_flip_char(tport, 0, TTY_PARITY))
  			copied++;
  
@@ -38,7 +36,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  	}
  
  	if (copied)
-@@ -1292,7 +1292,8 @@ static void sci_dma_rx_complete(void *arg)
+@@ -1265,7 +1265,8 @@ static void sci_dma_rx_complete(void *ar
  	unsigned long flags;
  	int count;
  
@@ -48,7 +46,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  
  	spin_lock_irqsave(&port->lock, flags);
  
-@@ -1368,8 +1369,8 @@ static void sci_submit_rx(struct sci_port *s)
+@@ -1341,8 +1342,8 @@ static void sci_submit_rx(struct sci_por
  			sci_rx_dma_release(s, true);
  			return;
  		}
@@ -59,7 +57,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  	}
  
  	s->active_rx = s->cookie_rx[0];
-@@ -1428,8 +1429,8 @@ static void work_fn_rx(struct work_struct *work)
+@@ -1401,8 +1402,8 @@ static void work_fn_rx(struct work_struc
  
  	s->active_rx = s->cookie_rx[!new];
  
@@ -70,7 +68,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  }
  
  static void work_fn_tx(struct work_struct *work)
-@@ -1482,8 +1483,8 @@ static void work_fn_tx(struct work_struct *work)
+@@ -1455,8 +1456,8 @@ static void work_fn_tx(struct work_struc
  		return;
  	}
  
@@ -81,7 +79,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  
  	dma_async_issue_pending(chan);
  }
-@@ -1602,8 +1603,8 @@ static bool filter(struct dma_chan *chan, void *slave)
+@@ -1575,8 +1576,8 @@ static bool filter(struct dma_chan *chan
  {
  	struct sh_dmae_slave *param = slave;
  
@@ -92,7 +90,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  
  	chan->private = &param->shdma_slave;
  	return true;
-@@ -1632,8 +1633,7 @@ static void sci_request_dma(struct uart_port *port)
+@@ -1605,8 +1606,7 @@ static void sci_request_dma(struct uart_
  	dma_cap_mask_t mask;
  	int nent;
  
@@ -102,7 +100,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  
  	if (s->cfg->dma_slave_tx <= 0 || s->cfg->dma_slave_rx <= 0)
  		return;
-@@ -1661,7 +1661,8 @@ static void sci_request_dma(struct uart_port *port)
+@@ -1634,7 +1634,8 @@ static void sci_request_dma(struct uart_
  		if (!nent)
  			sci_tx_dma_release(s, false);
  		else
@@ -112,7 +110,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  				sg_dma_len(&s->sg_tx), port->state->xmit.buf,
  				&sg_dma_address(&s->sg_tx));
  
-@@ -1935,8 +1936,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -1908,8 +1909,7 @@ static void sci_set_termios(struct uart_
  	if (s->chan_rx) {
  		s->rx_timeout = (port->timeout - HZ / 50) * s->buf_len_rx * 3 /
  			port->fifosize / 2;
@@ -122,7 +120,7 @@ index 634ecae2efd4..7ee5a79222ff 100644
  			s->rx_timeout * 1000 / HZ, port->timeout);
  		if (s->rx_timeout < msecs_to_jiffies(20))
  			s->rx_timeout = msecs_to_jiffies(20);
-@@ -2503,11 +2503,9 @@ static int sci_probe_single(struct platform_device *dev,
+@@ -2473,11 +2473,9 @@ static int sci_probe_single(struct platf
  
  	/* Sanity check */
  	if (unlikely(index >= SCI_NPORTS)) {
@@ -136,6 +134,3 @@ index 634ecae2efd4..7ee5a79222ff 100644
  		return -EINVAL;
  	}
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0137-cpufreq-remove-unused-notifier-CPUFREQ_-SUSPENDCHANG.patch b/patches.renesas/0137-cpufreq-remove-unused-notifier-CPUFREQ_-SUSPENDCHANG.patch
index 3990dcddda2edd..5b617e33bc1e9d 100644
--- a/patches.renesas/0137-cpufreq-remove-unused-notifier-CPUFREQ_-SUSPENDCHANG.patch
+++ b/patches.renesas/0137-cpufreq-remove-unused-notifier-CPUFREQ_-SUSPENDCHANG.patch
@@ -23,9 +23,8 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  arch/x86/kernel/tsc.c                 |    3 +--
  drivers/cpufreq/cpufreq.c             |    3 +--
  drivers/pcmcia/sa11xx_base.c          |    3 ---
- drivers/tty/serial/sh-sci.c           |    3 +--
  include/linux/cpufreq.h               |    2 --
- 11 files changed, 7 insertions(+), 25 deletions(-)
+ 10 files changed, 6 insertions(+), 23 deletions(-)
 
 --- a/Documentation/cpu-freq/core.txt
 +++ b/Documentation/cpu-freq/core.txt
@@ -132,18 +131,6 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	}
  
  	return 0;
---- a/drivers/tty/serial/sh-sci.c
-+++ b/drivers/tty/serial/sh-sci.c
-@@ -1041,8 +1041,7 @@ static int sci_notifier(struct notifier_
- 
- 	sci_port = container_of(self, struct sci_port, freq_transition);
- 
--	if ((phase == CPUFREQ_POSTCHANGE) ||
--	    (phase == CPUFREQ_RESUMECHANGE)) {
-+	if (phase == CPUFREQ_POSTCHANGE) {
- 		struct uart_port *port = &sci_port->port;
- 
- 		spin_lock_irqsave(&port->lock, flags);
 --- a/include/linux/cpufreq.h
 +++ b/include/linux/cpufreq.h
 @@ -306,8 +306,6 @@ cpufreq_verify_within_cpu_limits(struct
diff --git a/patches.renesas/0355-Kconfig-rename-HAS_IOPORT-to-HAS_IOPORT_MAP.patch b/patches.renesas/0355-Kconfig-rename-HAS_IOPORT-to-HAS_IOPORT_MAP.patch
index 4e68925db70e0c..01286e30408ec4 100644
--- a/patches.renesas/0355-Kconfig-rename-HAS_IOPORT-to-HAS_IOPORT_MAP.patch
+++ b/patches.renesas/0355-Kconfig-rename-HAS_IOPORT-to-HAS_IOPORT_MAP.patch
@@ -29,51 +29,49 @@ Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 (cherry picked from commit ce816fa88cca083c47ab9000b2138a83043a78be)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arc/Kconfig                    |  2 +-
- arch/arm/Kconfig                    | 12 ++++++------
- arch/arm/mach-picoxcell/Kconfig     |  2 +-
- arch/arm/mach-prima2/Kconfig        |  2 +-
- arch/arm/mach-s3c24xx/Kconfig       |  2 +-
- arch/arm/mach-shmobile/Kconfig      |  2 +-
- arch/arm/mach-vexpress/Kconfig      |  2 +-
- arch/arm/plat-samsung/Kconfig       |  4 ++--
- arch/arm64/Kconfig                  |  2 +-
- arch/cris/Kconfig                   |  2 +-
- arch/hexagon/Kconfig                |  2 +-
- arch/m32r/Kconfig                   |  2 +-
- arch/m68k/Kconfig                   |  2 +-
- arch/metag/Kconfig                  |  2 +-
- arch/mips/Kconfig                   |  4 ++--
- arch/openrisc/Kconfig               |  2 +-
- arch/s390/Kconfig                   |  2 +-
- arch/sh/Kconfig                     |  4 ++--
- arch/sh/boards/Kconfig              |  8 ++++----
- arch/sh/include/asm/io.h            |  4 ++--
- arch/sh/include/asm/io_trapped.h    |  2 +-
- arch/sh/include/asm/machvec.h       |  2 +-
- arch/sh/kernel/Makefile             |  2 +-
- arch/sh/kernel/io_trapped.c         |  4 ++--
- arch/tile/Kconfig                   |  2 +-
- arch/unicore32/Kconfig              |  2 +-
- arch/xtensa/Kconfig                 |  4 ++--
- arch/xtensa/configs/iss_defconfig   |  2 +-
- arch/xtensa/configs/s6105_defconfig |  2 +-
- drivers/char/tpm/Kconfig            |  2 +-
- drivers/i2c/busses/Kconfig          |  2 +-
- drivers/net/can/sja1000/Kconfig     |  2 +-
- drivers/net/ethernet/3com/Kconfig   |  2 +-
- include/asm-generic/io.h            |  4 ++--
- include/asm-generic/iomap.h         |  2 +-
- include/linux/io.h                  |  2 +-
- lib/Kconfig                         |  4 ++--
- lib/devres.c                        |  4 ++--
- lib/iomap.c                         |  4 ++--
- sound/isa/Kconfig                   |  2 +-
- sound/pci/Kconfig                   |  2 +-
+ arch/arc/Kconfig                    |    2 +-
+ arch/arm/Kconfig                    |   12 ++++++------
+ arch/arm/mach-picoxcell/Kconfig     |    2 +-
+ arch/arm/mach-prima2/Kconfig        |    2 +-
+ arch/arm/mach-s3c24xx/Kconfig       |    2 +-
+ arch/arm/mach-shmobile/Kconfig      |    2 +-
+ arch/arm/mach-vexpress/Kconfig      |    2 +-
+ arch/arm/plat-samsung/Kconfig       |    4 ++--
+ arch/arm64/Kconfig                  |    2 +-
+ arch/cris/Kconfig                   |    2 +-
+ arch/hexagon/Kconfig                |    2 +-
+ arch/m32r/Kconfig                   |    2 +-
+ arch/m68k/Kconfig                   |    2 +-
+ arch/metag/Kconfig                  |    2 +-
+ arch/mips/Kconfig                   |    4 ++--
+ arch/openrisc/Kconfig               |    2 +-
+ arch/s390/Kconfig                   |    2 +-
+ arch/sh/Kconfig                     |    4 ++--
+ arch/sh/boards/Kconfig              |    8 ++++----
+ arch/sh/include/asm/io.h            |    4 ++--
+ arch/sh/include/asm/io_trapped.h    |    2 +-
+ arch/sh/include/asm/machvec.h       |    2 +-
+ arch/sh/kernel/Makefile             |    2 +-
+ arch/sh/kernel/io_trapped.c         |    4 ++--
+ arch/tile/Kconfig                   |    2 +-
+ arch/unicore32/Kconfig              |    2 +-
+ arch/xtensa/Kconfig                 |    4 ++--
+ arch/xtensa/configs/iss_defconfig   |    2 +-
+ arch/xtensa/configs/s6105_defconfig |    2 +-
+ drivers/char/tpm/Kconfig            |    2 +-
+ drivers/i2c/busses/Kconfig          |    2 +-
+ drivers/net/can/sja1000/Kconfig     |    2 +-
+ drivers/net/ethernet/3com/Kconfig   |    2 +-
+ include/asm-generic/io.h            |    4 ++--
+ include/asm-generic/iomap.h         |    2 +-
+ include/linux/io.h                  |    2 +-
+ lib/Kconfig                         |    4 ++--
+ lib/devres.c                        |    4 ++--
+ lib/iomap.c                         |    4 ++--
+ sound/isa/Kconfig                   |    2 +-
+ sound/pci/Kconfig                   |    2 +-
  41 files changed, 59 insertions(+), 59 deletions(-)
 
-diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
-index 9be30c8cb0c2..0434a89e05f8 100644
 --- a/arch/arc/Kconfig
 +++ b/arch/arc/Kconfig
 @@ -57,7 +57,7 @@ config ARCH_FLATMEM_ENABLE
@@ -85,8 +83,6 @@ index 9be30c8cb0c2..0434a89e05f8 100644
  	def_bool y
  
  config GENERIC_CALIBRATE_DELAY
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index a5a497f43719..bb7270772b24 100644
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
 @@ -130,7 +130,7 @@ config HAVE_TCM
@@ -143,8 +139,6 @@ index a5a497f43719..bb7270772b24 100644
  	select PLAT_SAMSUNG
  	select PM_GENERIC_DOMAINS
  	select S3C_DEV_NAND
-diff --git a/arch/arm/mach-picoxcell/Kconfig b/arch/arm/mach-picoxcell/Kconfig
-index c88ff74d86fe..fd81b5cfcd57 100644
 --- a/arch/arm/mach-picoxcell/Kconfig
 +++ b/arch/arm/mach-picoxcell/Kconfig
 @@ -5,4 +5,4 @@ config ARCH_PICOXCELL
@@ -153,8 +147,6 @@ index c88ff74d86fe..fd81b5cfcd57 100644
  	select HAVE_TCM
 -	select NO_IOPORT
 +	select NO_IOPORT_MAP
-diff --git a/arch/arm/mach-prima2/Kconfig b/arch/arm/mach-prima2/Kconfig
-index 2c726b4f9356..82482cd1fc03 100644
 --- a/arch/arm/mach-prima2/Kconfig
 +++ b/arch/arm/mach-prima2/Kconfig
 @@ -2,7 +2,7 @@ config ARCH_SIRF
@@ -166,8 +158,6 @@ index 2c726b4f9356..82482cd1fc03 100644
  	select PINCTRL
  	select PINCTRL_SIRF
  	help
-diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
-index d876431d64c0..de2529d892d2 100644
 --- a/arch/arm/mach-s3c24xx/Kconfig
 +++ b/arch/arm/mach-s3c24xx/Kconfig
 @@ -12,7 +12,7 @@ if ARCH_S3C24XX
@@ -179,8 +169,6 @@ index d876431d64c0..de2529d892d2 100644
  	select S3C_DEV_NAND
  	select IRQ_DOMAIN
  	help
-diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
-index e265630dfff1..c655ec642d6c 100644
 --- a/arch/arm/mach-shmobile/Kconfig
 +++ b/arch/arm/mach-shmobile/Kconfig
 @@ -10,7 +10,7 @@ config ARCH_SHMOBILE_MULTI
@@ -192,8 +180,6 @@ index e265630dfff1..c655ec642d6c 100644
  	select PINCTRL
  	select ARCH_REQUIRE_GPIOLIB
  
-diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
-index 80b4be36f10a..657d52d0391f 100644
 --- a/arch/arm/mach-vexpress/Kconfig
 +++ b/arch/arm/mach-vexpress/Kconfig
 @@ -10,7 +10,7 @@ config ARCH_VEXPRESS
@@ -205,8 +191,6 @@ index 80b4be36f10a..657d52d0391f 100644
  	select PLAT_VERSATILE
  	select PLAT_VERSATILE_CLCD
  	select POWER_RESET
-diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
-index 58645a58d0d8..ac0366858e94 100644
 --- a/arch/arm/plat-samsung/Kconfig
 +++ b/arch/arm/plat-samsung/Kconfig
 @@ -9,7 +9,7 @@ config PLAT_SAMSUNG
@@ -227,8 +211,6 @@ index 58645a58d0d8..ac0366858e94 100644
  	select PLAT_SAMSUNG
  	select S3C_GPIO_TRACK
  	select S5P_GPIO_DRVSTR
-diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
-index 65b788410bd9..2190e6cfd15a 100644
 --- a/arch/arm64/Kconfig
 +++ b/arch/arm64/Kconfig
 @@ -62,7 +62,7 @@ config ARCH_PHYS_ADDR_T_64BIT
@@ -240,8 +222,6 @@ index 65b788410bd9..2190e6cfd15a 100644
  	def_bool y
  
  config STACKTRACE_SUPPORT
-diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
-index ed0fcdf7e990..4a60aa362990 100644
 --- a/arch/cris/Kconfig
 +++ b/arch/cris/Kconfig
 @@ -29,7 +29,7 @@ config GENERIC_CALIBRATE_DELAY
@@ -253,8 +233,6 @@ index ed0fcdf7e990..4a60aa362990 100644
  	def_bool y
  
  config FORCE_MAX_ZONEORDER
-diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
-index 09df2608f40a..9bb54b95eb89 100644
 --- a/arch/hexagon/Kconfig
 +++ b/arch/hexagon/Kconfig
 @@ -19,7 +19,7 @@ config HEXAGON
@@ -266,8 +244,6 @@ index 09df2608f40a..9bb54b95eb89 100644
  	select GENERIC_IOMAP
  	select GENERIC_SMP_IDLE_THREAD
  	select STACKTRACE_SUPPORT
-diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
-index ca4504424dae..9e44bbd8051e 100644
 --- a/arch/m32r/Kconfig
 +++ b/arch/m32r/Kconfig
 @@ -28,7 +28,7 @@ config ZONE_DMA
@@ -279,8 +255,6 @@ index ca4504424dae..9e44bbd8051e 100644
  	def_bool y
  
  config NO_DMA
-diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
-index b2e322939256..87b7c7581b1d 100644
 --- a/arch/m68k/Kconfig
 +++ b/arch/m68k/Kconfig
 @@ -52,7 +52,7 @@ config TIME_LOW_RES
@@ -292,8 +266,6 @@ index b2e322939256..87b7c7581b1d 100644
  	def_bool y
  
  config NO_DMA
-diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
-index e56abd2c1b4f..4e53a6de1a4e 100644
 --- a/arch/metag/Kconfig
 +++ b/arch/metag/Kconfig
 @@ -52,7 +52,7 @@ config GENERIC_HWEIGHT
@@ -305,8 +277,6 @@ index e56abd2c1b4f..4e53a6de1a4e 100644
  	def_bool y
  
  source "init/Kconfig"
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index cb1da372346c..d50da167d23a 100644
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
 @@ -173,7 +173,7 @@ config MACH_DECSTATION
@@ -327,11 +297,9 @@ index cb1da372346c..d50da167d23a 100644
  	def_bool n
  
  config GENERIC_ISA_DMA
-diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
-index 9488209a5253..e71d712afb79 100644
 --- a/arch/openrisc/Kconfig
 +++ b/arch/openrisc/Kconfig
-@@ -41,7 +41,7 @@ config RWSEM_XCHGADD_ALGORITHM
+@@ -39,7 +39,7 @@ config RWSEM_XCHGADD_ALGORITHM
  config GENERIC_HWEIGHT
  	def_bool y
  
@@ -340,8 +308,6 @@ index 9488209a5253..e71d712afb79 100644
  	def_bool y
  
  config TRACE_IRQFLAGS_SUPPORT
-diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
-index bb74b21f007a..2c16c6883903 100644
 --- a/arch/s390/Kconfig
 +++ b/arch/s390/Kconfig
 @@ -52,7 +52,7 @@ config KEXEC
@@ -353,8 +319,6 @@ index bb74b21f007a..2c16c6883903 100644
  	def_bool y
  
  config PCI_QUIRKS
-diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
-index 64455daa63a1..b2cdb203e843 100644
 --- a/arch/sh/Kconfig
 +++ b/arch/sh/Kconfig
 @@ -3,7 +3,7 @@ config SUPERH
@@ -375,8 +339,6 @@ index 64455daa63a1..b2cdb203e843 100644
  	def_bool !PCI
  	depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \
  		   !SH_HP6XX && !SH_SOLUTION_ENGINE
-diff --git a/arch/sh/boards/Kconfig b/arch/sh/boards/Kconfig
-index eb1cf84231a2..e331e5373b8e 100644
 --- a/arch/sh/boards/Kconfig
 +++ b/arch/sh/boards/Kconfig
 @@ -158,7 +158,7 @@ config SH_SDK7786
@@ -415,8 +377,6 @@ index eb1cf84231a2..e331e5373b8e 100644
  	select REGULATOR_FIXED_VOLTAGE if REGULATOR
  	depends on CPU_SUBTYPE_SH7780
  	help
-diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
-index 629db2ad7916..728c4c571f40 100644
 --- a/arch/sh/include/asm/io.h
 +++ b/arch/sh/include/asm/io.h
 @@ -122,7 +122,7 @@ __BUILD_MEMORY_STRING(__raw_, l, u32)
@@ -437,11 +397,9 @@ index 629db2ad7916..728c4c571f40 100644
  
  #include <asm/io_noioport.h>
  
-diff --git a/arch/sh/include/asm/io_trapped.h b/arch/sh/include/asm/io_trapped.h
-index f1251d4f0ba9..4ab94ef51071 100644
 --- a/arch/sh/include/asm/io_trapped.h
 +++ b/arch/sh/include/asm/io_trapped.h
-@@ -36,7 +36,7 @@ __ioremap_trapped(unsigned long offset, unsigned long size)
+@@ -36,7 +36,7 @@ __ioremap_trapped(unsigned long offset,
  #define __ioremap_trapped(offset, size) NULL
  #endif
  
@@ -450,8 +408,6 @@ index f1251d4f0ba9..4ab94ef51071 100644
  extern struct list_head trapped_io;
  
  static inline void __iomem *
-diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h
-index eb9c20d971dd..d3324e4f372e 100644
 --- a/arch/sh/include/asm/machvec.h
 +++ b/arch/sh/include/asm/machvec.h
 @@ -21,7 +21,7 @@ struct sh_machine_vector {
@@ -463,11 +419,9 @@ index eb9c20d971dd..d3324e4f372e 100644
  	void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
  	void (*mv_ioport_unmap)(void __iomem *);
  #endif
-diff --git a/arch/sh/kernel/Makefile b/arch/sh/kernel/Makefile
-index 261c8bfd75ce..2ccf36c824c6 100644
 --- a/arch/sh/kernel/Makefile
 +++ b/arch/sh/kernel/Makefile
-@@ -22,7 +22,7 @@ obj-y	:= debugtraps.o dma-nommu.o dumpstack.o 		\
+@@ -22,7 +22,7 @@ obj-y	:= debugtraps.o dma-nommu.o dumpst
  
  ifndef CONFIG_GENERIC_IOMAP
  obj-y				+= iomap.o
@@ -476,8 +430,6 @@ index 261c8bfd75ce..2ccf36c824c6 100644
  endif
  
  obj-$(CONFIG_SUPERH32)		+= sys_sh32.o
-diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c
-index c0a9761f2f8a..f8ce36286cea 100644
 --- a/arch/sh/kernel/io_trapped.c
 +++ b/arch/sh/kernel/io_trapped.c
 @@ -22,7 +22,7 @@
@@ -489,7 +441,7 @@ index c0a9761f2f8a..f8ce36286cea 100644
  LIST_HEAD(trapped_io);
  EXPORT_SYMBOL_GPL(trapped_io);
  #endif
-@@ -90,7 +90,7 @@ int register_trapped_io(struct trapped_io *tiop)
+@@ -90,7 +90,7 @@ int register_trapped_io(struct trapped_i
  	tiop->magic = IO_TRAPPED_MAGIC;
  	INIT_LIST_HEAD(&tiop->list);
  	spin_lock_irq(&trapped_lock);
@@ -498,8 +450,6 @@ index c0a9761f2f8a..f8ce36286cea 100644
  	if (flags & IORESOURCE_IO)
  		list_add(&tiop->list, &trapped_io);
  #endif
-diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
-index b3692ce78f90..0b0290eeb629 100644
 --- a/arch/tile/Kconfig
 +++ b/arch/tile/Kconfig
 @@ -405,7 +405,7 @@ config PCI_DOMAINS
@@ -511,8 +461,6 @@ index b3692ce78f90..0b0290eeb629 100644
  	def_bool !PCI
  
  config TILE_PCI_IO
-diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
-index 25c0dba508cc..aafad6fa1667 100644
 --- a/arch/unicore32/Kconfig
 +++ b/arch/unicore32/Kconfig
 @@ -27,7 +27,7 @@ config UNICORE32
@@ -524,8 +472,6 @@ index 25c0dba508cc..aafad6fa1667 100644
  	bool
  
  config STACKTRACE_SUPPORT
-diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
-index c87ae7c6e5f9..02d6d29a63c1 100644
 --- a/arch/xtensa/Kconfig
 +++ b/arch/xtensa/Kconfig
 @@ -41,7 +41,7 @@ config ARCH_HAS_ILOG2_U32
@@ -546,8 +492,6 @@ index c87ae7c6e5f9..02d6d29a63c1 100644
  
  config XTENSA_PLATFORM_XTFPGA
  	bool "XTFPGA"
-diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
-index 4f233204faf9..d57d917ff240 100644
 --- a/arch/xtensa/configs/iss_defconfig
 +++ b/arch/xtensa/configs/iss_defconfig
 @@ -11,7 +11,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -559,8 +503,6 @@ index 4f233204faf9..d57d917ff240 100644
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  CONFIG_CONSTRUCTORS=y
-diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
-index d929f77a0360..583c2b0974ca 100644
 --- a/arch/xtensa/configs/s6105_defconfig
 +++ b/arch/xtensa/configs/s6105_defconfig
 @@ -11,7 +11,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
@@ -572,8 +514,6 @@ index d929f77a0360..583c2b0974ca 100644
  CONFIG_HZ=100
  CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
  
-diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig
-index 1a65838888cd..c54cac3f8bc8 100644
 --- a/drivers/char/tpm/Kconfig
 +++ b/drivers/char/tpm/Kconfig
 @@ -74,7 +74,7 @@ config TCG_NSC
@@ -585,8 +525,6 @@ index 1a65838888cd..c54cac3f8bc8 100644
  	---help---
  	  If you have a TPM security chip from Atmel say Yes and it 
  	  will be accessible from within Linux.  To compile this driver 
-diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index c5eec0290b37..a612ec150da5 100644
 --- a/drivers/i2c/busses/Kconfig
 +++ b/drivers/i2c/busses/Kconfig
 @@ -937,7 +937,7 @@ config I2C_ACORN
@@ -598,8 +536,6 @@ index c5eec0290b37..a612ec150da5 100644
  	select I2C_ALGOPCF
  	help
  	  This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
-diff --git a/drivers/net/can/sja1000/Kconfig b/drivers/net/can/sja1000/Kconfig
-index ff2ba86cd4a4..833ee8c9168e 100644
 --- a/drivers/net/can/sja1000/Kconfig
 +++ b/drivers/net/can/sja1000/Kconfig
 @@ -46,7 +46,7 @@ config CAN_EMS_PCI
@@ -611,8 +547,6 @@ index ff2ba86cd4a4..833ee8c9168e 100644
  	---help---
  	  This driver is for the PCAN-PC Card PCMCIA adapter (1 or 2 channels)
  	  from PEAK-System (http://www.peak-system.com). To compile this
-diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig
-index 65b735d4a6ad..afaab4b2333f 100644
 --- a/drivers/net/ethernet/3com/Kconfig
 +++ b/drivers/net/ethernet/3com/Kconfig
 @@ -66,7 +66,7 @@ config PCMCIA_3C589
@@ -624,11 +558,9 @@ index 65b735d4a6ad..afaab4b2333f 100644
  	select MII
  	---help---
  	  This option enables driver support for a large number of 10Mbps and
-diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
-index d5afe96adba6..975e1cc75edb 100644
 --- a/include/asm-generic/io.h
 +++ b/include/asm-generic/io.h
-@@ -327,7 +327,7 @@ static inline void iounmap(void __iomem *addr)
+@@ -327,7 +327,7 @@ static inline void iounmap(void __iomem
  }
  #endif /* CONFIG_MMU */
  
@@ -637,7 +569,7 @@ index d5afe96adba6..975e1cc75edb 100644
  #ifndef CONFIG_GENERIC_IOMAP
  static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
  {
-@@ -341,7 +341,7 @@ static inline void ioport_unmap(void __iomem *p)
+@@ -341,7 +341,7 @@ static inline void ioport_unmap(void __i
  extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
  extern void ioport_unmap(void __iomem *p);
  #endif /* CONFIG_GENERIC_IOMAP */
@@ -646,11 +578,9 @@ index d5afe96adba6..975e1cc75edb 100644
  
  #ifndef xlate_dev_kmem_ptr
  #define xlate_dev_kmem_ptr(p)	p
-diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h
-index 6afd7d6a9899..1b41011643a5 100644
 --- a/include/asm-generic/iomap.h
 +++ b/include/asm-generic/iomap.h
-@@ -56,7 +56,7 @@ extern void iowrite8_rep(void __iomem *port, const void *buf, unsigned long coun
+@@ -56,7 +56,7 @@ extern void iowrite8_rep(void __iomem *p
  extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count);
  extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count);
  
@@ -659,11 +589,9 @@ index 6afd7d6a9899..1b41011643a5 100644
  /* Create a virtual mapping cookie for an IO port range */
  extern void __iomem *ioport_map(unsigned long port, unsigned int nr);
  extern void ioport_unmap(void __iomem *);
-diff --git a/include/linux/io.h b/include/linux/io.h
-index f4f42faec686..3e35c183dca4 100644
 --- a/include/linux/io.h
 +++ b/include/linux/io.h
-@@ -41,7 +41,7 @@ static inline int ioremap_page_range(unsigned long addr, unsigned long end,
+@@ -41,7 +41,7 @@ static inline int ioremap_page_range(uns
  /*
   * Managed iomap interface
   */
@@ -672,8 +600,6 @@ index f4f42faec686..3e35c183dca4 100644
  void __iomem * devm_ioport_map(struct device *dev, unsigned long port,
  			       unsigned int nr);
  void devm_ioport_unmap(struct device *dev, void __iomem *addr);
-diff --git a/lib/Kconfig b/lib/Kconfig
-index 991c98bc4a3f..5d4984c505f8 100644
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
 @@ -342,9 +342,9 @@ config HAS_IOMEM
@@ -688,11 +614,9 @@ index 991c98bc4a3f..5d4984c505f8 100644
  	default y
  
  config HAS_DMA
-diff --git a/lib/devres.c b/lib/devres.c
-index 823533138fa0..10231287fbcc 100644
 --- a/lib/devres.c
 +++ b/lib/devres.c
-@@ -168,7 +168,7 @@ void __iomem *devm_request_and_ioremap(struct device *device,
+@@ -168,7 +168,7 @@ void __iomem *devm_request_and_ioremap(s
  }
  EXPORT_SYMBOL(devm_request_and_ioremap);
  
@@ -701,7 +625,7 @@ index 823533138fa0..10231287fbcc 100644
  /*
   * Generic iomap devres
   */
-@@ -227,7 +227,7 @@ void devm_ioport_unmap(struct device *dev, void __iomem *addr)
+@@ -227,7 +227,7 @@ void devm_ioport_unmap(struct device *de
  			       devm_ioport_map_match, (void *)addr));
  }
  EXPORT_SYMBOL(devm_ioport_unmap);
@@ -710,8 +634,6 @@ index 823533138fa0..10231287fbcc 100644
  
  #ifdef CONFIG_PCI
  /*
-diff --git a/lib/iomap.c b/lib/iomap.c
-index 2c08f36862eb..fc3dcb4b238e 100644
 --- a/lib/iomap.c
 +++ b/lib/iomap.c
 @@ -224,7 +224,7 @@ EXPORT_SYMBOL(iowrite8_rep);
@@ -732,8 +654,6 @@ index 2c08f36862eb..fc3dcb4b238e 100644
  
  #ifdef CONFIG_PCI
  /* Hide the details if this is a MMIO or PIO address space and just do what
-diff --git a/sound/isa/Kconfig b/sound/isa/Kconfig
-index affa13480659..0216475fc759 100644
 --- a/sound/isa/Kconfig
 +++ b/sound/isa/Kconfig
 @@ -191,7 +191,7 @@ config SND_ES18XX
@@ -745,8 +665,6 @@ index affa13480659..0216475fc759 100644
  	select SND_WSS_LIB
  	select SND_OPL3_LIB
  	select SND_MPU401_UART
-diff --git a/sound/pci/Kconfig b/sound/pci/Kconfig
-index 8756c8e32922..81135d7a50cf 100644
 --- a/sound/pci/Kconfig
 +++ b/sound/pci/Kconfig
 @@ -689,7 +689,7 @@ config SND_LOLA
@@ -758,6 +676,3 @@ index 8756c8e32922..81135d7a50cf 100644
  	select SND_PCM
  	help
  	  Say Y here to include support for Digigram LX6464ES boards.
--- 
-2.1.2
-
diff --git a/patches.renesas/0389-i2c-remove-unnecessary-OOM-messages.patch b/patches.renesas/0389-i2c-remove-unnecessary-OOM-messages.patch
index 847d16ba285993..4856d01143141b 100644
--- a/patches.renesas/0389-i2c-remove-unnecessary-OOM-messages.patch
+++ b/patches.renesas/0389-i2c-remove-unnecessary-OOM-messages.patch
@@ -80,7 +80,7 @@ Conflicts:
  	if (ret) {
 --- a/drivers/i2c/busses/i2c-exynos5.c
 +++ b/drivers/i2c/busses/i2c-exynos5.c
-@@ -621,10 +621,8 @@ static int exynos5_i2c_probe(struct plat
+@@ -623,10 +623,8 @@ static int exynos5_i2c_probe(struct plat
  	int ret;
  
  	i2c = devm_kzalloc(&pdev->dev, sizeof(struct exynos5_i2c), GFP_KERNEL);
diff --git a/patches.renesas/0405-ata-use-CONFIG_PM_SLEEP-instead-of-CONFIG_PM-where-a.patch b/patches.renesas/0405-ata-use-CONFIG_PM_SLEEP-instead-of-CONFIG_PM-where-a.patch
index 7bd9ea30adbc06..5e01c5fa7b9158 100644
--- a/patches.renesas/0405-ata-use-CONFIG_PM_SLEEP-instead-of-CONFIG_PM-where-a.patch
+++ b/patches.renesas/0405-ata-use-CONFIG_PM_SLEEP-instead-of-CONFIG_PM-where-a.patch
@@ -1145,7 +1145,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	.suspend		= ata_pci_device_suspend,
  	.resume			= sil_pci_device_resume,
  #endif
-@@ -803,7 +803,7 @@ static int sil_init_one(struct pci_dev *
+@@ -806,7 +806,7 @@ static int sil_init_one(struct pci_dev *
  				 &sil_sht);
  }
  
diff --git a/patches.renesas/0454-serial-sh-sci-Add-device-tree-support-for-r8a7779.patch b/patches.renesas/0454-serial-sh-sci-Add-device-tree-support-for-r8a7779.patch
index 77df47ec108992..ac56bcca7ed804 100644
--- a/patches.renesas/0454-serial-sh-sci-Add-device-tree-support-for-r8a7779.patch
+++ b/patches.renesas/0454-serial-sh-sci-Add-device-tree-support-for-r8a7779.patch
@@ -12,12 +12,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit fcbee4d49f30eb0eaa83a62e6a3cab5a892ed93f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- .../devicetree/bindings/serial/renesas,sci-serial.txt          |  1 +
- drivers/tty/serial/sh-sci.c                                    | 10 +++++++++-
+ Documentation/devicetree/bindings/serial/renesas,sci-serial.txt |    1 +
+ drivers/tty/serial/sh-sci.c                                     |   10 +++++++++-
  2 files changed, 10 insertions(+), 1 deletion(-)
 
-diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
-index 53e6c175db6c..bba86de1a094 100644
 --- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
 +++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
 @@ -12,6 +12,7 @@ Required properties:
@@ -28,11 +26,9 @@ index 53e6c175db6c..bba86de1a094 100644
      - "renesas,scif" for generic SCIF compatible UART.
      - "renesas,scifa" for generic SCIFA compatible UART.
      - "renesas,scifb" for generic SCIFB compatible UART.
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 88236da0ddf7..3b5d2f679946 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -2419,6 +2419,7 @@ static int sci_remove(struct platform_device *dev)
+@@ -2390,6 +2390,7 @@ static int sci_remove(struct platform_de
  struct sci_port_info {
  	unsigned int type;
  	unsigned int regtype;
@@ -40,7 +36,7 @@ index 88236da0ddf7..3b5d2f679946 100644
  };
  
  static const struct of_device_id of_sci_match[] = {
-@@ -2429,6 +2430,13 @@ static const struct of_device_id of_sci_match[] = {
+@@ -2400,6 +2401,13 @@ static const struct of_device_id of_sci_
  			.regtype = SCIx_SH4_SCIF_REGTYPE,
  		},
  	}, {
@@ -54,7 +50,7 @@ index 88236da0ddf7..3b5d2f679946 100644
  		.compatible = "renesas,scifa",
  		.data = &(const struct sci_port_info) {
  			.type = PORT_SCIFA,
-@@ -2488,7 +2496,7 @@ sci_parse_dt(struct platform_device *pdev, unsigned int *dev_id)
+@@ -2459,7 +2467,7 @@ sci_parse_dt(struct platform_device *pde
  	p->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
  	p->type = info->type;
  	p->regtype = info->regtype;
@@ -63,6 +59,3 @@ index 88236da0ddf7..3b5d2f679946 100644
  
  	return p;
  }
--- 
-2.1.2
-
diff --git a/patches.renesas/0455-Revert-serial-sh-sci-Add-device-tree-support-for-r8a.patch b/patches.renesas/0455-Revert-serial-sh-sci-Add-device-tree-support-for-r8a.patch
index feb51158892560..39a44c927b5c0e 100644
--- a/patches.renesas/0455-Revert-serial-sh-sci-Add-device-tree-support-for-r8a.patch
+++ b/patches.renesas/0455-Revert-serial-sh-sci-Add-device-tree-support-for-r8a.patch
@@ -13,12 +13,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 2aafb3864b9fa5ce83250537d940f973ef37b8dc)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- .../devicetree/bindings/serial/renesas,sci-serial.txt          |  1 -
- drivers/tty/serial/sh-sci.c                                    | 10 +---------
+ Documentation/devicetree/bindings/serial/renesas,sci-serial.txt |    1 -
+ drivers/tty/serial/sh-sci.c                                     |   10 +---------
  2 files changed, 1 insertion(+), 10 deletions(-)
 
-diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
-index bba86de1a094..53e6c175db6c 100644
 --- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
 +++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
 @@ -12,7 +12,6 @@ Required properties:
@@ -29,11 +27,9 @@ index bba86de1a094..53e6c175db6c 100644
      - "renesas,scif" for generic SCIF compatible UART.
      - "renesas,scifa" for generic SCIFA compatible UART.
      - "renesas,scifb" for generic SCIFB compatible UART.
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 3b5d2f679946..88236da0ddf7 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -2419,7 +2419,6 @@ static int sci_remove(struct platform_device *dev)
+@@ -2390,7 +2390,6 @@ static int sci_remove(struct platform_de
  struct sci_port_info {
  	unsigned int type;
  	unsigned int regtype;
@@ -41,7 +37,7 @@ index 3b5d2f679946..88236da0ddf7 100644
  };
  
  static const struct of_device_id of_sci_match[] = {
-@@ -2430,13 +2429,6 @@ static const struct of_device_id of_sci_match[] = {
+@@ -2401,13 +2400,6 @@ static const struct of_device_id of_sci_
  			.regtype = SCIx_SH4_SCIF_REGTYPE,
  		},
  	}, {
@@ -55,7 +51,7 @@ index 3b5d2f679946..88236da0ddf7 100644
  		.compatible = "renesas,scifa",
  		.data = &(const struct sci_port_info) {
  			.type = PORT_SCIFA,
-@@ -2496,7 +2488,7 @@ sci_parse_dt(struct platform_device *pdev, unsigned int *dev_id)
+@@ -2467,7 +2459,7 @@ sci_parse_dt(struct platform_device *pde
  	p->flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF;
  	p->type = info->type;
  	p->regtype = info->regtype;
@@ -64,6 +60,3 @@ index 3b5d2f679946..88236da0ddf7 100644
  
  	return p;
  }
--- 
-2.1.2
-
diff --git a/patches.renesas/0457-mmc-clarify-DDR-timing-mode-between-SD-UHS-and-eMMC.patch b/patches.renesas/0457-mmc-clarify-DDR-timing-mode-between-SD-UHS-and-eMMC.patch
index a784918a68fc9f..d5ad6ffc0e3969 100644
--- a/patches.renesas/0457-mmc-clarify-DDR-timing-mode-between-SD-UHS-and-eMMC.patch
+++ b/patches.renesas/0457-mmc-clarify-DDR-timing-mode-between-SD-UHS-and-eMMC.patch
@@ -13,16 +13,14 @@ Signed-off-by: Chris Ball <chris@printf.net>
 (cherry picked from commit 79f7ae7c45a6ccf04e2908337461dee615f6afb0)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/mmc/core/debugfs.c | 3 +++
- drivers/mmc/core/mmc.c     | 2 +-
- include/linux/mmc/host.h   | 3 ++-
+ drivers/mmc/core/debugfs.c |    3 +++
+ drivers/mmc/core/mmc.c     |    2 +-
+ include/linux/mmc/host.h   |    3 ++-
  3 files changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
-index 54829c0ed000..509229b48b55 100644
 --- a/drivers/mmc/core/debugfs.c
 +++ b/drivers/mmc/core/debugfs.c
-@@ -135,6 +135,9 @@ static int mmc_ios_show(struct seq_file *s, void *data)
+@@ -135,6 +135,9 @@ static int mmc_ios_show(struct seq_file
  	case MMC_TIMING_UHS_DDR50:
  		str = "sd uhs DDR50";
  		break;
@@ -32,11 +30,9 @@ index 54829c0ed000..509229b48b55 100644
  	case MMC_TIMING_MMC_HS200:
  		str = "mmc high-speed SDR200";
  		break;
-diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
-index 98e9eb0f6643..6d91ff76f246 100644
 --- a/drivers/mmc/core/mmc.c
 +++ b/drivers/mmc/core/mmc.c
-@@ -1261,7 +1261,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
+@@ -1268,7 +1268,7 @@ static int mmc_init_card(struct mmc_host
  					goto err;
  			}
  			mmc_card_set_ddr_mode(card);
@@ -45,8 +41,6 @@ index 98e9eb0f6643..6d91ff76f246 100644
  			mmc_set_bus_width(card->host, bus_width);
  		}
  	}
-diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
-index 99f5709ac343..87b1f4f2fe79 100644
 --- a/include/linux/mmc/host.h
 +++ b/include/linux/mmc/host.h
 @@ -58,7 +58,8 @@ struct mmc_ios {
@@ -59,6 +53,3 @@ index 99f5709ac343..87b1f4f2fe79 100644
  
  #define MMC_SDR_MODE		0
  #define MMC_1_2V_DDR_MODE	1
--- 
-2.1.2
-
diff --git a/patches.renesas/0487-usb-renesas-gadget-fixup-complete-STATUS-stage-after.patch b/patches.renesas/0487-usb-renesas-gadget-fixup-complete-STATUS-stage-after.patch
index 87aa7f6357c89e..ca68c218bbddee 100644
--- a/patches.renesas/0487-usb-renesas-gadget-fixup-complete-STATUS-stage-after.patch
+++ b/patches.renesas/0487-usb-renesas-gadget-fixup-complete-STATUS-stage-after.patch
@@ -14,14 +14,12 @@ Signed-off-by: Felipe Balbi <balbi@ti.com>
 (cherry picked from commit 3fe15505296cb563362e2cf6d3aed73e123e0df0)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/renesas_usbhs/fifo.c | 8 ++++++++
+ drivers/usb/renesas_usbhs/fifo.c |    8 ++++++++
  1 file changed, 8 insertions(+)
 
-diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
-index d49f9c326035..4fd36530bfa3 100644
 --- a/drivers/usb/renesas_usbhs/fifo.c
 +++ b/drivers/usb/renesas_usbhs/fifo.c
-@@ -681,6 +681,14 @@ usbhs_fifo_read_end:
+@@ -682,6 +682,14 @@ usbhs_fifo_read_end:
  		usbhs_pipe_number(pipe),
  		pkt->length, pkt->actual, *is_done, pkt->zero);
  
@@ -36,6 +34,3 @@ index d49f9c326035..4fd36530bfa3 100644
  usbhs_fifo_read_busy:
  	usbhsf_fifo_unselect(pipe, fifo);
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0488-sh_eth-replace-devm_kzalloc-with-devm_kmalloc_array.patch b/patches.renesas/0488-sh_eth-replace-devm_kzalloc-with-devm_kmalloc_array.patch
index 329979850857e5..a65e9ec92a5cdf 100644
--- a/patches.renesas/0488-sh_eth-replace-devm_kzalloc-with-devm_kmalloc_array.patch
+++ b/patches.renesas/0488-sh_eth-replace-devm_kzalloc-with-devm_kmalloc_array.patch
@@ -14,14 +14,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 86b5d251d5ac4dda51a022b34cb29b4ce65a8cd5)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 4 ++--
+ drivers/net/ethernet/renesas/sh_eth.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 08ed9a30c3a7..2a29caa30479 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2641,8 +2641,8 @@ static int sh_mdio_init(struct sh_eth_private *mdp,
+@@ -2642,8 +2642,8 @@ static int sh_mdio_init(struct sh_eth_pr
  		 pdev->name, pdev->id);
  
  	/* PHY IRQ */
@@ -32,6 +30,3 @@ index 08ed9a30c3a7..2a29caa30479 100644
  	if (!mdp->mii_bus->irq) {
  		ret = -ENOMEM;
  		goto out_free_bus;
--- 
-2.1.2
-
diff --git a/patches.renesas/0489-net-sh_eth-Fix-receive-packet-exceeded-condition-in-.patch b/patches.renesas/0489-net-sh_eth-Fix-receive-packet-exceeded-condition-in-.patch
index 274e3eb12488e2..c6aba21c4c50ca 100644
--- a/patches.renesas/0489-net-sh_eth-Fix-receive-packet-exceeded-condition-in-.patch
+++ b/patches.renesas/0489-net-sh_eth-Fix-receive-packet-exceeded-condition-in-.patch
@@ -14,14 +14,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 4f809cea611f1f00a0b7a42751cb12d997a4c11c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 8 +++-----
+ drivers/net/ethernet/renesas/sh_eth.c |    8 +++-----
  1 file changed, 3 insertions(+), 5 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 2a29caa30479..1b34ac0a2420 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1399,7 +1399,6 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
+@@ -1400,7 +1400,6 @@ static int sh_eth_rx(struct net_device *
  	int entry = mdp->cur_rx % mdp->num_rx_ring;
  	int boguscnt = (mdp->dirty_rx + mdp->num_rx_ring) - mdp->cur_rx;
  	struct sk_buff *skb;
@@ -29,7 +27,7 @@ index 2a29caa30479..1b34ac0a2420 100644
  	u16 pkt_len = 0;
  	u32 desc_status;
  
-@@ -1411,10 +1410,9 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
+@@ -1412,10 +1411,9 @@ static int sh_eth_rx(struct net_device *
  		if (--boguscnt < 0)
  			break;
  
@@ -42,7 +40,7 @@ index 2a29caa30479..1b34ac0a2420 100644
  		(*quota)--;
  
  		if (!(desc_status & RDFEND))
-@@ -1508,7 +1506,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
+@@ -1509,7 +1507,7 @@ static int sh_eth_rx(struct net_device *
  		sh_eth_write(ndev, EDRRR_R, EDRRR);
  	}
  
@@ -51,6 +49,3 @@ index 2a29caa30479..1b34ac0a2420 100644
  }
  
  static void sh_eth_rcv_snd_disable(struct net_device *ndev)
--- 
-2.1.2
-
diff --git a/patches.renesas/0490-net-sh_eth-Fix-timing-of-RACT-setting-in-sh_eth_rx.patch b/patches.renesas/0490-net-sh_eth-Fix-timing-of-RACT-setting-in-sh_eth_rx.patch
index 5dda11951fd0cf..11558e425064af 100644
--- a/patches.renesas/0490-net-sh_eth-Fix-timing-of-RACT-setting-in-sh_eth_rx.patch
+++ b/patches.renesas/0490-net-sh_eth-Fix-timing-of-RACT-setting-in-sh_eth_rx.patch
@@ -19,14 +19,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 1b72a0fc9c308d9f3255c177945cf383c3c82b0e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 1 -
+ drivers/net/ethernet/renesas/sh_eth.c |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 1b34ac0a2420..10af820e1d45 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1460,7 +1460,6 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
+@@ -1461,7 +1461,6 @@ static int sh_eth_rx(struct net_device *
  			ndev->stats.rx_packets++;
  			ndev->stats.rx_bytes += pkt_len;
  		}
@@ -34,6 +32,3 @@ index 1b34ac0a2420..10af820e1d45 100644
  		entry = (++mdp->cur_rx) % mdp->num_rx_ring;
  		rxdesc = &mdp->rx_ring[entry];
  	}
--- 
-2.1.2
-
diff --git a/patches.renesas/0708-v4l-Support-extending-the-v4l2_pix_format-structure.patch b/patches.renesas/0708-v4l-Support-extending-the-v4l2_pix_format-structure.patch
index e1110b92f2a484..6451f2149482c6 100644
--- a/patches.renesas/0708-v4l-Support-extending-the-v4l2_pix_format-structure.patch
+++ b/patches.renesas/0708-v4l-Support-extending-the-v4l2_pix_format-structure.patch
@@ -34,36 +34,34 @@ Conflicts:
 	drivers/media/platform/mem2mem_testdev.c
 	include/uapi/linux/videodev2.h
 ---
- Documentation/DocBook/media/Makefile          |  2 +-
- Documentation/DocBook/media/v4l/pixfmt.xml    | 25 +++++++++--
- drivers/media/parport/bw-qcam.c               |  2 -
- drivers/media/pci/cx18/cx18-ioctl.c           |  1 -
- drivers/media/pci/cx25821/cx25821-video.c     |  3 --
- drivers/media/pci/ivtv/ivtv-ioctl.c           |  3 --
- drivers/media/pci/meye/meye.c                 |  2 -
- drivers/media/pci/saa7134/saa7134-empress.c   |  3 --
- drivers/media/pci/saa7134/saa7134-video.c     |  2 -
- drivers/media/pci/sta2x11/sta2x11_vip.c       |  1 -
- drivers/media/platform/coda.c                 |  2 -
- drivers/media/platform/omap/omap_vout.c       |  2 -
- drivers/media/platform/sh_veu.c               |  2 -
- drivers/media/platform/vino.c                 |  5 ---
- drivers/media/platform/vivi.c                 |  1 -
- drivers/media/usb/cx231xx/cx231xx-417.c       |  2 -
- drivers/media/usb/cx231xx/cx231xx-video.c     |  2 -
- drivers/media/usb/gspca/gspca.c               |  8 ++--
- drivers/media/usb/hdpvr/hdpvr-video.c         |  1 -
- drivers/media/usb/stkwebcam/stk-webcam.c      |  2 -
- drivers/media/usb/tlg2300/pd-video.c          |  1 -
- drivers/media/usb/tm6000/tm6000-video.c       |  2 -
- drivers/media/usb/zr364xx/zr364xx.c           |  3 --
- drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 19 ++++++---
- drivers/media/v4l2-core/v4l2-ioctl.c          | 61 +++++++++++++++++++++++++--
- include/uapi/linux/videodev2.h                | 15 ++++++-
+ Documentation/DocBook/media/Makefile          |    2 
+ Documentation/DocBook/media/v4l/pixfmt.xml    |   25 +++++++++-
+ drivers/media/parport/bw-qcam.c               |    2 
+ drivers/media/pci/cx18/cx18-ioctl.c           |    1 
+ drivers/media/pci/cx25821/cx25821-video.c     |    3 -
+ drivers/media/pci/ivtv/ivtv-ioctl.c           |    3 -
+ drivers/media/pci/meye/meye.c                 |    2 
+ drivers/media/pci/saa7134/saa7134-empress.c   |    3 -
+ drivers/media/pci/saa7134/saa7134-video.c     |    2 
+ drivers/media/pci/sta2x11/sta2x11_vip.c       |    1 
+ drivers/media/platform/coda.c                 |    2 
+ drivers/media/platform/omap/omap_vout.c       |    2 
+ drivers/media/platform/sh_veu.c               |    2 
+ drivers/media/platform/vino.c                 |    5 --
+ drivers/media/platform/vivi.c                 |    1 
+ drivers/media/usb/cx231xx/cx231xx-417.c       |    2 
+ drivers/media/usb/cx231xx/cx231xx-video.c     |    2 
+ drivers/media/usb/gspca/gspca.c               |    8 +--
+ drivers/media/usb/hdpvr/hdpvr-video.c         |    1 
+ drivers/media/usb/stkwebcam/stk-webcam.c      |    2 
+ drivers/media/usb/tlg2300/pd-video.c          |    1 
+ drivers/media/usb/tm6000/tm6000-video.c       |    2 
+ drivers/media/usb/zr364xx/zr364xx.c           |    3 -
+ drivers/media/v4l2-core/v4l2-compat-ioctl32.c |   19 +++++---
+ drivers/media/v4l2-core/v4l2-ioctl.c          |   61 ++++++++++++++++++++++++--
+ include/uapi/linux/videodev2.h                |   15 +++++-
  26 files changed, 112 insertions(+), 60 deletions(-)
 
-diff --git a/Documentation/DocBook/media/Makefile b/Documentation/DocBook/media/Makefile
-index 1d27f0a1abd1..494da944b39d 100644
 --- a/Documentation/DocBook/media/Makefile
 +++ b/Documentation/DocBook/media/Makefile
 @@ -174,7 +174,7 @@ FILENAME = \
@@ -75,11 +73,9 @@ index 1d27f0a1abd1..494da944b39d 100644
  	-e ":a;s/\(linkend=\".*\)_\(.*\">\)/\1-\2/;ta" \
  	-e "s/v4l2\-mpeg\-vbi\-ITV0/v4l2-mpeg-vbi-itv0-1/g"
  
-diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml
-index 72d72bd67d0a..6e1e520a2750 100644
 --- a/Documentation/DocBook/media/v4l/pixfmt.xml
 +++ b/Documentation/DocBook/media/v4l/pixfmt.xml
-@@ -103,9 +103,28 @@ see <xref linkend="colorspaces" />.</entry>
+@@ -103,9 +103,28 @@ see <xref linkend="colorspaces" />.</ent
  	<row>
  	  <entry>__u32</entry>
  	  <entry><structfield>priv</structfield></entry>
@@ -111,11 +107,9 @@ index 72d72bd67d0a..6e1e520a2750 100644
  	</row>
        </tbody>
      </tgroup>
-diff --git a/drivers/media/parport/bw-qcam.c b/drivers/media/parport/bw-qcam.c
-index d12bd33f39cb..b711b5b5b01a 100644
 --- a/drivers/media/parport/bw-qcam.c
 +++ b/drivers/media/parport/bw-qcam.c
-@@ -757,7 +757,6 @@ static int qcam_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
+@@ -757,7 +757,6 @@ static int qcam_g_fmt_vid_cap(struct fil
  	pix->sizeimage = pix->width * pix->height;
  	/* Just a guess */
  	pix->colorspace = V4L2_COLORSPACE_SRGB;
@@ -123,7 +117,7 @@ index d12bd33f39cb..b711b5b5b01a 100644
  	return 0;
  }
  
-@@ -783,7 +782,6 @@ static int qcam_try_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format
+@@ -783,7 +782,6 @@ static int qcam_try_fmt_vid_cap(struct f
  	pix->sizeimage = pix->width * pix->height;
  	/* Just a guess */
  	pix->colorspace = V4L2_COLORSPACE_SRGB;
@@ -131,11 +125,9 @@ index d12bd33f39cb..b711b5b5b01a 100644
  	return 0;
  }
  
-diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
-index 1110bcb14e2f..c4c3ff30d0a3 100644
 --- a/drivers/media/pci/cx18/cx18-ioctl.c
 +++ b/drivers/media/pci/cx18/cx18-ioctl.c
-@@ -156,7 +156,6 @@ static int cx18_g_fmt_vid_cap(struct file *file, void *fh,
+@@ -156,7 +156,6 @@ static int cx18_g_fmt_vid_cap(struct fil
  	pixfmt->height = cx->cxhdl.height;
  	pixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
  	pixfmt->field = V4L2_FIELD_INTERLACED;
@@ -143,11 +135,9 @@ index 1110bcb14e2f..c4c3ff30d0a3 100644
  	if (id->type == CX18_ENC_STREAM_TYPE_YUV) {
  		pixfmt->pixelformat = s->pixelformat;
  		pixfmt->sizeimage = s->vb_bytes_per_frame;
-diff --git a/drivers/media/pci/cx25821/cx25821-video.c b/drivers/media/pci/cx25821/cx25821-video.c
-index d270819fd875..c7ae087b668b 100644
 --- a/drivers/media/pci/cx25821/cx25821-video.c
 +++ b/drivers/media/pci/cx25821/cx25821-video.c
-@@ -576,7 +576,6 @@ static int cx25821_vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -576,7 +576,6 @@ static int cx25821_vidioc_g_fmt_vid_cap(
  	f->fmt.pix.bytesperline = (chan->width * chan->fmt->depth) >> 3;
  	f->fmt.pix.sizeimage = chan->height * f->fmt.pix.bytesperline;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -155,7 +145,7 @@ index d270819fd875..c7ae087b668b 100644
  
  	return 0;
  }
-@@ -615,7 +614,6 @@ static int cx25821_vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -615,7 +614,6 @@ static int cx25821_vidioc_try_fmt_vid_ca
  	f->fmt.pix.bytesperline = (f->fmt.pix.width * fmt->depth) >> 3;
  	f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -163,7 +153,7 @@ index d270819fd875..c7ae087b668b 100644
  
  	return 0;
  }
-@@ -867,7 +865,6 @@ static int cx25821_vidioc_try_fmt_vid_out(struct file *file, void *priv,
+@@ -867,7 +865,6 @@ static int cx25821_vidioc_try_fmt_vid_ou
  	f->fmt.pix.bytesperline = (f->fmt.pix.width * fmt->depth) >> 3;
  	f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -171,11 +161,9 @@ index d270819fd875..c7ae087b668b 100644
  	return 0;
  }
  
-diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
-index 807b275a847e..d4d0f0ecab98 100644
 --- a/drivers/media/pci/ivtv/ivtv-ioctl.c
 +++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
-@@ -351,7 +351,6 @@ static int ivtv_g_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
+@@ -351,7 +351,6 @@ static int ivtv_g_fmt_vid_cap(struct fil
  	pixfmt->height = itv->cxhdl.height;
  	pixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
  	pixfmt->field = V4L2_FIELD_INTERLACED;
@@ -183,7 +171,7 @@ index 807b275a847e..d4d0f0ecab98 100644
  	if (id->type == IVTV_ENC_STREAM_TYPE_YUV) {
  		pixfmt->pixelformat = V4L2_PIX_FMT_HM12;
  		/* YUV size is (Y=(h*720) + UV=(h*(720/2))) */
-@@ -418,7 +417,6 @@ static int ivtv_g_fmt_vid_out(struct file *file, void *fh, struct v4l2_format *f
+@@ -418,7 +417,6 @@ static int ivtv_g_fmt_vid_out(struct fil
  	pixfmt->height = itv->main_rect.height;
  	pixfmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
  	pixfmt->field = V4L2_FIELD_INTERLACED;
@@ -191,7 +179,7 @@ index 807b275a847e..d4d0f0ecab98 100644
  	if (id->type == IVTV_DEC_STREAM_TYPE_YUV) {
  		switch (itv->yuv_info.lace_mode & IVTV_YUV_MODE_MASK) {
  		case IVTV_YUV_MODE_INTERLACED:
-@@ -1384,7 +1382,6 @@ static int ivtv_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *fb)
+@@ -1384,7 +1382,6 @@ static int ivtv_g_fbuf(struct file *file
  	fb->fmt.bytesperline = fb->fmt.width;
  	fb->fmt.colorspace = V4L2_COLORSPACE_SMPTE170M;
  	fb->fmt.field = V4L2_FIELD_INTERLACED;
@@ -199,11 +187,9 @@ index 807b275a847e..d4d0f0ecab98 100644
  	if (fb->fmt.pixelformat != V4L2_PIX_FMT_PAL8)
  		fb->fmt.bytesperline *= 2;
  	if (fb->fmt.pixelformat == V4L2_PIX_FMT_RGB32 ||
-diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
-index 54d5c821007c..4e7fba034a31 100644
 --- a/drivers/media/pci/meye/meye.c
 +++ b/drivers/media/pci/meye/meye.c
-@@ -1166,7 +1166,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *fh,
+@@ -1166,7 +1166,6 @@ static int vidioc_try_fmt_vid_cap(struct
  	f->fmt.pix.sizeimage = f->fmt.pix.height *
  			       f->fmt.pix.bytesperline;
  	f->fmt.pix.colorspace = 0;
@@ -211,7 +197,7 @@ index 54d5c821007c..4e7fba034a31 100644
  
  	return 0;
  }
-@@ -1232,7 +1231,6 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *fh,
+@@ -1232,7 +1231,6 @@ static int vidioc_s_fmt_vid_cap(struct f
  	f->fmt.pix.sizeimage = f->fmt.pix.height *
  			       f->fmt.pix.bytesperline;
  	f->fmt.pix.colorspace = 0;
@@ -219,11 +205,9 @@ index 54d5c821007c..4e7fba034a31 100644
  
  	return 0;
  }
-diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
-index 0a9047e754b9..71bf87204c5b 100644
 --- a/drivers/media/pci/saa7134/saa7134-empress.c
 +++ b/drivers/media/pci/saa7134/saa7134-empress.c
-@@ -189,7 +189,6 @@ static int empress_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -189,7 +189,6 @@ static int empress_g_fmt_vid_cap(struct
  	f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
  	f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
  	f->fmt.pix.bytesperline = 0;
@@ -231,7 +215,7 @@ index 0a9047e754b9..71bf87204c5b 100644
  
  	return 0;
  }
-@@ -207,7 +206,6 @@ static int empress_s_fmt_vid_cap(struct file *file, void *priv,
+@@ -207,7 +206,6 @@ static int empress_s_fmt_vid_cap(struct
  	f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
  	f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
  	f->fmt.pix.bytesperline = 0;
@@ -239,7 +223,7 @@ index 0a9047e754b9..71bf87204c5b 100644
  
  	return 0;
  }
-@@ -225,7 +223,6 @@ static int empress_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -225,7 +223,6 @@ static int empress_try_fmt_vid_cap(struc
  	f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
  	f->fmt.pix.sizeimage    = TS_PACKET_SIZE * dev->ts.nr_packets;
  	f->fmt.pix.bytesperline = 0;
@@ -247,31 +231,27 @@ index 0a9047e754b9..71bf87204c5b 100644
  
  	return 0;
  }
-diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
-index 40396e8b16a8..c8c22156991b 100644
 --- a/drivers/media/pci/saa7134/saa7134-video.c
 +++ b/drivers/media/pci/saa7134/saa7134-video.c
-@@ -1347,7 +1347,6 @@ static int saa7134_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -1350,7 +1350,6 @@ static int saa7134_g_fmt_vid_cap(struct
  	f->fmt.pix.sizeimage =
- 		f->fmt.pix.height * f->fmt.pix.bytesperline;
+ 		(f->fmt.pix.height * f->fmt.pix.width * dev->fmt->depth) / 8;
  	f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
 -	f->fmt.pix.priv = 0;
  	return 0;
  }
  
-@@ -1429,7 +1428,6 @@ static int saa7134_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -1435,7 +1434,6 @@ static int saa7134_try_fmt_vid_cap(struc
  	f->fmt.pix.sizeimage =
- 		f->fmt.pix.height * f->fmt.pix.bytesperline;
+ 		(f->fmt.pix.height * f->fmt.pix.width * fmt->depth) / 8;
  	f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
 -	f->fmt.pix.priv = 0;
  
  	return 0;
  }
-diff --git a/drivers/media/pci/sta2x11/sta2x11_vip.c b/drivers/media/pci/sta2x11/sta2x11_vip.c
-index e5cfb6cfa18d..7219c598ef50 100644
 --- a/drivers/media/pci/sta2x11/sta2x11_vip.c
 +++ b/drivers/media/pci/sta2x11/sta2x11_vip.c
-@@ -642,7 +642,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -642,7 +642,6 @@ static int vidioc_try_fmt_vid_cap(struct
  	f->fmt.pix.bytesperline = f->fmt.pix.width * 2;
  	f->fmt.pix.sizeimage = f->fmt.pix.width * 2 * f->fmt.pix.height;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -279,11 +259,9 @@ index e5cfb6cfa18d..7219c598ef50 100644
  	return 0;
  }
  
-diff --git a/drivers/media/platform/coda.c b/drivers/media/platform/coda.c
-index 61f3dbcc259f..21c31bc5c380 100644
 --- a/drivers/media/platform/coda.c
 +++ b/drivers/media/platform/coda.c
-@@ -613,8 +613,6 @@ static int coda_try_fmt(struct coda_ctx *ctx, struct coda_codec *codec,
+@@ -613,8 +613,6 @@ static int coda_try_fmt(struct coda_ctx
  		BUG();
  	}
  
@@ -292,11 +270,9 @@ index 61f3dbcc259f..21c31bc5c380 100644
  	return 0;
  }
  
-diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
-index dfd0a21a0658..17b44401948e 100644
 --- a/drivers/media/platform/omap/omap_vout.c
 +++ b/drivers/media/platform/omap/omap_vout.c
-@@ -165,7 +165,6 @@ static int omap_vout_try_format(struct v4l2_pix_format *pix)
+@@ -165,7 +165,6 @@ static int omap_vout_try_format(struct v
  
  	pix->pixelformat = omap_formats[ifmt].pixelformat;
  	pix->field = V4L2_FIELD_ANY;
@@ -304,7 +280,7 @@ index dfd0a21a0658..17b44401948e 100644
  
  	switch (pix->pixelformat) {
  	case V4L2_PIX_FMT_YUYV:
-@@ -1895,7 +1894,6 @@ static int __init omap_vout_setup_video_data(struct omap_vout_device *vout)
+@@ -1895,7 +1894,6 @@ static int __init omap_vout_setup_video_
  	pix->field = V4L2_FIELD_ANY;
  	pix->bytesperline = pix->width * 2;
  	pix->sizeimage = pix->bytesperline * pix->height;
@@ -312,11 +288,9 @@ index dfd0a21a0658..17b44401948e 100644
  	pix->colorspace = V4L2_COLORSPACE_JPEG;
  
  	vout->bpp = RGB565_BPP;
-diff --git a/drivers/media/platform/sh_veu.c b/drivers/media/platform/sh_veu.c
-index 744e43b480bc..8dc279d4d561 100644
 --- a/drivers/media/platform/sh_veu.c
 +++ b/drivers/media/platform/sh_veu.c
-@@ -425,7 +425,6 @@ static int sh_veu_g_fmt(struct sh_veu_file *veu_file, struct v4l2_format *f)
+@@ -425,7 +425,6 @@ static int sh_veu_g_fmt(struct sh_veu_fi
  	pix->bytesperline	= vfmt->bytesperline;
  	pix->sizeimage		= vfmt->bytesperline * pix->height *
  		vfmt->fmt->depth / vfmt->fmt->ydepth;
@@ -324,7 +298,7 @@ index 744e43b480bc..8dc279d4d561 100644
  	dev_dbg(veu->dev, "%s(): type: %d, size %u @ %ux%u, fmt %x\n", __func__,
  		f->type, pix->sizeimage, pix->width, pix->height, pix->pixelformat);
  
-@@ -473,7 +472,6 @@ static int sh_veu_try_fmt(struct v4l2_format *f, const struct sh_veu_format *fmt
+@@ -473,7 +472,6 @@ static int sh_veu_try_fmt(struct v4l2_fo
  
  	pix->pixelformat	= fmt->fourcc;
  	pix->colorspace		= sh_veu_4cc2cspace(pix->pixelformat);
@@ -332,11 +306,9 @@ index 744e43b480bc..8dc279d4d561 100644
  
  	pr_debug("%s(): type: %d, size %u\n", __func__, f->type, pix->sizeimage);
  
-diff --git a/drivers/media/platform/vino.c b/drivers/media/platform/vino.c
-index c6af974c5b45..e58796e66ab1 100644
 --- a/drivers/media/platform/vino.c
 +++ b/drivers/media/platform/vino.c
-@@ -3147,7 +3147,6 @@ static int vino_try_fmt_vid_cap(struct file *file, void *__fh,
+@@ -3147,7 +3147,6 @@ static int vino_try_fmt_vid_cap(struct f
  	pf->colorspace =
  		vino_data_formats[tempvcs.data_format].colorspace;
  
@@ -344,7 +316,7 @@ index c6af974c5b45..e58796e66ab1 100644
  	return 0;
  }
  
-@@ -3175,8 +3174,6 @@ static int vino_g_fmt_vid_cap(struct file *file, void *__fh,
+@@ -3175,8 +3174,6 @@ static int vino_g_fmt_vid_cap(struct fil
  	pf->colorspace =
  		vino_data_formats[vcs->data_format].colorspace;
  
@@ -353,7 +325,7 @@ index c6af974c5b45..e58796e66ab1 100644
  	spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
  	return 0;
  }
-@@ -3219,8 +3216,6 @@ static int vino_s_fmt_vid_cap(struct file *file, void *__fh,
+@@ -3219,8 +3216,6 @@ static int vino_s_fmt_vid_cap(struct fil
  	pf->colorspace =
  		vino_data_formats[vcs->data_format].colorspace;
  
@@ -362,11 +334,9 @@ index c6af974c5b45..e58796e66ab1 100644
  	spin_unlock_irqrestore(&vino_drvdata->input_lock, flags);
  	return 0;
  }
-diff --git a/drivers/media/platform/vivi.c b/drivers/media/platform/vivi.c
-index 2d4e73b45c5e..4807225d63db 100644
 --- a/drivers/media/platform/vivi.c
 +++ b/drivers/media/platform/vivi.c
-@@ -1015,7 +1015,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -1015,7 +1015,6 @@ static int vidioc_try_fmt_vid_cap(struct
  		f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
  	else
  		f->fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
@@ -374,11 +344,9 @@ index 2d4e73b45c5e..4807225d63db 100644
  	return 0;
  }
  
-diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
-index 2f63029e7a36..78a2e34a3286 100644
 --- a/drivers/media/usb/cx231xx/cx231xx-417.c
 +++ b/drivers/media/usb/cx231xx/cx231xx-417.c
-@@ -1563,7 +1563,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -1563,7 +1563,6 @@ static int vidioc_g_fmt_vid_cap(struct f
  	f->fmt.pix.width = dev->ts1.width;
  	f->fmt.pix.height = dev->ts1.height;
  	f->fmt.pix.field = V4L2_FIELD_INTERLACED;
@@ -386,7 +354,7 @@ index 2f63029e7a36..78a2e34a3286 100644
  	dprintk(1, "VIDIOC_G_FMT: w: %d, h: %d\n",
  		dev->ts1.width, dev->ts1.height);
  	dprintk(3, "exit vidioc_g_fmt_vid_cap()\n");
-@@ -1582,7 +1581,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -1582,7 +1581,6 @@ static int vidioc_try_fmt_vid_cap(struct
  	f->fmt.pix.sizeimage = mpeglines * mpeglinesize;
  	f->fmt.pix.field = V4L2_FIELD_INTERLACED;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -394,11 +362,9 @@ index 2f63029e7a36..78a2e34a3286 100644
  	dprintk(1, "VIDIOC_TRY_FMT: w: %d, h: %d\n",
  		dev->ts1.width, dev->ts1.height);
  	dprintk(3, "exit vidioc_try_fmt_vid_cap()\n");
-diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
-index 990626101718..71f10832f97b 100644
 --- a/drivers/media/usb/cx231xx/cx231xx-video.c
 +++ b/drivers/media/usb/cx231xx/cx231xx-video.c
-@@ -886,7 +886,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -886,7 +886,6 @@ static int vidioc_g_fmt_vid_cap(struct f
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
  
  	f->fmt.pix.field = V4L2_FIELD_INTERLACED;
@@ -406,7 +372,7 @@ index 990626101718..71f10832f97b 100644
  
  	return 0;
  }
-@@ -931,7 +930,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -931,7 +930,6 @@ static int vidioc_try_fmt_vid_cap(struct
  	f->fmt.pix.sizeimage = f->fmt.pix.bytesperline * height;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
  	f->fmt.pix.field = V4L2_FIELD_INTERLACED;
@@ -414,11 +380,9 @@ index 990626101718..71f10832f97b 100644
  
  	return 0;
  }
-diff --git a/drivers/media/usb/gspca/gspca.c b/drivers/media/usb/gspca/gspca.c
-index f3a7ace0fac9..1b3d7bf8dab6 100644
 --- a/drivers/media/usb/gspca/gspca.c
 +++ b/drivers/media/usb/gspca/gspca.c
-@@ -1102,8 +1102,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -1102,8 +1102,8 @@ static int vidioc_g_fmt_vid_cap(struct f
  	struct gspca_dev *gspca_dev = video_drvdata(file);
  
  	fmt->fmt.pix = gspca_dev->pixfmt;
@@ -429,7 +393,7 @@ index f3a7ace0fac9..1b3d7bf8dab6 100644
  	fmt->fmt.pix.priv = 0;
  	return 0;
  }
-@@ -1139,8 +1139,8 @@ static int try_fmt_vid_cap(struct gspca_dev *gspca_dev,
+@@ -1139,8 +1139,8 @@ static int try_fmt_vid_cap(struct gspca_
  		fmt->fmt.pix.height = h;
  		gspca_dev->sd_desc->try_fmt(gspca_dev, fmt);
  	}
@@ -440,11 +404,9 @@ index f3a7ace0fac9..1b3d7bf8dab6 100644
  	fmt->fmt.pix.priv = 0;
  	return mode;			/* used when s_fmt */
  }
-diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c
-index 6bce01a674f9..caeae8ff365b 100644
 --- a/drivers/media/usb/hdpvr/hdpvr-video.c
 +++ b/drivers/media/usb/hdpvr/hdpvr-video.c
-@@ -1022,7 +1022,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *_fh,
+@@ -1022,7 +1022,6 @@ static int vidioc_g_fmt_vid_cap(struct f
  	f->fmt.pix.pixelformat	= V4L2_PIX_FMT_MPEG;
  	f->fmt.pix.sizeimage	= dev->bulk_in_size;
  	f->fmt.pix.bytesperline	= 0;
@@ -452,11 +414,9 @@ index 6bce01a674f9..caeae8ff365b 100644
  	if (f->fmt.pix.width == 720) {
  		/* SDTV formats */
  		f->fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
-diff --git a/drivers/media/usb/stkwebcam/stk-webcam.c b/drivers/media/usb/stkwebcam/stk-webcam.c
-index be77482c3070..adfa8320849a 100644
 --- a/drivers/media/usb/stkwebcam/stk-webcam.c
 +++ b/drivers/media/usb/stkwebcam/stk-webcam.c
-@@ -923,7 +923,6 @@ static int stk_vidioc_g_fmt_vid_cap(struct file *filp,
+@@ -923,7 +923,6 @@ static int stk_vidioc_g_fmt_vid_cap(stru
  		pix_format->bytesperline = 2 * pix_format->width;
  	pix_format->sizeimage = pix_format->bytesperline
  				* pix_format->height;
@@ -464,7 +424,7 @@ index be77482c3070..adfa8320849a 100644
  	return 0;
  }
  
-@@ -967,7 +966,6 @@ static int stk_try_fmt_vid_cap(struct file *filp,
+@@ -967,7 +966,6 @@ static int stk_try_fmt_vid_cap(struct fi
  		fmtd->fmt.pix.bytesperline = 2 * fmtd->fmt.pix.width;
  	fmtd->fmt.pix.sizeimage = fmtd->fmt.pix.bytesperline
  		* fmtd->fmt.pix.height;
@@ -472,11 +432,9 @@ index be77482c3070..adfa8320849a 100644
  	return 0;
  }
  
-diff --git a/drivers/media/usb/tlg2300/pd-video.c b/drivers/media/usb/tlg2300/pd-video.c
-index 8df668d06552..8cd7f02fcf9f 100644
 --- a/drivers/media/usb/tlg2300/pd-video.c
 +++ b/drivers/media/usb/tlg2300/pd-video.c
-@@ -1321,7 +1321,6 @@ static void init_video_context(struct running_context *context)
+@@ -1321,7 +1321,6 @@ static void init_video_context(struct ru
  				.bytesperline	= 720 * 2,
  				.sizeimage	= 720 * 576 * 2,
  				.colorspace	= V4L2_COLORSPACE_SMPTE170M,
@@ -484,11 +442,9 @@ index 8df668d06552..8cd7f02fcf9f 100644
  			};
  }
  
-diff --git a/drivers/media/usb/tm6000/tm6000-video.c b/drivers/media/usb/tm6000/tm6000-video.c
-index cc1aa14996ff..97ad689c794e 100644
 --- a/drivers/media/usb/tm6000/tm6000-video.c
 +++ b/drivers/media/usb/tm6000/tm6000-video.c
-@@ -918,7 +918,6 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -918,7 +918,6 @@ static int vidioc_g_fmt_vid_cap(struct f
  		(f->fmt.pix.width * fh->fmt->depth) >> 3;
  	f->fmt.pix.sizeimage =
  		f->fmt.pix.height * f->fmt.pix.bytesperline;
@@ -496,7 +452,7 @@ index cc1aa14996ff..97ad689c794e 100644
  
  	return 0;
  }
-@@ -959,7 +958,6 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -959,7 +958,6 @@ static int vidioc_try_fmt_vid_cap(struct
  	f->fmt.pix.width &= ~0x01;
  
  	f->fmt.pix.field = field;
@@ -504,11 +460,9 @@ index cc1aa14996ff..97ad689c794e 100644
  
  	f->fmt.pix.bytesperline =
  		(f->fmt.pix.width * fmt->depth) >> 3;
-diff --git a/drivers/media/usb/zr364xx/zr364xx.c b/drivers/media/usb/zr364xx/zr364xx.c
-index 74d56df3347f..0f63954ee1d4 100644
 --- a/drivers/media/usb/zr364xx/zr364xx.c
 +++ b/drivers/media/usb/zr364xx/zr364xx.c
-@@ -806,7 +806,6 @@ static int zr364xx_vidioc_try_fmt_vid_cap(struct file *file, void *priv,
+@@ -806,7 +806,6 @@ static int zr364xx_vidioc_try_fmt_vid_ca
  	f->fmt.pix.bytesperline = f->fmt.pix.width * 2;
  	f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
@@ -516,7 +470,7 @@ index 74d56df3347f..0f63954ee1d4 100644
  	DBG("%s: V4L2_PIX_FMT_%s (%d) ok!\n", __func__,
  	    decode_fourcc(f->fmt.pix.pixelformat, pixelformat_name),
  	    f->fmt.pix.field);
-@@ -829,7 +828,6 @@ static int zr364xx_vidioc_g_fmt_vid_cap(struct file *file, void *priv,
+@@ -829,7 +828,6 @@ static int zr364xx_vidioc_g_fmt_vid_cap(
  	f->fmt.pix.bytesperline = f->fmt.pix.width * 2;
  	f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
@@ -524,7 +478,7 @@ index 74d56df3347f..0f63954ee1d4 100644
  	return 0;
  }
  
-@@ -866,7 +864,6 @@ static int zr364xx_vidioc_s_fmt_vid_cap(struct file *file, void *priv,
+@@ -866,7 +864,6 @@ static int zr364xx_vidioc_s_fmt_vid_cap(
  	f->fmt.pix.bytesperline = f->fmt.pix.width * 2;
  	f->fmt.pix.sizeimage = f->fmt.pix.height * f->fmt.pix.bytesperline;
  	f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
@@ -532,11 +486,9 @@ index 74d56df3347f..0f63954ee1d4 100644
  	cam->vb_vidq.field = f->fmt.pix.field;
  
  	if (f->fmt.pix.width == 160 && f->fmt.pix.height == 120)
-diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-index fca336b65351..d0d6530c0b64 100644
 --- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
 +++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
-@@ -540,7 +540,16 @@ struct v4l2_framebuffer32 {
+@@ -535,7 +535,16 @@ struct v4l2_framebuffer32 {
  	__u32			capability;
  	__u32			flags;
  	compat_caddr_t 		base;
@@ -554,7 +506,7 @@ index fca336b65351..d0d6530c0b64 100644
  };
  
  static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_framebuffer32 __user *up)
-@@ -550,10 +559,10 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
+@@ -545,10 +554,10 @@ static int get_v4l2_framebuffer32(struct
  	if (!access_ok(VERIFY_READ, up, sizeof(struct v4l2_framebuffer32)) ||
  		get_user(tmp, &up->base) ||
  		get_user(kp->capability, &up->capability) ||
@@ -567,7 +519,7 @@ index fca336b65351..d0d6530c0b64 100644
  	return 0;
  }
  
-@@ -564,9 +573,9 @@ static int put_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
+@@ -559,9 +568,9 @@ static int put_v4l2_framebuffer32(struct
  	if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_framebuffer32)) ||
  		put_user(tmp, &up->base) ||
  		put_user(kp->capability, &up->capability) ||
@@ -579,11 +531,9 @@ index fca336b65351..d0d6530c0b64 100644
  	return 0;
  }
  
-diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
-index 707aef705a47..feb9e3441c9d 100644
 --- a/drivers/media/v4l2-core/v4l2-ioctl.c
 +++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -936,13 +936,48 @@ static int check_fmt(struct file *file, enum v4l2_buf_type type)
+@@ -936,13 +936,48 @@ static int check_fmt(struct file *file,
  	return -EINVAL;
  }
  
@@ -633,7 +583,7 @@ index 707aef705a47..feb9e3441c9d 100644
  }
  
  static int v4l_s_input(const struct v4l2_ioctl_ops *ops,
-@@ -1061,12 +1096,17 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
+@@ -1061,12 +1096,17 @@ static int v4l_g_fmt(const struct v4l2_i
  	bool is_vid = vfd->vfl_type == VFL_TYPE_GRABBER;
  	bool is_rx = vfd->vfl_dir != VFL_DIR_TX;
  	bool is_tx = vfd->vfl_dir != VFL_DIR_RX;
@@ -652,7 +602,7 @@ index 707aef705a47..feb9e3441c9d 100644
  	case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
  		if (unlikely(!is_rx || !is_vid || !ops->vidioc_g_fmt_vid_cap_mplane))
  			break;
-@@ -1086,7 +1126,9 @@ static int v4l_g_fmt(const struct v4l2_ioctl_ops *ops,
+@@ -1086,7 +1126,9 @@ static int v4l_g_fmt(const struct v4l2_i
  	case V4L2_BUF_TYPE_VIDEO_OUTPUT:
  		if (unlikely(!is_tx || !is_vid || !ops->vidioc_g_fmt_vid_out))
  			break;
@@ -663,7 +613,7 @@ index 707aef705a47..feb9e3441c9d 100644
  	case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
  		if (unlikely(!is_tx || !is_vid || !ops->vidioc_g_fmt_vid_out_mplane))
  			break;
-@@ -1446,7 +1488,18 @@ static int v4l_create_bufs(const struct v4l2_ioctl_ops *ops,
+@@ -1446,7 +1488,18 @@ static int v4l_create_bufs(const struct
  	struct v4l2_create_buffers *create = arg;
  	int ret = check_fmt(file, create->format.type);
  
@@ -683,8 +633,6 @@ index 707aef705a47..feb9e3441c9d 100644
  }
  
  static int v4l_prepare_buf(const struct v4l2_ioctl_ops *ops,
-diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
-index 63274c1d037c..e6b41cf2c6b2 100644
 --- a/include/uapi/linux/videodev2.h
 +++ b/include/uapi/linux/videodev2.h
 @@ -264,6 +264,7 @@ struct v4l2_capability {
@@ -723,6 +671,3 @@ index 63274c1d037c..e6b41cf2c6b2 100644
  };
  /*  Flags for the 'capability' field. Read only */
  #define V4L2_FBUF_CAP_EXTERNOVERLAY	0x0001
--- 
-2.1.2
-
diff --git a/patches.renesas/0717-sh_eth-remove-checks-around-dev_kfree_skb-calls.patch b/patches.renesas/0717-sh_eth-remove-checks-around-dev_kfree_skb-calls.patch
index 547c6ebe9663d2..7de1b829f744cd 100644
--- a/patches.renesas/0717-sh_eth-remove-checks-around-dev_kfree_skb-calls.patch
+++ b/patches.renesas/0717-sh_eth-remove-checks-around-dev_kfree_skb-calls.patch
@@ -11,14 +11,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 179d80aff82bf8dff9db30589fe5a2297c454d35)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/net/ethernet/renesas/sh_eth.c | 18 ++++++------------
+ drivers/net/ethernet/renesas/sh_eth.c |   18 ++++++------------
  1 file changed, 6 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 10af820e1d45..26936b91f63f 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1094,20 +1094,16 @@ static void sh_eth_ring_free(struct net_device *ndev)
+@@ -1094,20 +1094,16 @@ static void sh_eth_ring_free(struct net_
  
  	/* Free Rx skb ringbuffer */
  	if (mdp->rx_skbuff) {
@@ -43,7 +41,7 @@ index 10af820e1d45..26936b91f63f 100644
  	}
  	kfree(mdp->tx_skbuff);
  	mdp->tx_skbuff = NULL;
-@@ -2077,13 +2073,11 @@ static void sh_eth_tx_timeout(struct net_device *ndev)
+@@ -2078,13 +2074,11 @@ static void sh_eth_tx_timeout(struct net
  		rxdesc = &mdp->rx_ring[i];
  		rxdesc->status = 0;
  		rxdesc->addr = 0xBADF00D0;
@@ -59,6 +57,3 @@ index 10af820e1d45..26936b91f63f 100644
  		mdp->tx_skbuff[i] = NULL;
  	}
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0742-serial-sh-sci-Updated-calculation-of-bit-error-rate-.patch b/patches.renesas/0742-serial-sh-sci-Updated-calculation-of-bit-error-rate-.patch
index b9eb65f17d6e6c..351d5f6990d905 100644
--- a/patches.renesas/0742-serial-sh-sci-Updated-calculation-of-bit-error-rate-.patch
+++ b/patches.renesas/0742-serial-sh-sci-Updated-calculation-of-bit-error-rate-.patch
@@ -12,14 +12,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit b7d66397f4d282ddf2a2fe516fc9329c5a063459)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 8 +++++---
+ drivers/tty/serial/sh-sci.c |    8 +++++---
  1 file changed, 5 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 88236da0ddf7..ce8013702560 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -1796,11 +1796,13 @@ static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq,
+@@ -1770,11 +1770,13 @@ static void sci_baud_calc_hscif(unsigned
  	for (sr = 8; sr <= 32; sr++) {
  		for (c = 0; c <= 3; c++) {
  			/* integerized formulas from HSCIF documentation */
@@ -36,6 +34,3 @@ index 88236da0ddf7..ce8013702560 100644
  			if (min_err > err) {
  				min_err = err;
  				*brr = br;
--- 
-2.1.2
-
diff --git a/patches.renesas/0743-serial-sh-sci-Fix-range-check-of-bit-rate-for-HSCIF.patch b/patches.renesas/0743-serial-sh-sci-Fix-range-check-of-bit-rate-for-HSCIF.patch
index 3e026bb9fb39fe..c141211c344af0 100644
--- a/patches.renesas/0743-serial-sh-sci-Fix-range-check-of-bit-rate-for-HSCIF.patch
+++ b/patches.renesas/0743-serial-sh-sci-Fix-range-check-of-bit-rate-for-HSCIF.patch
@@ -14,14 +14,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit bcb9973a6097652a12660958449301aada41de9c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 3 +--
+ drivers/tty/serial/sh-sci.c |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index ce8013702560..7f571a8bdcfb 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -1798,8 +1798,7 @@ static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq,
+@@ -1772,8 +1772,7 @@ static void sci_baud_calc_hscif(unsigned
  			/* integerized formulas from HSCIF documentation */
  			br = DIV_ROUND_CLOSEST(freq, (sr *
  					      (1 << (2 * c + 1)) * bps)) - 1;
@@ -31,6 +29,3 @@ index ce8013702560..7f571a8bdcfb 100644
  			err = DIV_ROUND_CLOSEST(freq, ((br + 1) * bps * sr *
  					       (1 << (2 * c + 1)) / 1000)) -
  					       1000;
--- 
-2.1.2
-
diff --git a/patches.renesas/0744-serial-sh-sci-Add-calculation-recive-margin-for-HSCI.patch b/patches.renesas/0744-serial-sh-sci-Add-calculation-recive-margin-for-HSCI.patch
index 6b676391e84eaa..71322dfacb0bbc 100644
--- a/patches.renesas/0744-serial-sh-sci-Add-calculation-recive-margin-for-HSCI.patch
+++ b/patches.renesas/0744-serial-sh-sci-Add-calculation-recive-margin-for-HSCI.patch
@@ -12,14 +12,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 730c4e782c039caf40b467c35f595c005e94220c)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/tty/serial/sh-sci.c | 77 ++++++++++++++++++++++++++++++++++-----------
+ drivers/tty/serial/sh-sci.c |   77 +++++++++++++++++++++++++++++++++-----------
  1 file changed, 59 insertions(+), 18 deletions(-)
 
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 7f571a8bdcfb..d879c0ca400a 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -1783,13 +1783,30 @@ static unsigned int sci_scbrr_calc(struct sci_port *s, unsigned int bps,
+@@ -1757,13 +1757,30 @@ static unsigned int sci_scbrr_calc(struc
  	return ((freq + 16 * bps) / (32 * bps) - 1);
  }
  
@@ -52,7 +50,7 @@ index 7f571a8bdcfb..d879c0ca400a 100644
  
  	/* Find the combination of sample rate and clock select with the
  	   smallest deviation from the desired baud rate. */
-@@ -1802,12 +1819,35 @@ static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq,
+@@ -1776,12 +1793,35 @@ static void sci_baud_calc_hscif(unsigned
  			err = DIV_ROUND_CLOSEST(freq, ((br + 1) * bps * sr *
  					       (1 << (2 * c + 1)) / 1000)) -
  					       1000;
@@ -92,7 +90,7 @@ index 7f571a8bdcfb..d879c0ca400a 100644
  		}
  	}
  
-@@ -1841,10 +1881,19 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -1815,10 +1855,19 @@ static void sci_set_termios(struct uart_
  {
  	struct sci_port *s = to_sci_port(port);
  	struct plat_sci_reg *reg;
@@ -113,7 +111,7 @@ index 7f571a8bdcfb..d879c0ca400a 100644
  	/*
  	 * earlyprintk comes here early on with port->uartclk set to zero.
  	 * the clock framework is not up and running at this point so here
-@@ -1858,8 +1907,9 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -1832,8 +1881,9 @@ static void sci_set_termios(struct uart_
  	baud = uart_get_baud_rate(port, termios, old, 0, max_baud);
  	if (likely(baud && port->uartclk)) {
  		if (s->cfg->type == PORT_HSCIF) {
@@ -124,7 +122,7 @@ index 7f571a8bdcfb..d879c0ca400a 100644
  		} else {
  			t = sci_scbrr_calc(s, baud, port->uartclk);
  			for (cks = 0; t >= 256 && cks <= 3; cks++)
-@@ -1871,16 +1921,7 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios,
+@@ -1845,16 +1895,7 @@ static void sci_set_termios(struct uart_
  
  	sci_reset(port);
  
@@ -142,6 +140,3 @@ index 7f571a8bdcfb..d879c0ca400a 100644
  
  	uart_update_timeout(port, termios->c_cflag, baud);
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0758-net-sh_eth-Add-r8a7794-support.patch b/patches.renesas/0758-net-sh_eth-Add-r8a7794-support.patch
index b346e55add8db6..26becb571ab6ca 100644
--- a/patches.renesas/0758-net-sh_eth-Add-r8a7794-support.patch
+++ b/patches.renesas/0758-net-sh_eth-Add-r8a7794-support.patch
@@ -11,12 +11,10 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 0f76b9d83b2b010b63a094024b3cfd82e20af28d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/devicetree/bindings/net/sh_eth.txt | 1 +
- drivers/net/ethernet/renesas/sh_eth.c            | 2 ++
+ Documentation/devicetree/bindings/net/sh_eth.txt |    1 +
+ drivers/net/ethernet/renesas/sh_eth.c            |    2 ++
  2 files changed, 3 insertions(+)
 
-diff --git a/Documentation/devicetree/bindings/net/sh_eth.txt b/Documentation/devicetree/bindings/net/sh_eth.txt
-index e7106b50dbdc..34d4db1a4e25 100644
 --- a/Documentation/devicetree/bindings/net/sh_eth.txt
 +++ b/Documentation/devicetree/bindings/net/sh_eth.txt
 @@ -9,6 +9,7 @@ Required properties:
@@ -27,11 +25,9 @@ index e7106b50dbdc..34d4db1a4e25 100644
  	      "renesas,ether-r7s72100" if the device is a part of R7S72100 SoC.
  - reg: offset and length of (1) the E-DMAC/feLic register block (required),
         (2) the TSU register block (optional).
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 26936b91f63f..177d263a1dc4 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -2746,6 +2746,7 @@ static const struct of_device_id sh_eth_match_table[] = {
+@@ -2747,6 +2747,7 @@ static const struct of_device_id sh_eth_
  	{ .compatible = "renesas,ether-r8a7779", .data = &r8a777x_data },
  	{ .compatible = "renesas,ether-r8a7790", .data = &r8a779x_data },
  	{ .compatible = "renesas,ether-r8a7791", .data = &r8a779x_data },
@@ -39,7 +35,7 @@ index 26936b91f63f..177d263a1dc4 100644
  	{ .compatible = "renesas,ether-r7s72100", .data = &r7s72100_data },
  	{ }
  };
-@@ -2972,6 +2973,7 @@ static struct platform_device_id sh_eth_id_table[] = {
+@@ -2973,6 +2974,7 @@ static struct platform_device_id sh_eth_
  	{ "r8a777x-ether", (kernel_ulong_t)&r8a777x_data },
  	{ "r8a7790-ether", (kernel_ulong_t)&r8a779x_data },
  	{ "r8a7791-ether", (kernel_ulong_t)&r8a779x_data },
@@ -47,6 +43,3 @@ index 26936b91f63f..177d263a1dc4 100644
  	{ }
  };
  MODULE_DEVICE_TABLE(platform, sh_eth_id_table);
--- 
-2.1.2
-
diff --git a/patches.renesas/0969-usb-renesas_usbhs-fix-the-behavior-of-some-usbhs_pkt.patch b/patches.renesas/0969-usb-renesas_usbhs-fix-the-behavior-of-some-usbhs_pkt.patch
index 5e24b564502cb7..bdce66a70d60d6 100644
--- a/patches.renesas/0969-usb-renesas_usbhs-fix-the-behavior-of-some-usbhs_pkt.patch
+++ b/patches.renesas/0969-usb-renesas_usbhs-fix-the-behavior-of-some-usbhs_pkt.patch
@@ -30,16 +30,14 @@ Signed-off-by: Felipe Balbi <balbi@ti.com>
 (cherry picked from commit 8355b2b3082d302091506703d2e4e239f7deed7f)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/renesas_usbhs/fifo.c | 25 ++++++++++++++++++++++++-
- drivers/usb/renesas_usbhs/pipe.c | 13 +++++++++++++
- drivers/usb/renesas_usbhs/pipe.h |  4 ++++
+ drivers/usb/renesas_usbhs/fifo.c |   25 ++++++++++++++++++++++++-
+ drivers/usb/renesas_usbhs/pipe.c |   13 +++++++++++++
+ drivers/usb/renesas_usbhs/pipe.h |    4 ++++
  3 files changed, 41 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
-index 4fd36530bfa3..3efece3c72a3 100644
 --- a/drivers/usb/renesas_usbhs/fifo.c
 +++ b/drivers/usb/renesas_usbhs/fifo.c
-@@ -544,6 +544,7 @@ static int usbhsf_pio_try_push(struct usbhs_pkt *pkt, int *is_done)
+@@ -545,6 +545,7 @@ static int usbhsf_pio_try_push(struct us
  		usbhsf_send_terminator(pipe, fifo);
  
  	usbhsf_tx_irq_ctrl(pipe, !*is_done);
@@ -47,7 +45,7 @@ index 4fd36530bfa3..3efece3c72a3 100644
  	usbhs_pipe_enable(pipe);
  
  	dev_dbg(dev, "  send %d (%d/ %d/ %d/ %d)\n",
-@@ -570,12 +571,21 @@ usbhs_fifo_write_busy:
+@@ -571,12 +572,21 @@ usbhs_fifo_write_busy:
  	 * retry in interrupt
  	 */
  	usbhsf_tx_irq_ctrl(pipe, 1);
@@ -70,7 +68,7 @@ index 4fd36530bfa3..3efece3c72a3 100644
  	.try_run = usbhsf_pio_try_push,
  };
  
-@@ -589,6 +599,9 @@ static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done)
+@@ -590,6 +600,9 @@ static int usbhsf_prepare_pop(struct usb
  	if (usbhs_pipe_is_busy(pipe))
  		return 0;
  
@@ -80,7 +78,7 @@ index 4fd36530bfa3..3efece3c72a3 100644
  	/*
  	 * pipe enable to prepare packet receive
  	 */
-@@ -597,6 +610,7 @@ static int usbhsf_prepare_pop(struct usbhs_pkt *pkt, int *is_done)
+@@ -598,6 +611,7 @@ static int usbhsf_prepare_pop(struct usb
  
  	usbhs_pipe_set_trans_count_if_bulk(pipe, pkt->length);
  	usbhs_pipe_enable(pipe);
@@ -88,7 +86,7 @@ index 4fd36530bfa3..3efece3c72a3 100644
  	usbhsf_rx_irq_ctrl(pipe, 1);
  
  	return 0;
-@@ -642,6 +656,7 @@ static int usbhsf_pio_try_pop(struct usbhs_pkt *pkt, int *is_done)
+@@ -643,6 +657,7 @@ static int usbhsf_pio_try_pop(struct usb
  	    (total_len < maxp)) {		/* short packet */
  		*is_done = 1;
  		usbhsf_rx_irq_ctrl(pipe, 0);
@@ -96,7 +94,7 @@ index 4fd36530bfa3..3efece3c72a3 100644
  		usbhs_pipe_disable(pipe);	/* disable pipe first */
  	}
  
-@@ -805,6 +820,7 @@ static void xfer_work(struct work_struct *work)
+@@ -806,6 +821,7 @@ static void xfer_work(struct work_struct
  	dev_dbg(dev, "  %s %d (%d/ %d)\n",
  		fifo->name, usbhs_pipe_number(pipe), pkt->length, pkt->zero);
  
@@ -104,7 +102,7 @@ index 4fd36530bfa3..3efece3c72a3 100644
  	usbhs_pipe_set_trans_count_if_bulk(pipe, pkt->trans);
  	usbhs_pipe_enable(pipe);
  	usbhsf_dma_start(pipe, fifo);
-@@ -836,6 +852,10 @@ static int usbhsf_dma_prepare_push(struct usbhs_pkt *pkt, int *is_done)
+@@ -837,6 +853,10 @@ static int usbhsf_dma_prepare_push(struc
  	if ((uintptr_t)(pkt->buf + pkt->actual) & 0x7) /* 8byte alignment */
  		goto usbhsf_pio_prepare_push;
  
@@ -115,7 +113,7 @@ index 4fd36530bfa3..3efece3c72a3 100644
  	/* get enable DMA fifo */
  	fifo = usbhsf_get_dma_fifo(priv, pkt);
  	if (!fifo)
-@@ -873,6 +893,7 @@ static int usbhsf_dma_push_done(struct usbhs_pkt *pkt, int *is_done)
+@@ -874,6 +894,7 @@ static int usbhsf_dma_push_done(struct u
  	pkt->actual = pkt->trans;
  
  	*is_done = !pkt->zero;	/* send zero packet ? */
@@ -123,7 +121,7 @@ index 4fd36530bfa3..3efece3c72a3 100644
  
  	usbhsf_dma_stop(pipe, pipe->fifo);
  	usbhsf_dma_unmap(pkt);
-@@ -972,8 +993,10 @@ static int usbhsf_dma_pop_done(struct usbhs_pkt *pkt, int *is_done)
+@@ -974,8 +995,10 @@ static int usbhsf_dma_pop_done(struct us
  	if ((pkt->actual == pkt->length) ||	/* receive all data */
  	    (pkt->trans < maxp)) {		/* short packet */
  		*is_done = 1;
@@ -134,11 +132,9 @@ index 4fd36530bfa3..3efece3c72a3 100644
  		usbhsf_prepare_pop(pkt, is_done);
  	}
  
-diff --git a/drivers/usb/renesas_usbhs/pipe.c b/drivers/usb/renesas_usbhs/pipe.c
-index 75fbcf6b102e..040bcefcb040 100644
 --- a/drivers/usb/renesas_usbhs/pipe.c
 +++ b/drivers/usb/renesas_usbhs/pipe.c
-@@ -578,6 +578,19 @@ int usbhs_pipe_is_dir_host(struct usbhs_pipe *pipe)
+@@ -578,6 +578,19 @@ int usbhs_pipe_is_dir_host(struct usbhs_
  	return usbhsp_flags_has(pipe, IS_DIR_HOST);
  }
  
@@ -158,8 +154,6 @@ index 75fbcf6b102e..040bcefcb040 100644
  void usbhs_pipe_data_sequence(struct usbhs_pipe *pipe, int sequence)
  {
  	u16 mask = (SQCLR | SQSET);
-diff --git a/drivers/usb/renesas_usbhs/pipe.h b/drivers/usb/renesas_usbhs/pipe.h
-index 406f36d050e4..d24a05972370 100644
 --- a/drivers/usb/renesas_usbhs/pipe.h
 +++ b/drivers/usb/renesas_usbhs/pipe.h
 @@ -36,6 +36,7 @@ struct usbhs_pipe {
@@ -170,7 +164,7 @@ index 406f36d050e4..d24a05972370 100644
  
  	struct usbhs_pkt_handle *handler;
  
-@@ -80,6 +81,9 @@ int usbhs_pipe_probe(struct usbhs_priv *priv);
+@@ -80,6 +81,9 @@ int usbhs_pipe_probe(struct usbhs_priv *
  void usbhs_pipe_remove(struct usbhs_priv *priv);
  int usbhs_pipe_is_dir_in(struct usbhs_pipe *pipe);
  int usbhs_pipe_is_dir_host(struct usbhs_pipe *pipe);
@@ -180,6 +174,3 @@ index 406f36d050e4..d24a05972370 100644
  void usbhs_pipe_init(struct usbhs_priv *priv,
  		     int (*dma_map_ctrl)(struct usbhs_pkt *pkt, int map));
  int usbhs_pipe_get_maxpacket(struct usbhs_pipe *pipe);
--- 
-2.1.2
-
diff --git a/patches.renesas/0971-usb-renesas_usbhs-fix-the-condition-of-is_done-in-us.patch b/patches.renesas/0971-usb-renesas_usbhs-fix-the-condition-of-is_done-in-us.patch
index e841e834b01c74..6eccd1c11d3507 100644
--- a/patches.renesas/0971-usb-renesas_usbhs-fix-the-condition-of-is_done-in-us.patch
+++ b/patches.renesas/0971-usb-renesas_usbhs-fix-the-condition-of-is_done-in-us.patch
@@ -17,14 +17,12 @@ Signed-off-by: Felipe Balbi <balbi@ti.com>
 (cherry picked from commit c0ed8b23b257a84d103764cdbd490ee5e2749da3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/renesas_usbhs/fifo.c | 17 +++++++++++++++--
+ drivers/usb/renesas_usbhs/fifo.c |   17 +++++++++++++++--
  1 file changed, 15 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
-index 3efece3c72a3..1564829951c0 100644
 --- a/drivers/usb/renesas_usbhs/fifo.c
 +++ b/drivers/usb/renesas_usbhs/fifo.c
-@@ -889,16 +889,29 @@ usbhsf_pio_prepare_push:
+@@ -890,16 +890,29 @@ usbhsf_pio_prepare_push:
  static int usbhsf_dma_push_done(struct usbhs_pkt *pkt, int *is_done)
  {
  	struct usbhs_pipe *pipe = pkt->pipe;
@@ -56,6 +54,3 @@ index 3efece3c72a3..1564829951c0 100644
  	return 0;
  }
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0972-usb-renesas_usbhs-fix-the-usb_pkt_pop.patch b/patches.renesas/0972-usb-renesas_usbhs-fix-the-usb_pkt_pop.patch
index b5eff178068c02..20c2a369ad8ad8 100644
--- a/patches.renesas/0972-usb-renesas_usbhs-fix-the-usb_pkt_pop.patch
+++ b/patches.renesas/0972-usb-renesas_usbhs-fix-the-usb_pkt_pop.patch
@@ -12,14 +12,12 @@ Signed-off-by: Felipe Balbi <balbi@ti.com>
 (cherry picked from commit 2743e7f90dc08282d027dbc2f6486f5cb85aa493)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/renesas_usbhs/fifo.c | 30 +++++++++++++++++++++++++++---
+ drivers/usb/renesas_usbhs/fifo.c |   30 +++++++++++++++++++++++++++---
  1 file changed, 27 insertions(+), 3 deletions(-)
 
-diff --git a/drivers/usb/renesas_usbhs/fifo.c b/drivers/usb/renesas_usbhs/fifo.c
-index 1564829951c0..b0c97a3f1bfe 100644
 --- a/drivers/usb/renesas_usbhs/fifo.c
 +++ b/drivers/usb/renesas_usbhs/fifo.c
-@@ -108,19 +108,45 @@ static struct usbhs_pkt *__usbhsf_pkt_get(struct usbhs_pipe *pipe)
+@@ -108,19 +108,45 @@ static struct usbhs_pkt *__usbhsf_pkt_ge
  	return list_first_entry(&pipe->list, struct usbhs_pkt, node);
  }
  
@@ -66,7 +64,7 @@ index 1564829951c0..b0c97a3f1bfe 100644
  
  	usbhs_unlock(priv, flags);
  	/********************  spin unlock ******************/
-@@ -778,8 +804,6 @@ static void __usbhsf_dma_ctrl(struct usbhs_pipe *pipe,
+@@ -779,8 +805,6 @@ static void __usbhsf_dma_ctrl(struct usb
  	usbhs_bset(priv, fifo->sel, DREQE, dreqe);
  }
  
@@ -75,6 +73,3 @@ index 1564829951c0..b0c97a3f1bfe 100644
  static int __usbhsf_dma_map_ctrl(struct usbhs_pkt *pkt, int map)
  {
  	struct usbhs_pipe *pipe = pkt->pipe;
--- 
-2.1.2
-
diff --git a/series b/series
index f5ba9c64c105f7..bf13eed362fcb5 100644
--- a/series
+++ b/series
@@ -159,7 +159,6 @@ patches.renesas/0127-sh-pfc-r8a7790-Fix-definition-of-IPSR5.patch
 patches.renesas/0128-sh-pfc-r8a7791-Fix-definition-of-MOD_SEL3.patch
 patches.renesas/0129-serial-sh-sci-Fix-cast-warning.patch
 patches.renesas/0130-serial-sh-sci-Fix-compatible-string-in-DT-bindings-e.patch
-patches.renesas/0131-serial-sh-sci-Add-missing-call-to-uart_remove_one_po.patch
 patches.renesas/0132-serial-sh-sci-Replace-printk-by-pr_.patch
 patches.renesas/0133-serial-sh-sci-Remove-useless-casts.patch
 patches.renesas/0134-serial-sh-sci-Add-more-register-documentation.patch