diff options
| author | Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> | 2011-05-11 17:07:07 +0000 |
|---|---|---|
| committer | Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de> | 2011-05-11 17:07:07 +0000 |
| commit | b9dbe48b77384e2faf0619161fc5c55afe388ea9 (patch) | |
| tree | 8b556f82073e824bc1e9a4cc9547d67b1d902cee /sb600spi.c | |
| parent | 627975196d0630a137548df631756e656a8139af (diff) | |
| download | flashrom-b9dbe48b77384e2faf0619161fc5c55afe388ea9.tar.gz flashrom-b9dbe48b77384e2faf0619161fc5c55afe388ea9.tar.bz2 flashrom-b9dbe48b77384e2faf0619161fc5c55afe388ea9.zip | |
Kill central list of SPI programmers
Remove the array spi_programmer, replace it by dynamic registration
instead. Also initially start with no busses supported, and switch to
the default non-SPI only for the internal programmer.
Also this patch changes the initialization for the buses_supported variable
from "everything-except-SPI" to "nothing". All programmers have to set the
bus type on their own, and this enables register_spi_programmer to just add
the SPI both for on-board SPI interfaces (where the internal programmer
already detected the other bus types), as well as for external programmers
(where we have the default "none").
Corresponding to flashrom svn r1299.
Signed-off-by: Michael Karcher <flashrom@mkarcher.dialup.fu-berlin.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Diffstat (limited to 'sb600spi.c')
| -rw-r--r-- | sb600spi.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/sb600spi.c b/sb600spi.c index 269af8a0b..37aac3b62 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -89,7 +89,7 @@ static void execute_command(void) ; } -int sb600_spi_send_command(unsigned int writecnt, unsigned int readcnt, +static int sb600_spi_send_command(unsigned int writecnt, unsigned int readcnt, const unsigned char *writearr, unsigned char *readarr) { int count; @@ -192,6 +192,16 @@ int sb600_spi_send_command(unsigned int writecnt, unsigned int readcnt, return 0; } +static const struct spi_programmer spi_programmer_sb600 = { + .type = SPI_CONTROLLER_SB600, + .max_data_read = 8, + .max_data_write = 5, + .command = sb600_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, +}; + int sb600_probe_spi(struct pci_dev *dev) { struct pci_dev *smbus_dev; @@ -304,8 +314,7 @@ int sb600_probe_spi(struct pci_dev *dev) /* Bring the FIFO to a clean state. */ reset_internal_fifo_pointer(); - buses_supported |= CHIP_BUSTYPE_SPI; - spi_controller = SPI_CONTROLLER_SB600; + register_spi_programmer(&spi_programmer_sb600); return 0; } |