From b88e7b3cc022241d6582733b0c389d3d1887335f Mon Sep 17 00:00:00 2001 From: Dirk Eibach Date: Thu, 13 Oct 2011 23:23:12 +0000 Subject: [PATCH] hwmon: Provide dtt_init() Our boards rely on dtt for initialization of fan hardware. dtt_init() was implemented to be called form board specific code. Signed-off-by: Dirk Eibach Acked-by: Heiko Schocher Tested-by: Heiko Schocher --- common/cmd_dtt.c | 42 +++++++++++++++++++++++++++++++++--------- include/dtt.h | 1 + 2 files changed, 34 insertions(+), 9 deletions(-) diff --git a/common/cmd_dtt.c b/common/cmd_dtt.c index 5bba12d4d0..cd94423d21 100644 --- a/common/cmd_dtt.c +++ b/common/cmd_dtt.c @@ -30,6 +30,36 @@ static unsigned long sensor_initialized; +static void _initialize_dtt(void) +{ + int i; + unsigned char sensors[] = CONFIG_DTT_SENSORS; + + for (i = 0; i < sizeof(sensors); i++) { + if ((sensor_initialized & (1 << i)) == 0) { + if (dtt_init_one(sensors[i]) != 0) { + printf("DTT%d: Failed init!\n", i); + continue; + } + sensor_initialized |= (1 << i); + } + } +} + +void dtt_init(void) +{ + int old_bus; + + /* switch to correct I2C bus */ + old_bus = I2C_GET_BUS(); + I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); + + _initialize_dtt(); + + /* switch back to original I2C bus */ + I2C_SET_BUS(old_bus); +} + int do_dtt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { int i; @@ -42,20 +72,14 @@ int do_dtt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) old_bus = I2C_GET_BUS(); I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); + _initialize_dtt(); + /* * Loop through sensors, read * temperature, and output it. */ - for (i = 0; i < sizeof(sensors); i++) { - if ((sensor_initialized & (1 << i)) == 0) { - if (dtt_init_one(sensors[i]) != 0) { - printf("DTT%d: Failed init!\n", i); - continue; - } - sensor_initialized |= (1 << i); - } + for (i = 0; i < sizeof(sensors); i++) printf("DTT%d: %i C\n", i + 1, dtt_get_temp(sensors[i])); - } /* switch back to original I2C bus */ I2C_SET_BUS(old_bus); diff --git a/include/dtt.h b/include/dtt.h index 9e6c08c5c8..6d5534de41 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -52,6 +52,7 @@ #endif #endif /* CONFIG_DTT_ADM1021 */ +extern void dtt_init(void); extern int dtt_init_one(int); extern int dtt_read(int sensor, int reg); extern int dtt_write(int sensor, int reg, int val);