From 504215b9f68e26938eea75afcbc22bdf389af991 Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Sat, 22 Apr 2017 00:13:15 +0200 Subject: spi25: Fix layering violation in default_spi_write_aai() Change-Id: I8aa3e2992f64906edc669060936f9522d32637fb Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/c/flashrom/+/33649 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- it87spi.c | 2 +- spi25.c | 14 -------------- wbsio_spi.c | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/it87spi.c b/it87spi.c index df9f664c9..13b3aaeee 100644 --- a/it87spi.c +++ b/it87spi.c @@ -115,7 +115,7 @@ static const struct spi_master spi_master_it87xx = { .multicommand = default_spi_send_multicommand, .read = it8716f_spi_chip_read, .write_256 = it8716f_spi_chip_write_256, - .write_aai = default_spi_write_aai, + .write_aai = spi_chip_write_1, }; static uint16_t it87spi_probe(uint16_t port) diff --git a/spi25.c b/spi25.c index cca2a0476..611cd7279 100644 --- a/spi25.c +++ b/spi25.c @@ -743,20 +743,6 @@ int default_spi_write_aai(struct flashctx *flash, const uint8_t *buf, unsigned i JEDEC_AAI_WORD_PROGRAM, }; - switch (flash->mst->spi.type) { -#if CONFIG_INTERNAL == 1 -#if defined(__i386__) || defined(__x86_64__) - case SPI_CONTROLLER_IT87XX: - case SPI_CONTROLLER_WBSIO: - msg_perr("%s: impossible with this SPI controller," - " degrading to byte program\n", __func__); - return spi_chip_write_1(flash, buf, start, len); -#endif -#endif - default: - break; - } - /* The even start address and even length requirements can be either * honored outside this function, or we can call spi_byte_program * for the first and/or last byte and use AAI for the rest. diff --git a/wbsio_spi.c b/wbsio_spi.c index ccd227bf4..d7651c092 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -72,7 +72,7 @@ static const struct spi_master spi_master_wbsio = { .multicommand = default_spi_send_multicommand, .read = wbsio_spi_read, .write_256 = spi_chip_write_1, - .write_aai = default_spi_write_aai, + .write_aai = spi_chip_write_1, }; int wbsio_check_for_spi(void) -- cgit v1.2.3