aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sfc/sfe4001.c
diff options
context:
space:
mode:
authorBen Hutchings <bhutchings@solarflare.com>2009-01-29 12:51:48 -0500
committerDavid S. Miller <davem@davemloft.net>2009-01-30 17:06:31 -0500
commit44176b45d1aae04d99c505e6ee98d2d3c3fce173 (patch)
tree43a25dccf4305829cc0b8cbdb48de925d6801aee /drivers/net/sfc/sfe4001.c
parent67797763c60bfe3bbf99ef81ce1042e71678d109 (diff)
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/sfe4001.c')
-rw-r--r--drivers/net/sfc/sfe4001.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/net/sfc/sfe4001.c b/drivers/net/sfc/sfe4001.c
index c7c95db2af6d..853057e87fb2 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)
375 i2c_unregister_device(efx->board_info.hwmon_client); 375 i2c_unregister_device(efx->board_info.hwmon_client);
376} 376}
377 377
378static struct i2c_board_info sfn4111t_hwmon_info = { 378static struct i2c_board_info sfn4111t_a0_hwmon_info = {
379 I2C_BOARD_INFO("max6647", 0x4e), 379 I2C_BOARD_INFO("max6647", 0x4e),
380 .irq = -1, 380 .irq = -1,
381}; 381};
382 382
383static struct i2c_board_info sfn4111t_r5_hwmon_info = {
384 I2C_BOARD_INFO("max6646", 0x4d),
385 .irq = -1,
386};
387
383int sfn4111t_init(struct efx_nic *efx) 388int sfn4111t_init(struct efx_nic *efx)
384{ 389{
385 int rc; 390 int rc;
386 391
387 efx->board_info.hwmon_client = 392 efx->board_info.hwmon_client =
388 i2c_new_device(&efx->i2c_adap, &sfn4111t_hwmon_info); 393 i2c_new_device(&efx->i2c_adap,
394 (efx->board_info.minor < 5) ?
395 &sfn4111t_a0_hwmon_info :
396 &sfn4111t_r5_hwmon_info);
389 if (!efx->board_info.hwmon_client) 397 if (!efx->board_info.hwmon_client)
390 return -EIO; 398 return -EIO;
391 399