]>
Commit | Line | Data |
---|---|---|
b7ca0ba0 SL |
1 | From 89194d1d6fb61dce22f5207740e0553c700e4adb Mon Sep 17 00:00:00 2001 |
2 | From: Sasha Levin <sashal@kernel.org> | |
3 | Date: Sun, 11 Feb 2024 00:45:51 +0300 | |
4 | Subject: mtd: rawnand: meson: fix scrambling mode value in command macro | |
5 | ||
6 | From: Arseniy Krasnov <avkrasnov@salutedevices.com> | |
7 | ||
8 | [ Upstream commit ef6f463599e16924cdd02ce5056ab52879dc008c ] | |
9 | ||
10 | Scrambling mode is enabled by value (1 << 19). NFC_CMD_SCRAMBLER_ENABLE | |
11 | is already (1 << 19), so there is no need to shift it again in CMDRWGEN | |
12 | macro. | |
13 | ||
14 | Signed-off-by: Arseniy Krasnov <avkrasnov@salutedevices.com> | |
15 | Cc: <Stable@vger.kernel.org> | |
16 | Fixes: 8fae856c5350 ("mtd: rawnand: meson: add support for Amlogic NAND flash controller") | |
17 | Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> | |
18 | Link: https://lore.kernel.org/linux-mtd/20240210214551.441610-1-avkrasnov@salutedevices.com | |
19 | Signed-off-by: Sasha Levin <sashal@kernel.org> | |
20 | --- | |
21 | drivers/mtd/nand/raw/meson_nand.c | 2 +- | |
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
23 | ||
24 | diff --git a/drivers/mtd/nand/raw/meson_nand.c b/drivers/mtd/nand/raw/meson_nand.c | |
25 | index 6bb0fca4a91d0..9a64190f30e9b 100644 | |
26 | --- a/drivers/mtd/nand/raw/meson_nand.c | |
27 | +++ b/drivers/mtd/nand/raw/meson_nand.c | |
28 | @@ -59,7 +59,7 @@ | |
29 | #define CMDRWGEN(cmd_dir, ran, bch, short_mode, page_size, pages) \ | |
30 | ( \ | |
31 | (cmd_dir) | \ | |
32 | - ((ran) << 19) | \ | |
33 | + (ran) | \ | |
34 | ((bch) << 14) | \ | |
35 | ((short_mode) << 13) | \ | |
36 | (((page_size) & 0x7f) << 6) | \ | |
37 | -- | |
38 | 2.43.0 | |
39 |