diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/adm1021.c | 27 | ||||
| -rw-r--r-- | drivers/hwmon/adt7460.c | 2 | ||||
| -rw-r--r-- | drivers/hwmon/ds1621.c | 19 | ||||
| -rw-r--r-- | drivers/hwmon/ds1775.c | 19 | ||||
| -rw-r--r-- | drivers/hwmon/lm63.c | 19 | ||||
| -rw-r--r-- | drivers/hwmon/lm73.c | 20 | ||||
| -rw-r--r-- | drivers/hwmon/lm75.c | 29 | ||||
| -rw-r--r-- | drivers/hwmon/lm81.c | 21 | 
8 files changed, 13 insertions, 143 deletions
| diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c index d753e9a72..d074cb723 100644 --- a/drivers/hwmon/adm1021.c +++ b/drivers/hwmon/adm1021.c @@ -109,8 +109,8 @@ dtt_write (int sensor, int reg, int val)  	return 0;  } /* dtt_write() */ -static int -_dtt_init (int sensor) +int +dtt_init_one(int sensor)  {  	dtt_cfg_t *dcp = &dttcfg[sensor >> 1];  	int reg, val; @@ -164,28 +164,7 @@ _dtt_init (int sensor)  		return 1;  	return 0; -} /* _dtt_init() */ - -int -dtt_init (void) -{ -	int i; -	unsigned char sensors[] = CONFIG_DTT_SENSORS; -	const char *const header = "DTT:   "; - -	/* switch to correct I2C bus */ -	I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); - -	for (i = 0; i < sizeof(sensors); i++) { -		if (_dtt_init(sensors[i]) != 0) -			printf ("%s%d FAILED INIT\n", header, i+1); -		else -			printf ("%s%d is %i C\n", header, i+1, -				dtt_get_temp(sensors[i])); -	} - -	return (0); -} /* dtt_init() */ +} /* dtt_init_one() */  int  dtt_get_temp (int sensor) diff --git a/drivers/hwmon/adt7460.c b/drivers/hwmon/adt7460.c index caef70aff..b7e36fe46 100644 --- a/drivers/hwmon/adt7460.c +++ b/drivers/hwmon/adt7460.c @@ -50,7 +50,7 @@ int dtt_write(int sensor, int reg, int val)  	return 0;  } -int dtt_init(void) +int dtt_init_one(int sensor)  {  	printf("ADT7460 at I2C address 0x%2x\n", ADT7460_ADDRESS); diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c index 5a2ea6289..4e1db6dc0 100644 --- a/drivers/hwmon/ds1621.c +++ b/drivers/hwmon/ds1621.c @@ -126,7 +126,7 @@ int dtt_write(int sensor, int reg, int val)  } -static int _dtt_init(int sensor) +int dtt_init_one(int sensor)  {  	int val; @@ -155,23 +155,6 @@ static int _dtt_init(int sensor)  	return 0;  } - -int dtt_init (void) -{ -	int i; -	unsigned char sensors[] = CONFIG_DTT_SENSORS; - -	for (i = 0; i < sizeof(sensors); i++) { -		if (_dtt_init(sensors[i]) != 0) -			printf("DTT%d:  FAILED\n", i + 1); -		else -			printf("DTT%d:  %i C\n", i + 1, dtt_get_temp(sensors[i])); -	} - -	return (0); -} - -  int dtt_get_temp(int sensor)  {  	int i; diff --git a/drivers/hwmon/ds1775.c b/drivers/hwmon/ds1775.c index 80fb26f7b..feabdf221 100644 --- a/drivers/hwmon/ds1775.c +++ b/drivers/hwmon/ds1775.c @@ -98,7 +98,7 @@ int dtt_write(int sensor, int reg, int val)  } -static int _dtt_init(int sensor) +int dtt_init_one(int sensor)  {  	int val; @@ -133,23 +133,6 @@ static int _dtt_init(int sensor)  	return 0;  } - -int dtt_init (void) -{ -	int i; -	unsigned char sensors[] = CONFIG_DTT_SENSORS; - -	for (i = 0; i < sizeof(sensors); i++) { -		if (_dtt_init(sensors[i]) != 0) -			printf("DTT%d:  FAILED\n", i+1); -		else -			printf("DTT%d:  %i C\n", i+1, dtt_get_temp(sensors[i])); -	} - -	return (0); -} - -  int dtt_get_temp(int sensor)  {  	return (dtt_read(sensor, DTT_READ_TEMP) / 256); diff --git a/drivers/hwmon/lm63.c b/drivers/hwmon/lm63.c index 2f1f3cfab..f3adf6485 100644 --- a/drivers/hwmon/lm63.c +++ b/drivers/hwmon/lm63.c @@ -101,7 +101,7 @@ static int is_lm64(int sensor)  	return sensor && (sensor != DTT_I2C_LM63_ADDR);  } -static int _dtt_init(int sensor) +int dtt_init_one(int sensor)  {  	int i;  	int val; @@ -175,20 +175,3 @@ int dtt_get_temp(int sensor)  	/* Ignore LSB for now, U-Boot only prints natural numbers */  	return temp >> 8;  } - -int dtt_init(void) -{ -	int i; -	unsigned char sensors[] = CONFIG_DTT_SENSORS; -	const char *const header = "DTT:   "; - -	for (i = 0; i < sizeof(sensors); i++) { -		if (_dtt_init(sensors[i]) != 0) -			printf("%s%d FAILED INIT\n", header, i + 1); -		else -			printf("%s%d is %i C\n", header, i + 1, -			       dtt_get_temp(sensors[i])); -	} - -	return 0; -} diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c index 7b5d893ff..45cc6db58 100644 --- a/drivers/hwmon/lm73.c +++ b/drivers/hwmon/lm73.c @@ -112,7 +112,7 @@ int dtt_write(int const sensor, int const reg, int const val)  			      dlen);  } /* dtt_write() */ -static int _dtt_init(int const sensor) +int dtt_init_one(int const sensor)  {  	int val; @@ -148,23 +148,7 @@ static int _dtt_init(int const sensor)  	dtt_read(sensor, DTT_CONTROL);	/* clear temperature flags */  	return 0; -} /* _dtt_init() */ - -int dtt_init(void) -{ -	int i; -	unsigned char sensors[] = CONFIG_DTT_SENSORS; -	const char *const header = "DTT:   "; - -	for (i = 0; i < sizeof(sensors); i++) { -		if (0 != _dtt_init(sensors[i])) -			printf("%s%d FAILED INIT\n", header, i + 1); -		else -			printf("%s%d is %i C\n", header, i + 1, -			       dtt_get_temp(sensors[i])); -	} -	return 0; -} /* dtt_init() */ +} /* dtt_init_one() */  int dtt_get_temp(int const sensor)  { diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 81198215f..29c1a392e 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -119,7 +119,7 @@ int dtt_write(int sensor, int reg, int val)  } /* dtt_write() */ -static int _dtt_init(int sensor) +int dtt_init_one(int sensor)  {  	int val; @@ -145,32 +145,7 @@ static int _dtt_init(int sensor)  		return 1;  	return 0; -} /* _dtt_init() */ - - -int dtt_init (void) -{ -	int i; -	unsigned char sensors[] = CONFIG_DTT_SENSORS; -	const char *const header = "DTT:   "; -	int old_bus; - -	/* switch to correct I2C bus */ -	old_bus = I2C_GET_BUS(); -	I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM); - -	for (i = 0; i < sizeof(sensors); i++) { -	if (_dtt_init(sensors[i]) != 0) -		printf("%s%d FAILED INIT\n", header, i+1); -	else -		printf("%s%d is %i C\n", header, i+1, -		dtt_get_temp(sensors[i])); -	} -	/* switch back to original I2C bus */ -	I2C_SET_BUS(old_bus); - -	return (0); -} /* dtt_init() */ +} /* dtt_init_one() */  int dtt_get_temp(int sensor)  { diff --git a/drivers/hwmon/lm81.c b/drivers/hwmon/lm81.c index afe5b0de3..f1572ba27 100644 --- a/drivers/hwmon/lm81.c +++ b/drivers/hwmon/lm81.c @@ -89,7 +89,7 @@ int dtt_write(int sensor, int reg, int val)  #define DTT_CONFIG	0x40  #define DTT_ADR		0x48 -static int _dtt_init(int sensor) +int dtt_init_one(int sensor)  {  	int	man;  	int	adr; @@ -111,26 +111,9 @@ static int _dtt_init(int sensor)  	debug ("DTT:   Found LM81@%x Rev: %d\n", adr, rev);  	return 0; -} /* _dtt_init() */ +} /* dtt_init_one() */ -int dtt_init (void) -{ -    int i; -    unsigned char sensors[] = CONFIG_DTT_SENSORS; -    const char *const header = "DTT:   "; - -    for (i = 0; i < sizeof(sensors); i++) { -	if (_dtt_init(sensors[i]) != 0) -	    printf("%s%d FAILED INIT\n", header, i+1); -	else -	    printf("%s%d is %i C\n", header, i+1, -		   dtt_get_temp(sensors[i])); -    } - -    return (0); -} /* dtt_init() */ -  #define TEMP_FROM_REG(temp) \     ((temp)<256?((((temp)&0x1fe) >> 1) * 10)	 + ((temp) & 1) * 5:  \  	       ((((temp)&0x1fe) >> 1) -255) * 10 - ((temp) & 1) * 5)  \ |