Update to KERNEL_VERSION 4.9.47

19 files changed, 16 insertions, 321 deletions

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index ef01d37040d772..83e4ab67ec7a54 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-4.9.40
+4.9.47
diff --git a/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch b/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch
index 26b299f2ea46a3..12494286d0b2c4 100644
--- a/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch
+++ b/patches.renesas/0041-drm-Add-reference-counting-to-drm_atomic_state.patch
@@ -110,7 +110,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  /**
   * drm_atomic_get_crtc_state - get crtc state
-@@ -1745,7 +1741,7 @@ retry:
+@@ -1748,7 +1744,7 @@ retry:
  	if (arg->flags & DRM_MODE_ATOMIC_TEST_ONLY) {
  		/*
  		 * Unlike commit, check_only does not clean up state.
@@ -119,7 +119,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  		 */
  		ret = drm_atomic_check_only(state);
  	} else if (arg->flags & DRM_MODE_ATOMIC_NONBLOCK) {
-@@ -1778,8 +1774,7 @@ out:
+@@ -1781,8 +1777,7 @@ out:
  		goto retry;
  	}
  
diff --git a/patches.renesas/0046-drm-rcar-du-Remove-test-for-impossible-error-conditi.patch b/patches.renesas/0046-drm-rcar-du-Remove-test-for-impossible-error-conditi.patch
index 6cee59dda0f143..562d12a94ed067 100644
--- a/patches.renesas/0046-drm-rcar-du-Remove-test-for-impossible-error-conditi.patch
+++ b/patches.renesas/0046-drm-rcar-du-Remove-test-for-impossible-error-conditi.patch
@@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 
 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
 +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
-@@ -292,17 +292,11 @@ static int rcar_du_remove(struct platfor
+@@ -291,17 +291,11 @@ static int rcar_du_remove(struct platfor
  
  static int rcar_du_probe(struct platform_device *pdev)
  {
@@ -33,6 +33,6 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 -		return -ENODEV;
 -	}
 -
- 	/* Allocate and initialize the DRM and R-Car device structures. */
+ 	/* Allocate and initialize the R-Car device structure. */
  	rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL);
  	if (rcdu == NULL)
diff --git a/patches.renesas/0048-drm-rcar-du-Fix-crash-in-encoder-failure-error-path.patch b/patches.renesas/0048-drm-rcar-du-Fix-crash-in-encoder-failure-error-path.patch
deleted file mode 100644
index a8a72b7255b386..00000000000000
--- a/patches.renesas/0048-drm-rcar-du-Fix-crash-in-encoder-failure-error-path.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8108fdcfcf5c508848326eeb600bc232295a48a2 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-Date: Mon, 3 Oct 2016 20:03:22 +0300
-Subject: [PATCH 048/299] drm: rcar-du: Fix crash in encoder failure error path
-
-When an encoder fails to initialize the driver prints an error message
-to the kernel log. The message contains the name of the encoder's DT
-node, which is NULL for internal encoders. Use the of_node_full_name()
-macro to avoid dereferencing a NULL pointer, print the output number to
-add more context to the error, and make sure we still own a reference to
-the encoder's DT node by delaying the of_node_put() call.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-Reviewed-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
-(cherry picked from commit 05ee29e94acf0d4b3998c3f93374952de8f90176)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/gpu/drm/rcar-du/rcar_du_kms.c |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
-+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
-@@ -454,13 +454,13 @@ static int rcar_du_encoders_init_one(str
- 	}
- 
- 	ret = rcar_du_encoder_init(rcdu, enc_type, output, encoder, connector);
--	of_node_put(encoder);
--	of_node_put(connector);
--
- 	if (ret && ret != -EPROBE_DEFER)
- 		dev_warn(rcdu->dev,
--			 "failed to initialize encoder %s (%d), skipping\n",
--			 encoder->full_name, ret);
-+			 "failed to initialize encoder %s on output %u (%d), skipping\n",
-+			 of_node_full_name(encoder), output, ret);
-+
-+	of_node_put(encoder);
-+	of_node_put(connector);
- 
- 	return ret;
- }
diff --git a/patches.renesas/0049-drm-rcar-du-Simplify-and-fix-probe-error-handling.patch b/patches.renesas/0049-drm-rcar-du-Simplify-and-fix-probe-error-handling.patch
deleted file mode 100644
index f40c000012e8ac..00000000000000
--- a/patches.renesas/0049-drm-rcar-du-Simplify-and-fix-probe-error-handling.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 37d328371b31dc50f6ee3d511c232cccc6effe97 Mon Sep 17 00:00:00 2001
-From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-Date: Wed, 19 Oct 2016 00:51:35 +0300
-Subject: [PATCH 049/299] drm: rcar-du: Simplify and fix probe error handling
-
-It isn't safe to call drm_dev_unregister() without first initializing
-mode setting with drm_mode_config_init(). This leads to a crash if
-either IO memory can't be remapped or vblank initialization fails.
-
-Fix this by reordering the initialization sequence. Move vblank
-initialization after the drm_mode_config_init() call, and move IO
-remapping before drm_dev_alloc() to avoid the need to perform clean up
-in case of failure.
-
-While at it remove the explicit drm_vblank_cleanup() call from
-rcar_du_remove() as the drm_dev_unregister() function already cleans up
-vblank.
-
-Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-(cherry picked from commit 4f7b0d263833928e947e172eff2d2997179c5cb9)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/gpu/drm/rcar-du/rcar_du_drv.c |   30 ++++++++++--------------------
- drivers/gpu/drm/rcar-du/rcar_du_kms.c |    7 +++++++
- 2 files changed, 17 insertions(+), 20 deletions(-)
-
---- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
-+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
-@@ -283,7 +283,6 @@ static int rcar_du_remove(struct platfor
- 
- 	drm_kms_helper_poll_fini(ddev);
- 	drm_mode_config_cleanup(ddev);
--	drm_vblank_cleanup(ddev);
- 
- 	drm_dev_unref(ddev);
- 
-@@ -297,7 +296,7 @@ static int rcar_du_probe(struct platform
- 	struct resource *mem;
- 	int ret;
- 
--	/* Allocate and initialize the DRM and R-Car device structures. */
-+	/* Allocate and initialize the R-Car device structure. */
- 	rcdu = devm_kzalloc(&pdev->dev, sizeof(*rcdu), GFP_KERNEL);
- 	if (rcdu == NULL)
- 		return -ENOMEM;
-@@ -307,31 +306,22 @@ static int rcar_du_probe(struct platform
- 	rcdu->dev = &pdev->dev;
- 	rcdu->info = of_match_device(rcar_du_of_table, rcdu->dev)->data;
- 
--	ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev);
--	if (IS_ERR(ddev))
--		return PTR_ERR(ddev);
--
--	rcdu->ddev = ddev;
--	ddev->dev_private = rcdu;
--
- 	platform_set_drvdata(pdev, rcdu);
- 
- 	/* I/O resources */
- 	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- 	rcdu->mmio = devm_ioremap_resource(&pdev->dev, mem);
--	if (IS_ERR(rcdu->mmio)) {
--		ret = PTR_ERR(rcdu->mmio);
--		goto error;
--	}
--
--	/* Initialize vertical blanking interrupts handling. Start with vblank
--	 * disabled for all CRTCs.
--	 */
--	ret = drm_vblank_init(ddev, (1 << rcdu->info->num_crtcs) - 1);
--	if (ret < 0)
--		goto error;
-+	if (IS_ERR(rcdu->mmio))
-+		return PTR_ERR(rcdu->mmio);
- 
- 	/* DRM/KMS objects */
-+	ddev = drm_dev_alloc(&rcar_du_driver, &pdev->dev);
-+	if (IS_ERR(ddev))
-+		return PTR_ERR(ddev);
-+
-+	rcdu->ddev = ddev;
-+	ddev->dev_private = rcdu;
-+
- 	ret = rcar_du_modeset_init(rcdu);
- 	if (ret < 0) {
- 		if (ret != -EPROBE_DEFER)
---- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
-+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
-@@ -568,6 +568,13 @@ int rcar_du_modeset_init(struct rcar_du_
- 	if (ret < 0)
- 		return ret;
- 
-+	/* Initialize vertical blanking interrupts handling. Start with vblank
-+	 * disabled for all CRTCs.
-+	 */
-+	ret = drm_vblank_init(dev, (1 << rcdu->info->num_crtcs) - 1);
-+	if (ret < 0)
-+		return ret;
-+
- 	/* Initialize the groups. */
- 	num_groups = DIV_ROUND_UP(rcdu->num_crtcs, 2);
- 
diff --git a/patches.renesas/0053-drm-rcar-du-Fix-display-timing-controller-parameter.patch b/patches.renesas/0053-drm-rcar-du-Fix-display-timing-controller-parameter.patch
deleted file mode 100644
index 467e4dab1f8cfd..00000000000000
--- a/patches.renesas/0053-drm-rcar-du-Fix-display-timing-controller-parameter.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 9389e8db60a5b7a71546c61d167256be9d5b9b9d Mon Sep 17 00:00:00 2001
-From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
-Date: Mon, 18 Apr 2016 16:31:30 +0900
-Subject: [PATCH 053/299] drm: rcar-du: Fix display timing controller parameter
-
-There is a bug in the setting of the DES (Display Enable Signal)
-register. This current setting occurs 1 dot left shift. The DES
-register should be set minus one value about the specifying value
-with H/W specification. This patch corrects it.
-
-Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-(cherry picked from commit 9cdced8a39c04cf798ddb2a27cb5952f7d39f633)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/gpu/drm/rcar-du/rcar_du_crtc.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
-+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
-@@ -172,7 +172,7 @@ static void rcar_du_crtc_set_display_tim
- 					mode->crtc_vsync_start - 1);
- 	rcar_du_crtc_write(rcrtc, VCR,  mode->crtc_vtotal - 1);
- 
--	rcar_du_crtc_write(rcrtc, DESR,  mode->htotal - mode->hsync_start);
-+	rcar_du_crtc_write(rcrtc, DESR,  mode->htotal - mode->hsync_start - 1);
- 	rcar_du_crtc_write(rcrtc, DEWR,  mode->hdisplay);
- }
- 
diff --git a/patches.renesas/0054-drm-rcar-du-Fix-H-V-sync-signal-polarity-configurati.patch b/patches.renesas/0054-drm-rcar-du-Fix-H-V-sync-signal-polarity-configurati.patch
deleted file mode 100644
index 6562ea1eb10596..00000000000000
--- a/patches.renesas/0054-drm-rcar-du-Fix-H-V-sync-signal-polarity-configurati.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 6f4749f01e68aac30145f473933a8c17ea072dc1 Mon Sep 17 00:00:00 2001
-From: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
-Date: Mon, 16 May 2016 11:28:15 +0900
-Subject: [PATCH 054/299] drm: rcar-du: Fix H/V sync signal polarity
- configuration
-
-The VSL and HSL bits in the DSMR register set the corresponding
-horizontal and vertical sync signal polarity to active high. The code
-got it the wrong way around, fix it.
-
-Signed-off-by: Koji Matsuoka <koji.matsuoka.xm@renesas.com>
-Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
-(cherry picked from commit fd1adef3bff0663c5ac31b45bc4a05fafd43d19b)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/gpu/drm/rcar-du/rcar_du_crtc.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
-+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
-@@ -149,8 +149,8 @@ static void rcar_du_crtc_set_display_tim
- 	rcar_du_group_write(rcrtc->group, rcrtc->index % 2 ? OTAR2 : OTAR, 0);
- 
- 	/* Signal polarities */
--	value = ((mode->flags & DRM_MODE_FLAG_PVSYNC) ? 0 : DSMR_VSL)
--	      | ((mode->flags & DRM_MODE_FLAG_PHSYNC) ? 0 : DSMR_HSL)
-+	value = ((mode->flags & DRM_MODE_FLAG_PVSYNC) ? DSMR_VSL : 0)
-+	      | ((mode->flags & DRM_MODE_FLAG_PHSYNC) ? DSMR_HSL : 0)
- 	      | DSMR_DIPM_DISP | DSMR_CSPM;
- 	rcar_du_crtc_write(rcrtc, DSMR, value);
- 
diff --git a/patches.renesas/0115-sh_eth-fix-branch-prediction-in-sh_eth_interrupt.patch b/patches.renesas/0115-sh_eth-fix-branch-prediction-in-sh_eth_interrupt.patch
index abfb20173f7203..9d670385bf555b 100644
--- a/patches.renesas/0115-sh_eth-fix-branch-prediction-in-sh_eth_interrupt.patch
+++ b/patches.renesas/0115-sh_eth-fix-branch-prediction-in-sh_eth_interrupt.patch
@@ -18,7 +18,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 
 --- a/drivers/net/ethernet/renesas/sh_eth.c
 +++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -1668,7 +1668,7 @@ static irqreturn_t sh_eth_interrupt(int
+@@ -1670,7 +1670,7 @@ static irqreturn_t sh_eth_interrupt(int
  	else
  		goto out;
  
diff --git a/patches.renesas/0116-sh_eth-enable-RX-descriptor-word-0-shift-on-SH7734.patch b/patches.renesas/0116-sh_eth-enable-RX-descriptor-word-0-shift-on-SH7734.patch
deleted file mode 100644
index f488464844947e..00000000000000
--- a/patches.renesas/0116-sh_eth-enable-RX-descriptor-word-0-shift-on-SH7734.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 41e72cfb2967a28134f25244a15cbf56622b9764 Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Wed, 4 Jan 2017 23:10:23 +0300
-Subject: [PATCH 116/299] sh_eth: enable RX descriptor word 0 shift on SH7734
-
-The RX descriptor word 0 on SH7734 has the RFS[9:0] field in bits 16-25
-(bits  0-15 usually used for that are occupied by the packet checksum).
-Thus  we need to set the 'shift_rd0'  field in the SH7734 SoC data...
-
-Fixes: f0e81fecd4f8 ("net: sh_eth: Add support SH7734")
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 71eae1ca77fd6be218d8a952d97bba827e56516d)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/net/ethernet/renesas/sh_eth.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/ethernet/renesas/sh_eth.c
-+++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -819,6 +819,7 @@ static struct sh_eth_cpu_data sh7734_dat
- 	.tsu		= 1,
- 	.hw_crc		= 1,
- 	.select_mii	= 1,
-+	.shift_rd0	= 1,
- };
- 
- /* SH7763 */
diff --git a/patches.renesas/0117-sh_eth-fix-EESIPR-values-for-SH77-34-63.patch b/patches.renesas/0117-sh_eth-fix-EESIPR-values-for-SH77-34-63.patch
deleted file mode 100644
index d8554e573c2c98..00000000000000
--- a/patches.renesas/0117-sh_eth-fix-EESIPR-values-for-SH77-34-63.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 42784f869694091eaa471fecdc6863696de627f5 Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Wed, 4 Jan 2017 22:18:24 +0300
-Subject: [PATCH 117/299] sh_eth: fix EESIPR values for SH77{34|63}
-
-As the SH77{34|63} manuals are freely available,  I've checked the EESIPR
-values written against the manuals, and they appeared to set the reserved
-bits 11-15 (which should be 0 on write). Fix those EESIPR values.
-
-Fixes: 380af9e390ec ("net: sh_eth: CPU dependency code collect to "struct sh_eth_cpu_data"")
-Fixes: f5d12767c8fd ("sh_eth: get SH77{34|63} support out of #ifdef")
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 978d3639fd13d987950e4ce85c8737ae92154b2c)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/net/ethernet/renesas/sh_eth.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/drivers/net/ethernet/renesas/sh_eth.c
-+++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -802,7 +802,7 @@ static struct sh_eth_cpu_data sh7734_dat
- 
- 	.ecsr_value	= ECSR_ICD | ECSR_MPD,
- 	.ecsipr_value	= ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
--	.eesipr_value	= DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
-+	.eesipr_value	= DMAC_M_RFRMER | DMAC_M_ECI | 0x003f07ff,
- 
- 	.tx_check	= EESR_TC1 | EESR_FTC,
- 	.eesr_err_check	= EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
-@@ -832,7 +832,7 @@ static struct sh_eth_cpu_data sh7763_dat
- 
- 	.ecsr_value	= ECSR_ICD | ECSR_MPD,
- 	.ecsipr_value	= ECSIPR_LCHNGIP | ECSIPR_ICDIP | ECSIPR_MPDIP,
--	.eesipr_value	= DMAC_M_RFRMER | DMAC_M_ECI | 0x003fffff,
-+	.eesipr_value	= DMAC_M_RFRMER | DMAC_M_ECI | 0x003f07ff,
- 
- 	.tx_check	= EESR_TC1 | EESR_FTC,
- 	.eesr_err_check	= EESR_TWB1 | EESR_TWB | EESR_TABT | EESR_RABT |
diff --git a/patches.renesas/0118-sh_eth-R8A7740-supports-packet-shecksumming.patch b/patches.renesas/0118-sh_eth-R8A7740-supports-packet-shecksumming.patch
deleted file mode 100644
index 6dc8d3a80c685c..00000000000000
--- a/patches.renesas/0118-sh_eth-R8A7740-supports-packet-shecksumming.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0068ef1270155acaeeeecdd0fff6f1659da0d21b Mon Sep 17 00:00:00 2001
-From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Date: Thu, 5 Jan 2017 00:29:32 +0300
-Subject: [PATCH 118/299] sh_eth: R8A7740 supports packet shecksumming
-
-The R8A7740 GEther controller supports the packet checksum offloading
-but the 'hw_crc' (bad name, I'll fix it) flag isn't set in the R8A7740
-data,  thus CSMR isn't cleared...
-
-Fixes: 73a0d907301e ("net: sh_eth: add support R8A7740")
-Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
-(cherry picked from commit 0f1f9cbc04dbb3cc310f70a11cba0cf1f2109d9c)
-Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
----
- drivers/net/ethernet/renesas/sh_eth.c |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/net/ethernet/renesas/sh_eth.c
-+++ b/drivers/net/ethernet/renesas/sh_eth.c
-@@ -574,6 +574,7 @@ static struct sh_eth_cpu_data r8a7740_da
- 	.rpadir_value   = 2 << 16,
- 	.no_trimd	= 1,
- 	.no_ade		= 1,
-+	.hw_crc		= 1,
- 	.tsu		= 1,
- 	.select_mii	= 1,
- 	.shift_rd0	= 1,
diff --git a/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch b/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch
index 3844a6488fdfc4..0c8bfadd52abe3 100644
--- a/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch
+++ b/patches.renesas/0133-usb-gadget-udc-renesas_usb3-add-USB-ID-signal-monito.patch
@@ -108,7 +108,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	usb3_write(usb3, 0, USB3_USB_INT_ENA_1);
  	usb3_write(usb3, 0, USB3_USB_INT_ENA_2);
  	usb3_write(usb3, 0, USB3_AXI_INT_ENA);
-@@ -1496,10 +1537,22 @@ static void usb3_irq_epc_int_2(struct re
+@@ -1507,10 +1548,22 @@ static void usb3_irq_epc_int_2(struct re
  	}
  }
  
@@ -131,7 +131,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	int_sta_1 &= usb3_read(usb3, USB3_USB_INT_ENA_1);
  	if (int_sta_1) {
-@@ -1510,6 +1563,12 @@ static void usb3_irq_epc(struct renesas_
+@@ -1521,6 +1574,12 @@ static void usb3_irq_epc(struct renesas_
  	int_sta_2 &= usb3_read(usb3, USB3_USB_INT_ENA_2);
  	if (int_sta_2)
  		usb3_irq_epc_int_2(usb3, int_sta_2);
diff --git a/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch b/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch
index 517fc7f650c2d0..6c7148c33c7b32 100644
--- a/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch
+++ b/patches.renesas/0134-usb-gadget-udc-renesas_usb3-add-extcon-support.patch
@@ -100,7 +100,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  }
  
  static void renesas_usb3_init_controller(struct renesas_usb3 *usb3)
-@@ -1975,6 +1997,12 @@ static const struct of_device_id usb3_of
+@@ -1986,6 +2008,12 @@ static const struct of_device_id usb3_of
  };
  MODULE_DEVICE_TABLE(of, usb3_of_match);
  
@@ -113,7 +113,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  static int renesas_usb3_probe(struct platform_device *pdev)
  {
  	struct renesas_usb3 *usb3;
-@@ -2018,6 +2046,17 @@ static int renesas_usb3_probe(struct pla
+@@ -2029,6 +2057,17 @@ static int renesas_usb3_probe(struct pla
  	if (ret < 0)
  		return ret;
  
diff --git a/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch b/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch
index 8329a8e0c3f5e5..4f79780192c39b 100644
--- a/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch
+++ b/patches.renesas/0135-usb-gadget-udc-renesas_usb3-add-support-for-usb-role.patch
@@ -80,7 +80,7 @@ Conflicts:
  }
  
  static bool usb3_is_a_device(struct renesas_usb3 *usb3)
-@@ -1862,11 +1873,49 @@ static const struct usb_gadget_ops renes
+@@ -1873,11 +1884,49 @@ static const struct usb_gadget_ops renes
  	.set_selfpowered	= renesas_usb3_set_selfpowered,
  };
  
@@ -130,7 +130,7 @@ Conflicts:
  	usb_del_gadget_udc(&usb3->gadget);
  
  	__renesas_usb3_ep_free_request(usb3->ep0_req);
-@@ -2066,12 +2115,19 @@ static int renesas_usb3_probe(struct pla
+@@ -2077,12 +2126,19 @@ static int renesas_usb3_probe(struct pla
  	if (ret < 0)
  		goto err_add_udc;
  
diff --git a/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch b/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch
index 592f71fcab66a4..901278da2b415d 100644
--- a/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch
+++ b/patches.renesas/0136-usb-gadget-udc-renesas_usb3-fix-pm_runtime-functions.patch
@@ -21,7 +21,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 
 --- a/drivers/usb/gadget/udc/renesas_usb3.c
 +++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -1841,6 +1841,9 @@ static int renesas_usb3_stop(struct usb_
+@@ -1852,6 +1852,9 @@ static int renesas_usb3_stop(struct usb_
  	pm_runtime_put(usb3_to_dev(usb3));
  	pm_runtime_disable(usb3_to_dev(usb3));
  
diff --git a/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch b/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch
index 5df0c4045b2222..d41705d33d19e8 100644
--- a/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch
+++ b/patches.renesas/0137-usb-gadget-udc-renesas_usb3-fix-deadlock-by-spinlock.patch
@@ -23,7 +23,7 @@ Conflicts:
 
 --- a/drivers/usb/gadget/udc/renesas_usb3.c
 +++ b/drivers/usb/gadget/udc/renesas_usb3.c
-@@ -1841,9 +1841,6 @@ static int renesas_usb3_stop(struct usb_
+@@ -1852,9 +1852,6 @@ static int renesas_usb3_stop(struct usb_
  	pm_runtime_put(usb3_to_dev(usb3));
  	pm_runtime_disable(usb3_to_dev(usb3));
  
diff --git a/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch b/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch
index 2f42bea5c3be5f..775ad96fbb94db 100644
--- a/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch
+++ b/patches.renesas/0138-usb-gadget-udc-renesas_usb3-Fix-PN_INT_ENA-disabling.patch
@@ -27,7 +27,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  	usb3_write(usb3, 0, USB3_USB_OTG_INT_ENA);
  	usb3_write(usb3, 0, USB3_USB_INT_ENA_1);
  	usb3_write(usb3, 0, USB3_USB_INT_ENA_2);
-@@ -1682,6 +1681,7 @@ static int usb3_disable_pipe_n(struct re
+@@ -1693,6 +1692,7 @@ static int usb3_disable_pipe_n(struct re
  
  	spin_lock_irqsave(&usb3->lock, flags);
  	if (!usb3_pn_change(usb3, usb3_ep->num)) {
diff --git a/patches.socfpga/0065-spi-dw-Set-GPIO_SS-flag-to-toggle-Slave-Select-on-GP.patch b/patches.socfpga/0065-spi-dw-Set-GPIO_SS-flag-to-toggle-Slave-Select-on-GP.patch
index 861baed53ef160..f66d7cdb2436fa 100644
--- a/patches.socfpga/0065-spi-dw-Set-GPIO_SS-flag-to-toggle-Slave-Select-on-GP.patch
+++ b/patches.socfpga/0065-spi-dw-Set-GPIO_SS-flag-to-toggle-Slave-Select-on-GP.patch
@@ -24,7 +24,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
 
 --- a/drivers/spi/spi-dw.c
 +++ b/drivers/spi/spi-dw.c
-@@ -502,6 +502,7 @@ int dw_spi_add_host(struct device *dev,
+@@ -505,6 +505,7 @@ int dw_spi_add_host(struct device *dev,
  	master->handle_err = dw_spi_handle_err;
  	master->max_speed_hz = dws->max_freq;
  	master->dev.of_node = dev->of_node;
diff --git a/series b/series
index c607364d16bedd..92314dba381c2a 100644
--- a/series
+++ b/series
@@ -67,13 +67,9 @@ patches.renesas/0044-drm-rcar-du-Constify-node-argument-to-rcar_du_lvds_c.patch
 patches.renesas/0045-drm-rcar-du-Bring-HDMI-encoder-comments-in-line-with.patch
 patches.renesas/0046-drm-rcar-du-Remove-test-for-impossible-error-conditi.patch
 patches.renesas/0047-drm-rcar-du-Remove-memory-allocation-error-message.patch
-patches.renesas/0048-drm-rcar-du-Fix-crash-in-encoder-failure-error-path.patch
-patches.renesas/0049-drm-rcar-du-Simplify-and-fix-probe-error-handling.patch
 patches.renesas/0050-drm-rcar-du-Add-R8A7792-support.patch
 patches.renesas/0051-drm-rcar-du-Add-R8A7796-support.patch
 patches.renesas/0052-drm-rcar-du-Fix-dot-clock-routing-configuration.patch
-patches.renesas/0053-drm-rcar-du-Fix-display-timing-controller-parameter.patch
-patches.renesas/0054-drm-rcar-du-Fix-H-V-sync-signal-polarity-configurati.patch
 patches.renesas/0055-drm-rcar-du-Fix-LVDS-start-sequence-on-Gen3.patch
 patches.renesas/0056-dt-bindings-media-renesas-fcp-Remove-SoC-specific-co.patch
 patches.renesas/0057-media-v4l-rcar-fcp-Fix-module-autoload-for-OF-regist.patch
@@ -135,9 +131,6 @@ patches.renesas/0112-ASoC-wm8978-Adjust-clock-indices-so-that-simple-card.patch
 patches.renesas/0113-usb-host-xhci-rcar-add-a-new-firmware-version-for-r8.patch
 patches.renesas/0114-usb-host-xhci-plat-add-support-for-Renesas-r8a7796-S.patch
 patches.renesas/0115-sh_eth-fix-branch-prediction-in-sh_eth_interrupt.patch
-patches.renesas/0116-sh_eth-enable-RX-descriptor-word-0-shift-on-SH7734.patch
-patches.renesas/0117-sh_eth-fix-EESIPR-values-for-SH77-34-63.patch
-patches.renesas/0118-sh_eth-R8A7740-supports-packet-shecksumming.patch
 patches.renesas/0119-arm64-dts-r8a7796-salvator-x-enable-SDHI0-3.patch
 patches.renesas/0120-arm64-dts-r8a7796-salvator-x-enable-UHS-for-SDHI-0-3.patch
 patches.renesas/0121-arm64-dts-r8a7795-salvator-enable-on-board-eMMC.patch