From 29ce13c0fe319817e9130db335ecc61e9152d312 Mon Sep 17 00:00:00 2001 From: Grant Coady Date: Fri, 13 May 2005 20:26:10 +1000 Subject: [PATCH] --- yaml --- r: 2708 b: refs/heads/master c: 8e8f9289cc5b781d583d5aed935abf060207bbd3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/chips/adm9240.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 99f744fe46b7..4ef980eee3db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 937df8df907ce63b0f7e19adf6e3cdef1687fac3 +refs/heads/master: 8e8f9289cc5b781d583d5aed935abf060207bbd3 diff --git a/trunk/drivers/i2c/chips/adm9240.c b/trunk/drivers/i2c/chips/adm9240.c index 0b67eab15d2d..6d609d89e790 100644 --- a/trunk/drivers/i2c/chips/adm9240.c +++ b/trunk/drivers/i2c/chips/adm9240.c @@ -165,7 +165,7 @@ struct adm9240_data { s8 temp_high; /* rw temp1_max */ s8 temp_hyst; /* rw temp1_max_hyst */ u16 alarms; /* ro alarms */ - u8 aout; /* rw analog_out */ + u8 aout; /* rw aout_output */ u8 vid; /* ro vid */ u8 vrm; /* -- vrm set on startup, no accessor */ }; @@ -192,7 +192,7 @@ static ssize_t show_##value(struct device *dev, char *buf) \ } show_temp(temp_high, 1000); show_temp(temp_hyst, 1000); -show_temp(temp, 500); +show_temp(temp, 500); /* 0.5'C per bit */ #define set_temp(value, reg) \ static ssize_t set_##value(struct device *dev, const char *buf, \ @@ -630,6 +630,9 @@ static void adm9240_init_client(struct i2c_client *client) data->vrm = i2c_which_vrm(); /* need this to report vid as mV */ + dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10, + data->vrm % 10); + if (conf & 1) { /* measurement cycle running: report state */ dev_info(&client->dev, "status: config 0x%02x mode %u\n",