@@ -10,6 +10,7 @@
/* flash_info mfr_flag. Used to clear sticky prorietary SR bits. */
#define USE_CLSR BIT(0)
+#define DEF_4BAM BIT(1) /* 4-byte address mode by default */
#define SPINOR_OP_CLSR 0x30 /* Clear status register 1 */
#define SPINOR_OP_RD_ANY_REG 0x65 /* Read any register */
@@ -581,6 +582,17 @@ static int spansion_nor_sr_ready_and_clear(struct spi_nor *nor)
return !(nor->bouncebuf[0] & SR_WIP);
}
+static int
+spansion_post_bfpt_fixup(struct spi_nor *nor,
+ const struct sfdp_parameter_header *bfpt_header,
+ const struct sfdp_bfpt *bfpt)
+{
+ if (nor->info->mfr_flags & DEF_4BAM)
+ nor->params->addr_mode_nbytes = 4;
+
+ return 0;
+}
+
static void spansion_nor_late_init(struct spi_nor *nor)
{
if (nor->params->size > SZ_16M) {
@@ -595,6 +607,7 @@ static void spansion_nor_late_init(struct spi_nor *nor)
}
static const struct spi_nor_fixups spansion_nor_fixups = {
+ .post_bfpt = spansion_post_bfpt_fixup,
.late_init = spansion_nor_late_init,
};