Merge branch 'u-boot-pxa/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / drivers / hwmon / adm1021.c

diff --git a/drivers/hwmon/adm1021.c b/drivers/hwmon/adm1021.c
index b791ec0415b1e9254988e5b140067524daf3d34c..d074cb72311ab529e519304765e47fab73f0aef8 100644 (file)
--- 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)
@@ -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(CFG_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)