From: Greg Kroah-Hartman Date: Mon, 20 Jul 2020 11:23:00 +0000 (+0200) Subject: 4.4-stable patches X-Git-Tag: v4.4.231~36 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0da0deb613959dfb4c5db8f9f59a4af7a7882875;p=thirdparty%2Fkernel%2Fstable-queue.git 4.4-stable patches added patches: mtd-rawnand-brcmnand-fix-cs0-layout.patch --- diff --git a/queue-4.4/mtd-rawnand-brcmnand-fix-cs0-layout.patch b/queue-4.4/mtd-rawnand-brcmnand-fix-cs0-layout.patch new file mode 100644 index 00000000000..0c8320589fc --- /dev/null +++ b/queue-4.4/mtd-rawnand-brcmnand-fix-cs0-layout.patch @@ -0,0 +1,40 @@ +From 3d3fb3c5be9ce07fa85d8f67fb3922e4613b955b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= +Date: Fri, 22 May 2020 14:15:21 +0200 +Subject: mtd: rawnand: brcmnand: fix CS0 layout +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Álvaro Fernández Rojas + +commit 3d3fb3c5be9ce07fa85d8f67fb3922e4613b955b upstream. + +Only v3.3-v5.0 have a different CS0 layout. +Controllers before v3.3 use the same layout for every CS. + +Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller") +Signed-off-by: Álvaro Fernández Rojas +Acked-by: Florian Fainelli +Signed-off-by: Miquel Raynal +Link: https://lore.kernel.org/linux-mtd/20200522121524.4161539-3-noltari@gmail.com +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/mtd/nand/brcmnand/brcmnand.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/mtd/nand/brcmnand/brcmnand.c ++++ b/drivers/mtd/nand/brcmnand/brcmnand.c +@@ -455,8 +455,9 @@ static int brcmnand_revision_init(struct + } else { + ctrl->cs_offsets = brcmnand_cs_offsets; + +- /* v5.0 and earlier has a different CS0 offset layout */ +- if (ctrl->nand_version <= 0x0500) ++ /* v3.3-5.0 have a different CS0 offset layout */ ++ if (ctrl->nand_version >= 0x0303 && ++ ctrl->nand_version <= 0x0500) + ctrl->cs0_offsets = brcmnand_cs_offsets_cs0; + } + diff --git a/queue-4.4/series b/queue-4.4/series index 63805f378c4..d21649de302 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -33,3 +33,4 @@ revert-usb-ohci-platform-fix-a-warning-when-hibernat.patch usb-gadget-udc-atmel-fix-uninitialized-read-in-debug.patch staging-comedi-verify-array-index-is-correct-before-.patch perf-stat-zero-all-the-ena-and-run-array-slot-stats-for-interval-mode.patch +mtd-rawnand-brcmnand-fix-cs0-layout.patch