From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 18 Jan 2022 15:40:53 +0000 (+0100)
Subject: 5.15-stable patches
X-Git-Tag: v5.16.2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13d70bf46e4db6bab45079e3f40f9f1193f6aabc;p=thirdparty%2Fkernel%2Fstable-queue.git

5.15-stable patches

added patches:
	mtd-fixup-cfi-on-ixp4xx.patch
---

diff --git a/queue-5.15/mtd-fixup-cfi-on-ixp4xx.patch b/queue-5.15/mtd-fixup-cfi-on-ixp4xx.patch
new file mode 100644
index 00000000000..91407804e08
--- /dev/null
+++ b/queue-5.15/mtd-fixup-cfi-on-ixp4xx.patch
@@ -0,0 +1,57 @@
+From 603362b4a58393061dcfed1c7f0d0fd4aba61126 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Mon, 27 Sep 2021 16:10:37 +0200
+Subject: mtd: fixup CFI on ixp4xx
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit 603362b4a58393061dcfed1c7f0d0fd4aba61126 upstream.
+
+drivers/mtd/maps/ixp4xx.c requires MTD_CFI_BE_BYTE_SWAP to be set
+in order to compile.
+
+drivers/mtd/maps/ixp4xx.c:57:4: error: #error CONFIG_MTD_CFI_BE_BYTE_SWAP required
+
+This patch avoids the #error output by enforcing the policy in
+Kconfig. Not sure if this is the right approach, but it helps doing
+randconfig builds.
+
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Acked-by: Linus Walleij <linus.walleij@linaro.org>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20210927141045.1597593-1-arnd@kernel.org
+Cc: Anders Roxell <anders.roxell@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/chips/Kconfig |    2 ++
+ drivers/mtd/maps/Kconfig  |    2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/mtd/chips/Kconfig
++++ b/drivers/mtd/chips/Kconfig
+@@ -55,12 +55,14 @@ choice
+ 	  LITTLE_ENDIAN_BYTE, if the bytes are reversed.
+ 
+ config MTD_CFI_NOSWAP
++	depends on !ARCH_IXP4XX || CPU_BIG_ENDIAN
+ 	bool "NO"
+ 
+ config MTD_CFI_BE_BYTE_SWAP
+ 	bool "BIG_ENDIAN_BYTE"
+ 
+ config MTD_CFI_LE_BYTE_SWAP
++	depends on !ARCH_IXP4XX
+ 	bool "LITTLE_ENDIAN_BYTE"
+ 
+ endchoice
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
+@@ -302,7 +302,7 @@ config MTD_DC21285
+ 
+ config MTD_IXP4XX
+ 	tristate "CFI Flash device mapped on Intel IXP4xx based systems"
+-	depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX
++	depends on MTD_CFI && MTD_COMPLEX_MAPPINGS && ARCH_IXP4XX && MTD_CFI_ADV_OPTIONS
+ 	help
+ 	  This enables MTD access to flash devices on platforms based
+ 	  on Intel's IXP4xx family of network processors such as the
diff --git a/queue-5.15/series b/queue-5.15/series
index e8d6c9acf05..97f9d3dd6b6 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -25,3 +25,4 @@ alsa-hda-alc287-add-lenovo-ideapad-slim-9i-14itl5-speaker-quirk.patch
 alsa-hda-tegra-fix-tegra194-hda-reset-failure.patch
 alsa-hda-realtek-add-quirk-for-legion-y9000x-2020.patch
 alsa-hda-realtek-re-order-quirk-entries-for-lenovo.patch
+mtd-fixup-cfi-on-ixp4xx.patch