[PATCH linux dev-5.8] mtd: spi-nor: sfdp: Revert "default to addr_width of 3 for configurable widths"

[Joel Stanley]

This reverts commit f9acd7fa80be6ee14aecdc54429f2a48e56224e8 which
breaks mounting of UBI volumes with the aspeed-smc driver:

 ubi0: default fastmap pool size: 25
 ubi0: default fastmap WL pool size: 12
 ubi0: attaching mtd3
 ubi0: scanning is finished
 ubi0 error: ubi_read_volume_table: the layout volume was not found
 ubi0 error: ubi_attach_mtd_dev: failed to attach mtd3, error -22

Found by bisecting between v5.7 and v5.8.

Fixes: f9acd7fa80be ("mtd: spi-nor: sfdp: default to addr_width of 3 for configurable widths")
Signed-off-by: Joel Stanley <joel at jms.id.au>
---
This identifies why we are seeing SPI NOR failures on v5.8. There is
potentially a fix that needs to be made in the aspeed-smc driver instead
of reverting the core spi-nor change.

Signed-off-by: Joel Stanley <joel at jms.id.au>
---
 drivers/mtd/spi-nor/sfdp.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/mtd/spi-nor/sfdp.c b/drivers/mtd/spi-nor/sfdp.c
index 55c0c508464b..9db07182e9c8 100644
--- a/drivers/mtd/spi-nor/sfdp.c
+++ b/drivers/mtd/spi-nor/sfdp.c
@@ -456,7 +456,6 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
 	/* Number of address bytes. */
 	switch (bfpt.dwords[BFPT_DWORD(1)] & BFPT_DWORD1_ADDRESS_BYTES_MASK) {
 	case BFPT_DWORD1_ADDRESS_BYTES_3_ONLY:
-	case BFPT_DWORD1_ADDRESS_BYTES_3_OR_4:
 		nor->addr_width = 3;
 		break;
 
-- 
2.28.0