Skip to content

Commit 3f592a8

Browse files
committed
mtd: spi-nor: spansion: Consider reserved bits in CFR5 register
CFR5[6] is reserved bit and must be always 1. Set it to comply with flash requirements. While fixing SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_{EN, DS} definition, stop using magic numbers and describe the missing bit fields in CFR5 register. This is useful for both readability and future possible addition of Octal STR mode support. Fixes: c3266af ("mtd: spi-nor: spansion: add support for Cypress Semper flash") Cc: stable@vger.kernel.org Reported-by: Takahiro Kuwano <Takahiro.Kuwano@infineon.com> Signed-off-by: Tudor Ambarus <tudor.ambarus@linaro.org> Reviewed-by: Dhruva Gole <d-gole@ti.com> Reviewed-by: Pratyush Yadav <ptyadav@amazon.de> Tested-by: Dhruva Gole <d-gole@ti.com> Link: https://lore.kernel.org/linux-mtd/20230110164703.83413-1-tudor.ambarus@linaro.org
1 parent 25e3f30 commit 3f592a8

1 file changed

Lines changed: 7 additions & 2 deletions

File tree

drivers/mtd/spi-nor/spansion.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,13 @@
2121
#define SPINOR_REG_CYPRESS_CFR3V 0x00800004
2222
#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4) /* Page size. */
2323
#define SPINOR_REG_CYPRESS_CFR5V 0x00800006
24-
#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x3
25-
#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_DS 0
24+
#define SPINOR_REG_CYPRESS_CFR5_BIT6 BIT(6)
25+
#define SPINOR_REG_CYPRESS_CFR5_DDR BIT(1)
26+
#define SPINOR_REG_CYPRESS_CFR5_OPI BIT(0)
27+
#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN \
28+
(SPINOR_REG_CYPRESS_CFR5_BIT6 | SPINOR_REG_CYPRESS_CFR5_DDR | \
29+
SPINOR_REG_CYPRESS_CFR5_OPI)
30+
#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_DS SPINOR_REG_CYPRESS_CFR5_BIT6
2631
#define SPINOR_OP_CYPRESS_RD_FAST 0xee
2732

2833
/* Cypress SPI NOR flash operations. */

0 commit comments

Comments
 (0)