diff options
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/adm1021.c | 4 | ||||
| -rw-r--r-- | drivers/hwmon/ds1621.c | 4 | ||||
| -rw-r--r-- | drivers/hwmon/ds1775.c | 6 | ||||
| -rw-r--r-- | drivers/hwmon/lm73.c | 4 | ||||
| -rw-r--r-- | drivers/hwmon/lm75.c | 10 | 
5 files changed, 14 insertions, 14 deletions
| diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c index b791ec041..d753e9a72 100644 --- a/drivers/hwmon/adm1021.c +++ b/drivers/hwmon/adm1021.c @@ -81,7 +81,7 @@ typedef  	}  dtt_cfg_t; -dtt_cfg_t dttcfg[] = CFG_DTT_ADM1021; +dtt_cfg_t dttcfg[] = CONFIG_SYS_DTT_ADM1021;  int  dtt_read (int sensor, int reg) @@ -174,7 +174,7 @@ dtt_init (void)  	const char *const header = "DTT:   ";  	/* switch to correct I2C bus */ -	I2C_SET_BUS(CFG_DTT_BUS_NUM); +	I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM);  	for (i = 0; i < sizeof(sensors); i++) {  		if (_dtt_init(sensors[i]) != 0) diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c index 523f8bee5..d15a082df 100644 --- a/drivers/hwmon/ds1621.c +++ b/drivers/hwmon/ds1621.c @@ -125,7 +125,7 @@ static int _dtt_init(int sensor)      /*       * Setup High Temp.       */ -    val = ((CFG_DTT_MAX_TEMP * 2) << 7) & 0xff80; +    val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80;      if (dtt_write(sensor, DTT_TEMP_HIGH, val) != 0)  	return 1;      udelay(50000);				/* Max 50ms */ @@ -133,7 +133,7 @@ static int _dtt_init(int sensor)      /*       * Setup Low Temp - hysteresis.       */ -    val = (((CFG_DTT_MAX_TEMP - CFG_DTT_HYSTERESIS) * 2) << 7) & 0xff80; +    val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80;      if (dtt_write(sensor, DTT_TEMP_LOW, val) != 0)  	return 1;      udelay(50000);				/* Max 50ms */ diff --git a/drivers/hwmon/ds1775.c b/drivers/hwmon/ds1775.c index 6a4d8e56d..80fb26f7b 100644 --- a/drivers/hwmon/ds1775.c +++ b/drivers/hwmon/ds1775.c @@ -24,7 +24,7 @@  #include <i2c.h>  #include <dtt.h> -#define DTT_I2C_DEV_CODE	CFG_I2C_DTT_ADDR /* Dallas Semi's DS1775 device code */ +#define DTT_I2C_DEV_CODE	CONFIG_SYS_I2C_DTT_ADDR /* Dallas Semi's DS1775 device code */  #define DTT_READ_TEMP		0x0  #define DTT_CONFIG		0x1  #define DTT_TEMP_HYST		0x2 @@ -105,7 +105,7 @@ static int _dtt_init(int sensor)  	/*  	 * Setup High Temp  	 */ -	val = ((CFG_DTT_MAX_TEMP * 2) << 7) & 0xff80; +	val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80;  	if (dtt_write(sensor, DTT_TEMP_OS, val) != 0)  		return 1;  	udelay(50000);			/* Max 50ms */ @@ -113,7 +113,7 @@ static int _dtt_init(int sensor)  	/*  	 * Setup Low Temp - hysteresis  	 */ -	val = (((CFG_DTT_MAX_TEMP - CFG_DTT_HYSTERESIS) * 2) << 7) & 0xff80; +	val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80;  	if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0)  		return 1;  	udelay(50000);			/* Max 50ms */ diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c index dd2468353..7b5d893ff 100644 --- a/drivers/hwmon/lm73.c +++ b/drivers/hwmon/lm73.c @@ -124,11 +124,11 @@ static int _dtt_init(int const sensor)  	/*  	 * Setup THIGH (upper-limit) and TLOW (lower-limit) registers  	 */ -	val = CFG_DTT_MAX_TEMP << 7; +	val = CONFIG_SYS_DTT_MAX_TEMP << 7;  	if (dtt_write(sensor, DTT_TEMP_HIGH, val))  		return -1; -	val = CFG_DTT_MIN_TEMP << 7; +	val = CONFIG_SYS_DTT_MIN_TEMP << 7;  	if (dtt_write(sensor, DTT_TEMP_LOW, val))  		return -1;  	/* diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c index 17379e531..81198215f 100644 --- a/drivers/hwmon/lm75.c +++ b/drivers/hwmon/lm75.c @@ -32,8 +32,8 @@  /*   * Device code   */ -#if defined(CFG_I2C_DTT_ADDR) -#define DTT_I2C_DEV_CODE CFG_I2C_DTT_ADDR +#if defined(CONFIG_SYS_I2C_DTT_ADDR) +#define DTT_I2C_DEV_CODE CONFIG_SYS_I2C_DTT_ADDR  #else  #define DTT_I2C_DEV_CODE 0x48			/* ON Semi's LM75 device */  #endif @@ -124,12 +124,12 @@ static int _dtt_init(int sensor)  	int val;  	/* Setup TSET ( trip point ) register */ -	val = ((CFG_DTT_MAX_TEMP * 2) << 7) & 0xff80; /* trip */ +	val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80; /* trip */  	if (dtt_write(sensor, DTT_TEMP_SET, val) != 0)  		return 1;  	/* Setup THYST ( untrip point ) register - Hysteresis */ -	val = (((CFG_DTT_MAX_TEMP - CFG_DTT_HYSTERESIS) * 2) << 7) & 0xff80; +	val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80;  	if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0)  		return 1; @@ -157,7 +157,7 @@ int dtt_init (void)  	/* switch to correct I2C bus */  	old_bus = I2C_GET_BUS(); -	I2C_SET_BUS(CFG_DTT_BUS_NUM); +	I2C_SET_BUS(CONFIG_SYS_DTT_BUS_NUM);  	for (i = 0; i < sizeof(sensors); i++) {  	if (_dtt_init(sensors[i]) != 0) |