drop mtd patch from 4.4.y and 3.18.y that was causing problems.

diff --git a/queue-3.18/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch b/queue-3.18/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch
deleted file mode 100644 (file)
index 9e76830..0000000
--- a/queue-3.18/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From foo@baz Mon Mar 19 10:11:52 CET 2018
-From: Jagdish Gediya <jagdish.gediya@nxp.com>
-Date: Thu, 23 Nov 2017 17:04:31 +0530
-Subject: mtd: nand: ifc: update bufnum mask for ver >= 2.0.0
-
-From: Jagdish Gediya <jagdish.gediya@nxp.com>
-
-
-[ Upstream commit bccb06c353af3764ca86d9da47652458e6c2eb41 ]
-
-Bufnum mask is used to calculate page position in the internal SRAM.
-
-As IFC version 2.0.0 has 16KB of internal SRAM as compared to older
-versions which had 8KB. Hence bufnum mask needs to be updated.
-
-Signed-off-by: Jagdish Gediya <jagdish.gediya@nxp.com>
-Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mtd/nand/fsl_ifc_nand.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/nand/fsl_ifc_nand.c
-+++ b/drivers/mtd/nand/fsl_ifc_nand.c
-@@ -988,6 +988,13 @@ static int fsl_ifc_chip_init(struct fsl_
-       if (ver == FSL_IFC_V1_1_0)
-               fsl_ifc_sram_init(priv);
- 
-+      /*
-+       * As IFC version 2.0.0 has 16KB of internal SRAM as compared to older
-+       * versions which had 8KB. Hence bufnum mask needs to be updated.
-+       */
-+      if (ctrl->version >= FSL_IFC_VERSION_2_0_0)
-+              priv->bufnum_mask = (priv->bufnum_mask * 2) + 1;
-+
-       return 0;
- }
- 

diff --git a/queue-3.18/series b/queue-3.18/series
index 2500367ec88c2067983ca0f67072d4240a54a761..e735551b54582966e9e7002ca4b81b2b362088cf 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -45,7 +45,6 @@ net-xfrm-allow-clearing-socket-xfrm-policies.patch
 mtd-nand-fix-interpretation-of-nand_cmd_none-in-nand_command.patch
 arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch
 arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
-mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch
 tools-usbip-fixes-build-with-musl-libc-toolchain.patch
 spi-sun6i-disable-unprepare-clocks-on-remove.patch
 scsi-devinfo-apply-to-hp-xp-the-same-flags-as-hitachi-vsp.patch

diff --git a/queue-4.4/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch b/queue-4.4/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch
deleted file mode 100644 (file)
index 9201aa1..0000000
--- a/queue-4.4/mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From foo@baz Mon Mar 19 09:58:12 CET 2018
-From: Jagdish Gediya <jagdish.gediya@nxp.com>
-Date: Thu, 23 Nov 2017 17:04:31 +0530
-Subject: mtd: nand: ifc: update bufnum mask for ver >= 2.0.0
-
-From: Jagdish Gediya <jagdish.gediya@nxp.com>
-
-
-[ Upstream commit bccb06c353af3764ca86d9da47652458e6c2eb41 ]
-
-Bufnum mask is used to calculate page position in the internal SRAM.
-
-As IFC version 2.0.0 has 16KB of internal SRAM as compared to older
-versions which had 8KB. Hence bufnum mask needs to be updated.
-
-Signed-off-by: Jagdish Gediya <jagdish.gediya@nxp.com>
-Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha@nxp.com>
-Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
-Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/mtd/nand/fsl_ifc_nand.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
---- a/drivers/mtd/nand/fsl_ifc_nand.c
-+++ b/drivers/mtd/nand/fsl_ifc_nand.c
-@@ -988,6 +988,13 @@ static int fsl_ifc_chip_init(struct fsl_
-       if (ctrl->version == FSL_IFC_VERSION_1_1_0)
-               fsl_ifc_sram_init(priv);
- 
-+      /*
-+       * As IFC version 2.0.0 has 16KB of internal SRAM as compared to older
-+       * versions which had 8KB. Hence bufnum mask needs to be updated.
-+       */
-+      if (ctrl->version >= FSL_IFC_VERSION_2_0_0)
-+              priv->bufnum_mask = (priv->bufnum_mask * 2) + 1;
-+
-       return 0;
- }
- 

diff --git a/queue-4.4/series b/queue-4.4/series
index 35a733187471838fa698d68d8664316693661753..5bedb2d3aa3980778ce78cddfbe84f1268b94291 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -84,7 +84,6 @@ net-xfrm-allow-clearing-socket-xfrm-policies.patch
 mtd-nand-fix-interpretation-of-nand_cmd_none-in-nand_command.patch
 arm-dts-am335x-pepper-fix-the-audio-codec-s-reset-pin.patch
 arm-dts-omap3-n900-fix-the-audio-codec-s-reset-pin.patch
-mtd-nand-ifc-update-bufnum-mask-for-ver-2.0.0.patch
 ath10k-update-tdls-teardown-state-to-target.patch
 cpufreq-fix-governor-module-removal-race.patch
 clk-qcom-msm8916-fix-mnd_width-for-codec_digcodec.patch