]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mtd: rawnand: meson: fix scrambling mode value in command macro
authorArseniy Krasnov <avkrasnov@salutedevices.com>
Sat, 10 Feb 2024 21:45:51 +0000 (00:45 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 3 Apr 2024 13:11:12 +0000 (15:11 +0200)
[ Upstream commit ef6f463599e16924cdd02ce5056ab52879dc008c ]

Scrambling mode is enabled by value (1 << 19). NFC_CMD_SCRAMBLER_ENABLE
is already (1 << 19), so there is no need to shift it again in CMDRWGEN
macro.

Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com>
Cc: <Stable@vger.kernel.org>
Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller")
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20240210214551.441610-1-avkrasnov@salutedevices.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/mtd/nand/raw/meson_nand.c

index 71ec4052e52a689d056aff07802dde7b738f74ef..b3a881cbcd23b83ddce9462a83a3864ac666daf3 100644 (file)
@@ -63,7 +63,7 @@
 #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages)      \
        (                                                               \
                (cmd_dir)                       |                       \
-               ((ran) << 19)                   |                       \
+               (ran)                           |                       \
                ((bch) << 14)                   |                       \
                ((short_mode) << 13)            |                       \
                (((page_size) & 0x7f) << 6)     |                       \