diff options
Diffstat (limited to 'src/southbridge/intel')
| -rw-r--r-- | src/southbridge/intel/common/spi.c | 7 | ||||
| -rw-r--r-- | src/southbridge/intel/fsp_rangeley/spi.c | 7 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c index ee94937291..11318f7ec0 100644 --- a/src/southbridge/intel/common/spi.c +++ b/src/southbridge/intel/common/spi.c @@ -19,6 +19,7 @@ #include <stdlib.h> #include <string.h> #include <bootstate.h> +#include <commonlib/helpers.h> #include <delay.h> #include <arch/io.h> #include <console/console.h> @@ -504,11 +505,6 @@ static int spi_is_multichip (void) return !!((cntlr.flmap0 >> 8) & 3); } -unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len) -{ - return min(cntlr.databytes, buf_len); -} - static int spi_ctrlr_xfer(const struct spi_slave *slave, const void *dout, size_t bytesout, void *din, size_t bytesin) { @@ -660,6 +656,7 @@ static int spi_ctrlr_xfer(const struct spi_slave *slave, const void *dout, static const struct spi_ctrlr spi_ctrlr = { .xfer = spi_ctrlr_xfer, .xfer_vector = spi_xfer_two_vectors, + .max_xfer_size = member_size(ich9_spi_regs, fdata), }; int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) diff --git a/src/southbridge/intel/fsp_rangeley/spi.c b/src/southbridge/intel/fsp_rangeley/spi.c index 0bffeb5293..ee60f7516c 100644 --- a/src/southbridge/intel/fsp_rangeley/spi.c +++ b/src/southbridge/intel/fsp_rangeley/spi.c @@ -17,6 +17,7 @@ #include <stdint.h> #include <stdlib.h> #include <string.h> +#include <commonlib/helpers.h> #include <delay.h> #include <arch/io.h> #include <console/console.h> @@ -569,11 +570,6 @@ static int ich_status_poll(u16 bitmask, int wait_til_set) return -1; } -unsigned int spi_crop_chunk(unsigned int cmd_len, unsigned int buf_len) -{ - return min(cntlr.databytes, buf_len); -} - static int spi_ctrlr_xfer(const struct spi_slave *slave, const void *dout, size_t bytesout, void *din, size_t bytesin) { @@ -725,6 +721,7 @@ spi_xfer_exit: static const struct spi_ctrlr spi_ctrlr = { .xfer = spi_ctrlr_xfer, .xfer_vector = spi_xfer_two_vectors, + .max_xfer_size = member_size(ich10_spi_regs, fdata), }; int spi_setup_slave(unsigned int bus, unsigned int cs, struct spi_slave *slave) |