projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
at91sam9/at91cap: move nand drivers to drivers/mtd/nand
[oweals/u-boot.git]
/
drivers
/
hwmon
/
ds1775.c
diff --git
a/drivers/hwmon/ds1775.c
b/drivers/hwmon/ds1775.c
index 0fbb0b42a789d96fd4448c6fe2a929e578860ccf..80fb26f7b5ae9e40277a8a2239583e68fed1c7ef 100644
(file)
--- a/
drivers/hwmon/ds1775.c
+++ b/
drivers/hwmon/ds1775.c
@@
-21,11
+21,14
@@
#include <common.h>
#include <common.h>
-#ifdef CONFIG_DTT_DS1775
#include <i2c.h>
#include <dtt.h>
#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
+#define DTT_TEMP_OS 0x3
int dtt_read(int sensor, int reg)
{
int dtt_read(int sensor, int reg)
{
@@
-102,7
+105,7
@@
static int _dtt_init(int sensor)
/*
* Setup High Temp
*/
/*
* Setup High Temp
*/
- val = ((C
FG
_DTT_MAX_TEMP * 2) << 7) & 0xff80;
+ val = ((C
ONFIG_SYS
_DTT_MAX_TEMP * 2) << 7) & 0xff80;
if (dtt_write(sensor, DTT_TEMP_OS, val) != 0)
return 1;
udelay(50000); /* Max 50ms */
if (dtt_write(sensor, DTT_TEMP_OS, val) != 0)
return 1;
udelay(50000); /* Max 50ms */
@@
-110,7
+113,7
@@
static int _dtt_init(int sensor)
/*
* Setup Low Temp - hysteresis
*/
/*
* Setup Low Temp - hysteresis
*/
- val = (((C
FG_DTT_MAX_TEMP - CFG
_DTT_HYSTERESIS) * 2) << 7) & 0xff80;
+ val = (((C
ONFIG_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 */
if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0)
return 1;
udelay(50000); /* Max 50ms */
@@
-151,6
+154,3
@@
int dtt_get_temp(int sensor)
{
return (dtt_read(sensor, DTT_READ_TEMP) / 256);
}
{
return (dtt_read(sensor, DTT_READ_TEMP) / 256);
}
-
-
-#endif /* CONFIG_DTT_DS1775 */