Update KERNEL_VERSION to 4.1.28

8 files changed, 17 insertions, 87 deletions

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 566261e131f1d3..d6d90e831d8239 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-4.1.22
+4.1.28
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index 9054001828caa7..b1b5d1c5f736df 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 4
  PATCHLEVEL = 1
- SUBLEVEL = 22
+ SUBLEVEL = 28
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Series 4800
diff --git a/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch b/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
index 448d4d6b2f5be4..568e7a22805c71 100644
--- a/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
+++ b/patches.renesas/0068-pinctrl-make-pinctrl_register-return-proper-error-co.patch
@@ -282,7 +282,7 @@ Conflicts:
  	ret = intel_gpio_probe(pctrl, irq);
 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
 +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
-@@ -1165,9 +1165,9 @@ int mtk_pctrl_init(struct platform_devic
+@@ -1167,9 +1167,9 @@ int mtk_pctrl_init(struct platform_devic
  	mtk_pctrl_desc.npins = pctl->devdata->npins;
  	pctl->dev = &pdev->dev;
  	pctl->pctl_dev = pinctrl_register(&mtk_pctrl_desc, &pdev->dev, pctl);
@@ -451,7 +451,7 @@ Conflicts:
  	for (bank = 0; bank < info->ctrl->nr_banks; ++bank) {
 --- a/drivers/pinctrl/pinctrl-single.c
 +++ b/drivers/pinctrl/pinctrl-single.c
-@@ -1921,9 +1921,9 @@ static int pcs_probe(struct platform_dev
+@@ -1924,9 +1924,9 @@ static int pcs_probe(struct platform_dev
  		goto free;
  
  	pcs->pctl = pinctrl_register(&pcs->desc, pcs->dev, pcs);
@@ -616,7 +616,7 @@ Conflicts:
  	if (ret) {
 --- a/drivers/pinctrl/samsung/pinctrl-exynos5440.c
 +++ b/drivers/pinctrl/samsung/pinctrl-exynos5440.c
-@@ -822,9 +822,9 @@ static int exynos5440_pinctrl_register(s
+@@ -823,9 +823,9 @@ static int exynos5440_pinctrl_register(s
  		return ret;
  
  	pctl_dev = pinctrl_register(ctrldesc, &pdev->dev, priv);
@@ -627,7 +627,7 @@ Conflicts:
 +		return PTR_ERR(pctl_dev);
  	}
  
- 	grange.name = "exynos5440-pctrl-gpio-range";
+ 	priv->range.name = "exynos5440-pctrl-gpio-range";
 --- a/drivers/pinctrl/samsung/pinctrl-samsung.c
 +++ b/drivers/pinctrl/samsung/pinctrl-samsung.c
 @@ -873,9 +873,9 @@ static int samsung_pinctrl_register(stru
diff --git a/patches.renesas/0232-sh_eth-propagate-platform_get_irq-error-upstream.patch b/patches.renesas/0232-sh_eth-propagate-platform_get_irq-error-upstream.patch
index 0ad5126dc16a3c..9bfbfa2dac21e9 100644
--- a/patches.renesas/0232-sh_eth-propagate-platform_get_irq-error-upstream.patch
+++ b/patches.renesas/0232-sh_eth-propagate-platform_get_irq-error-upstream.patch
@@ -13,14 +13,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit 7a468ac624c80bda76957d8cbc28024f4f68e316)
 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, 1 insertion(+), 3 deletions(-)
 
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 7fb244f565b2..257ea713b4c1 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -3089,10 +3089,8 @@ static int sh_eth_drv_probe(struct platform_device *pdev)
+@@ -3090,10 +3090,8 @@ static int sh_eth_drv_probe(struct platf
  
  	ndev->dma = -1;
  	ret = platform_get_irq(pdev, 0);
@@ -32,6 +30,3 @@ index 7fb244f565b2..257ea713b4c1 100644
  	ndev->irq = ret;
  
  	SET_NETDEV_DEV(ndev, &pdev->dev);
--- 
-2.6.2
-
diff --git a/patches.renesas/0256-usb-renesas_usbhs-Allow-an-OTG-PHY-driver-to-provide.patch b/patches.renesas/0256-usb-renesas_usbhs-Allow-an-OTG-PHY-driver-to-provide.patch
index 0cee785af4067f..c334115a84f213 100644
--- a/patches.renesas/0256-usb-renesas_usbhs-Allow-an-OTG-PHY-driver-to-provide.patch
+++ b/patches.renesas/0256-usb-renesas_usbhs-Allow-an-OTG-PHY-driver-to-provide.patch
@@ -13,11 +13,9 @@ Signed-off-by: Felipe Balbi <balbi@ti.com>
 (cherry picked from commit b5a2875605cac14a7d7744ec8254547a26c02612)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/renesas_usbhs/mod_gadget.c | 62 ++++++++++++++++++++++++++++++++++
+ drivers/usb/renesas_usbhs/mod_gadget.c |   62 +++++++++++++++++++++++++++++++++
  1 file changed, 62 insertions(+)
 
-diff --git a/drivers/usb/renesas_usbhs/mod_gadget.c b/drivers/usb/renesas_usbhs/mod_gadget.c
-index dc2aa3261202..494dfe06bb27 100644
 --- a/drivers/usb/renesas_usbhs/mod_gadget.c
 +++ b/drivers/usb/renesas_usbhs/mod_gadget.c
 @@ -21,6 +21,7 @@
@@ -37,7 +35,7 @@ index dc2aa3261202..494dfe06bb27 100644
  
  	u32	status;
  #define USBHSG_STATUS_STARTED		(1 << 0)
-@@ -873,6 +876,27 @@ static int usbhsg_try_stop(struct usbhs_priv *priv, u32 status)
+@@ -877,6 +880,27 @@ static int usbhsg_try_stop(struct usbhs_
  }
  
  /*
@@ -65,7 +63,7 @@ index dc2aa3261202..494dfe06bb27 100644
   *
   *		linux usb function
   *
-@@ -882,12 +906,28 @@ static int usbhsg_gadget_start(struct usb_gadget *gadget,
+@@ -886,12 +910,28 @@ static int usbhsg_gadget_start(struct us
  {
  	struct usbhsg_gpriv *gpriv = usbhsg_gadget_to_gpriv(gadget);
  	struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
@@ -94,7 +92,7 @@ index dc2aa3261202..494dfe06bb27 100644
  	/* first hook up the driver ... */
  	gpriv->driver = driver;
  
-@@ -900,6 +940,10 @@ static int usbhsg_gadget_stop(struct usb_gadget *gadget)
+@@ -904,6 +944,10 @@ static int usbhsg_gadget_stop(struct usb
  	struct usbhs_priv *priv = usbhsg_gpriv_to_priv(gpriv);
  
  	usbhsg_try_stop(priv, USBHSG_STATUS_REGISTERD);
@@ -105,7 +103,7 @@ index dc2aa3261202..494dfe06bb27 100644
  	gpriv->driver = NULL;
  
  	return 0;
-@@ -947,12 +991,26 @@ static int usbhsg_set_selfpowered(struct usb_gadget *gadget, int is_self)
+@@ -951,12 +995,26 @@ static int usbhsg_set_selfpowered(struct
  	return 0;
  }
  
@@ -132,7 +130,7 @@ index dc2aa3261202..494dfe06bb27 100644
  };
  
  static int usbhsg_start(struct usbhs_priv *priv)
-@@ -994,6 +1052,10 @@ int usbhs_mod_gadget_probe(struct usbhs_priv *priv)
+@@ -998,6 +1056,10 @@ int usbhs_mod_gadget_probe(struct usbhs_
  		goto usbhs_mod_gadget_probe_err_gpriv;
  	}
  
@@ -143,6 +141,3 @@ index dc2aa3261202..494dfe06bb27 100644
  	/*
  	 * CAUTION
  	 *
--- 
-2.6.2
-
diff --git a/patches.renesas/0327-sh_eth-fix-RX-buffer-size-alignment.patch b/patches.renesas/0327-sh_eth-fix-RX-buffer-size-alignment.patch
deleted file mode 100644
index cfd2631ce6c935..00000000000000
--- a/patches.renesas/0327-sh_eth-fix-RX-buffer-size-alignment.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From c10f2b00f3f5f119aea1427c5fbcfb7a0ea9ab36 Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Sat, 24 Oct 2015 00:46:03 +0300
-Subject: [PATCH 327/337] sh_eth: fix RX buffer size alignment
-
-Both  Renesas R-Car and RZ/A1 manuals state that RX buffer  length must be
-a multiple of 32 bytes, while the driver  only uses 16 byte granularity...
-
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit ab8579169b79c062935dade949287113c7c1ba73)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/net/ethernet/renesas/sh_eth.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
-index 257ea713b4c1..d8334d8a53b3 100644
---- a/drivers/net/ethernet/renesas/sh_eth.c
-+++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1148,8 +1148,8 @@ static void sh_eth_ring_format(struct net_device *ndev)
- 
- 		/* RX descriptor */
- 		rxdesc = &mdp->rx_ring[i];
--		/* The size of the buffer is a multiple of 16 bytes. */
--		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);
-+		/* The size of the buffer is a multiple of 32 bytes. */
-+		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 32);
- 		dma_addr = dma_map_single(&ndev->dev, skb->data,
- 					  rxdesc->buffer_length,
- 					  DMA_FROM_DEVICE);
-@@ -1506,7 +1506,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
- 			if (mdp->cd->rpadir)
- 				skb_reserve(skb, NET_IP_ALIGN);
- 			dma_unmap_single(&ndev->dev, rxdesc->addr,
--					 ALIGN(mdp->rx_buf_sz, 16),
-+					 ALIGN(mdp->rx_buf_sz, 32),
- 					 DMA_FROM_DEVICE);
- 			skb_put(skb, pkt_len);
- 			skb->protocol = eth_type_trans(skb, ndev);
-@@ -1524,8 +1524,8 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
- 	for (; mdp->cur_rx - mdp->dirty_rx > 0; mdp->dirty_rx++) {
- 		entry = mdp->dirty_rx % mdp->num_rx_ring;
- 		rxdesc = &mdp->rx_ring[entry];
--		/* The size of the buffer is 16 byte boundary. */
--		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 16);
-+		/* The size of the buffer is 32 byte boundary. */
-+		rxdesc->buffer_length = ALIGN(mdp->rx_buf_sz, 32);
- 
- 		if (mdp->rx_skbuff[entry] == NULL) {
- 			skb = netdev_alloc_skb(ndev, skbuff_size);
--- 
-2.6.2
-
diff --git a/patches.renesas/0328-sh_eth-fix-RX-buffer-size-calculation.patch b/patches.renesas/0328-sh_eth-fix-RX-buffer-size-calculation.patch
index a7a3e781f501ea..674600c3451ea3 100644
--- a/patches.renesas/0328-sh_eth-fix-RX-buffer-size-calculation.patch
+++ b/patches.renesas/0328-sh_eth-fix-RX-buffer-size-calculation.patch
@@ -11,14 +11,12 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 (cherry picked from commit cb3685958dd4c46d7646d244063ea3ec8adf3618)
 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 d8334d8a53b3..a484d8beb855 100644
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1127,7 +1127,7 @@ static void sh_eth_ring_format(struct net_device *ndev)
+@@ -1127,7 +1127,7 @@ static void sh_eth_ring_format(struct ne
  	struct sh_eth_txdesc *txdesc = NULL;
  	int rx_ringsize = sizeof(*rxdesc) * mdp->num_rx_ring;
  	int tx_ringsize = sizeof(*txdesc) * mdp->num_tx_ring;
@@ -27,7 +25,7 @@ index d8334d8a53b3..a484d8beb855 100644
  	dma_addr_t dma_addr;
  
  	mdp->cur_rx = 0;
-@@ -1450,7 +1450,7 @@ static int sh_eth_rx(struct net_device *ndev, u32 intr_status, int *quota)
+@@ -1451,7 +1451,7 @@ static int sh_eth_rx(struct net_device *
  	struct sk_buff *skb;
  	u16 pkt_len = 0;
  	u32 desc_status;
@@ -36,6 +34,3 @@ index d8334d8a53b3..a484d8beb855 100644
  	dma_addr_t dma_addr;
  
  	boguscnt = min(boguscnt, *quota);
--- 
-2.6.2
-
diff --git a/series b/series
index 72ba30231843e7..cce7d0dc7e87e2 100644
--- a/series
+++ b/series
@@ -343,7 +343,6 @@ patches.renesas/0322-usb-renesas_usbhs-Change-USBHS_TYPE_R8A779x-to-USBHS.patch
 patches.renesas/0323-usb-renesas_usbhs-Add-support-for-R-Car-E2.patch
 patches.renesas/0324-usb-renesas_usbhs-fix-build-warning-if-64-bit-archit.patch
 patches.renesas/0325-usb-renesas_usbhs-Add-support-for-R-Car-H3.patch
-patches.renesas/0327-sh_eth-fix-RX-buffer-size-alignment.patch
 patches.renesas/0328-sh_eth-fix-RX-buffer-size-calculation.patch
 patches.renesas/0329-Revert-staging-board-disable-as-it-breaks-the-build.patch
 patches.renesas/0330-staging-board-Initialize-staging-board-code-earlier.patch