From: Greg Kroah-Hartman Date: Thu, 22 Mar 2018 08:22:33 +0000 (+0100) Subject: drop mtd patch from 4.4.y and 3.18.y that was causing problems. X-Git-Tag: v4.4.123~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29d0ed7e7cd19b6560f1167d34f3fee345c98643;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 9e768304921..00000000000 --- 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 -Date: Thu, 23 Nov 2017 17:04:31 +0530 -Subject: mtd: nand: ifc: update bufnum mask for ver >= 2.0.0 - -From: Jagdish Gediya - - -[ 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 -Signed-off-by: Prabhakar Kushwaha -Signed-off-by: Boris Brezillon -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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 2500367ec88..e735551b545 100644 --- 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 index 9201aa17a87..00000000000 --- 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 -Date: Thu, 23 Nov 2017 17:04:31 +0530 -Subject: mtd: nand: ifc: update bufnum mask for ver >= 2.0.0 - -From: Jagdish Gediya - - -[ 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 -Signed-off-by: Prabhakar Kushwaha -Signed-off-by: Boris Brezillon -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - 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 35a73318747..5bedb2d3aa3 100644 --- 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