spi25: Remove now obsolete `four_bytes_addr_funcs` path
Change-Id: Idb7c576cb159630da2268813388b497cb5f46b43
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22386
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/flashchips.c b/flashchips.c
index 4bf71c5..439c05f 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -8135,13 +8135,6 @@
.page_size = 256,
/* OTP: 512B total; enter 0xB1, exit 0xC1 */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT,
- .four_bytes_addr_funcs =
- {
- .set_4ba = spi_enter_4ba_b7, /* enter 4-bytes addressing mode by CMD B7 */
- .read_nbyte = spi_nbyte_read_4ba, /* read from 4-bytes addressing mode */
- .program_byte = spi_byte_program_4ba, /* write from 4-bytes addressing mode */
- .program_nbyte = spi_nbyte_program_4ba /* write from 4-bytes addressing mode */
- },
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@@ -8149,13 +8142,13 @@
{
{
.eraseblocks = { {4 * 1024, 8192} },
- .block_erase = spi_block_erase_20_4ba,
+ .block_erase = spi_block_erase_20,
}, {
.eraseblocks = { {32 * 1024, 1024} },
- .block_erase = spi_block_erase_52_4ba,
+ .block_erase = spi_block_erase_52,
}, {
.eraseblocks = { {64 * 1024, 512} },
- .block_erase = spi_block_erase_d8_4ba,
+ .block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {32 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_60,
@@ -8169,6 +8162,7 @@
.unlock = spi_disable_blockprotect_bp3_srwd,
.write = spi_chip_write_256,
.read = spi_chip_read, /* Fast read (0x0B) supported */
+ .set_4ba = spi_enter_4ba_b7,
.voltage = {2700, 3600},
},
@@ -8182,13 +8176,6 @@
.page_size = 256,
/* OTP: 512B total; enter 0xB1, exit 0xC1 */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT,
- .four_bytes_addr_funcs =
- {
- .set_4ba = spi_enter_4ba_b7, /* enter 4-bytes addressing mode by CMD B7 */
- .read_nbyte = spi_nbyte_read_4ba, /* read from 4-bytes addressing mode */
- .program_byte = spi_byte_program_4ba, /* write from 4-bytes addressing mode */
- .program_nbyte = spi_nbyte_program_4ba /* write from 4-bytes addressing mode */
- },
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@@ -8196,13 +8183,13 @@
{
{
.eraseblocks = { {4 * 1024, 16384} },
- .block_erase = spi_block_erase_20_4ba,
+ .block_erase = spi_block_erase_20,
}, {
.eraseblocks = { {32 * 1024, 2048} },
- .block_erase = spi_block_erase_52_4ba,
+ .block_erase = spi_block_erase_52,
}, {
.eraseblocks = { {64 * 1024, 1024} },
- .block_erase = spi_block_erase_d8_4ba,
+ .block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {64 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_60,
@@ -8216,6 +8203,7 @@
.unlock = spi_disable_blockprotect_bp3_srwd,
.write = spi_chip_write_256,
.read = spi_chip_read, /* Fast read (0x0B) supported */
+ .set_4ba = spi_enter_4ba_b7,
.voltage = {2700, 3600},
},
@@ -9929,12 +9917,6 @@
/* supports SFDP */
/* OTP: 64B total; read 0x4B, write 0x42 */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT | FEATURE_4BA_READ | FEATURE_4BA_WRITE,
- .four_bytes_addr_funcs =
- {
- .read_nbyte = spi_nbyte_read_4ba_direct,
- .program_byte = spi_byte_program_4ba_direct,
- .program_nbyte = spi_nbyte_program_4ba_direct
- },
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@@ -9968,12 +9950,6 @@
/* supports SFDP */
/* OTP: 64B total; read 0x4B, write 0x42 */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT | FEATURE_4BA_READ | FEATURE_4BA_WRITE,
- .four_bytes_addr_funcs =
- {
- .read_nbyte = spi_nbyte_read_4ba_direct,
- .program_byte = spi_byte_program_4ba_direct,
- .program_nbyte = spi_nbyte_program_4ba_direct
- },
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@@ -14852,13 +14828,6 @@
/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
/* FOUR_BYTE_ADDR: supports 4-bytes addressing mode */
.feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_SUPPORT | FEATURE_4BA_READ,
- .four_bytes_addr_funcs =
- {
- .set_4ba = spi_enter_4ba_b7_we, /* enter 4-bytes addressing mode by CMD B7 + WREN */
- .read_nbyte = spi_nbyte_read_4ba_direct, /* read directly from any mode, no need to enter 4ba */
- .program_byte = spi_byte_program_4ba, /* write from 4-bytes addressing mode */
- .program_nbyte = spi_nbyte_program_4ba /* write from 4-bytes addressing mode */
- },
.tested = TEST_OK_PREW,
.probe = probe_spi_rdid,
.probe_timing = TIMING_ZERO,
@@ -14866,13 +14835,13 @@
{
{
.eraseblocks = { {4 * 1024, 8192} },
- .block_erase = spi_block_erase_20_4ba, /* erases 4k from 4-bytes addressing mode */
+ .block_erase = spi_block_erase_20,
}, {
.eraseblocks = { {32 * 1024, 1024} },
- .block_erase = spi_block_erase_52_4ba, /* erases 32k from 4-bytes addressing mode */
+ .block_erase = spi_block_erase_52,
}, {
.eraseblocks = { {64 * 1024, 512} },
- .block_erase = spi_block_erase_d8_4ba, /* erases 64k from 4-bytes addressing mode */
+ .block_erase = spi_block_erase_d8,
}, {
.eraseblocks = { {32 * 1024 * 1024, 1} },
.block_erase = spi_block_erase_60,
@@ -14885,6 +14854,7 @@
.unlock = spi_disable_blockprotect,
.write = spi_chip_write_256,
.read = spi_chip_read,
+ .set_4ba = spi_enter_4ba_b7_we,
.voltage = {2700, 3600},
},