diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-11-29 10:10:44 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-29 20:23:54 -0500 |
commit | 76884835684411264cda2f15585261eb02183541 (patch) | |
tree | 585b42235745acf3bf161838b14682428175e670 /drivers/net/sfc/net_driver.h | |
parent | c1c4f453b61463df4df16f7aa5782fc0cfe05b9e (diff) |
sfc: Extend MTD driver for use with new NICs
In new NICs flash is managed by firmware and we will use high-level
operations on partitions rather than direct SPI commands. Add support
for multiple MTD partitions per flash device and remove the direct
link between MTD and SPI devices. Maintain a list of MTD partitions
in struct efx_nic.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc/net_driver.h')
-rw-r--r-- | drivers/net/sfc/net_driver.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/sfc/net_driver.h b/drivers/net/sfc/net_driver.h index 452f83510b0d..e1534ba6ad79 100644 --- a/drivers/net/sfc/net_driver.h +++ b/drivers/net/sfc/net_driver.h | |||
@@ -674,10 +674,11 @@ union efx_multicast_hash { | |||
674 | * interrupt is handled. It is used by falcon_test_interrupt() | 674 | * interrupt is handled. It is used by falcon_test_interrupt() |
675 | * to verify that an interrupt has occurred. | 675 | * to verify that an interrupt has occurred. |
676 | * @spi_flash: SPI flash device | 676 | * @spi_flash: SPI flash device |
677 | * This field will be %NULL if no flash device is present. | 677 | * This field will be %NULL if no flash device is present (or for Siena). |
678 | * @spi_eeprom: SPI EEPROM device | 678 | * @spi_eeprom: SPI EEPROM device |
679 | * This field will be %NULL if no EEPROM device is present. | 679 | * This field will be %NULL if no EEPROM device is present (or for Siena). |
680 | * @spi_lock: SPI bus lock | 680 | * @spi_lock: SPI bus lock |
681 | * @mtd_list: List of MTDs attached to the NIC | ||
681 | * @n_rx_nodesc_drop_cnt: RX no descriptor drop count | 682 | * @n_rx_nodesc_drop_cnt: RX no descriptor drop count |
682 | * @nic_data: Hardware dependant state | 683 | * @nic_data: Hardware dependant state |
683 | * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode, | 684 | * @mac_lock: MAC access lock. Protects @port_enabled, @phy_mode, |
@@ -759,6 +760,9 @@ struct efx_nic { | |||
759 | struct efx_spi_device *spi_flash; | 760 | struct efx_spi_device *spi_flash; |
760 | struct efx_spi_device *spi_eeprom; | 761 | struct efx_spi_device *spi_eeprom; |
761 | struct mutex spi_lock; | 762 | struct mutex spi_lock; |
763 | #ifdef CONFIG_SFC_MTD | ||
764 | struct list_head mtd_list; | ||
765 | #endif | ||
762 | 766 | ||
763 | unsigned n_rx_nodesc_drop_cnt; | 767 | unsigned n_rx_nodesc_drop_cnt; |
764 | 768 | ||