diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2009-01-29 17:51:48 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-30 14:06:31 -0800 |
| commit | 44176b45d1aae04d99c505e6ee98d2d3c3fce173 (patch) | |
| tree | 43a25dccf4305829cc0b8cbdb48de925d6801aee /drivers/net/sfc | |
| parent | 67797763c60bfe3bbf99ef81ce1042e71678d109 (diff) | |
| download | kernel_samsung_smdk4412-44176b45d1aae04d99c505e6ee98d2d3c3fce173.zip kernel_samsung_smdk4412-44176b45d1aae04d99c505e6ee98d2d3c3fce173.tar.gz kernel_samsung_smdk4412-44176b45d1aae04d99c505e6ee98d2d3c3fce173.tar.bz2 | |
sfc: Update board info for hardware monitor on SFN4111T-R5 and later
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
| -rw-r--r-- | drivers/net/sfc/sfe4001.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/sfc/sfe4001.c b/drivers/net/sfc/sfe4001.c index c7c95db..853057e 100644 --- a/drivers/net/sfc/sfe4001.c +++ b/drivers/net/sfc/sfe4001.c @@ -375,17 +375,25 @@ static void sfn4111t_fini(struct efx_nic *efx) i2c_unregister_device(efx->board_info.hwmon_client); } -static struct i2c_board_info sfn4111t_hwmon_info = { +static struct i2c_board_info sfn4111t_a0_hwmon_info = { I2C_BOARD_INFO("max6647", 0x4e), .irq = -1, }; +static struct i2c_board_info sfn4111t_r5_hwmon_info = { + I2C_BOARD_INFO("max6646", 0x4d), + .irq = -1, +}; + int sfn4111t_init(struct efx_nic *efx) { int rc; efx->board_info.hwmon_client = - i2c_new_device(&efx->i2c_adap, &sfn4111t_hwmon_info); + i2c_new_device(&efx->i2c_adap, + (efx->board_info.minor < 5) ? + &sfn4111t_a0_hwmon_info : + &sfn4111t_r5_hwmon_info); if (!efx->board_info.hwmon_client) return -EIO; |