diff --git a/CHANGES b/CHANGES index 6f4bf167..e4ea34d5 100644 --- a/CHANGES +++ b/CHANGES @@ -18,12 +18,12 @@ ask CVS about it: ----------------------------------------------------------------------------- 2.8.5 (2004XXXX) - File doc/chips/SUMMART: Update + File doc/chips/SUMMARY: Update File etc/sensors.conf.eg: Epox 8K3A tweaks. (Kronos) Module fscher: Rename fanN_min to pwmN (Reinhard Nissl) Module lm80: Code cleanups - Module vt1211: Fix bitmask in uch_config read and write - Module vt8231: Fix bitmask in uch_config read and write + Module vt1211: Fix bitmask in uch_config read and write; remove in6 and temp1 + Module vt8231: Fix bitmask in uch_config read and write; remove in6 and temp1 Module w83627hf: Add w83637hf support Fix exported name Fix PWM in w83627thf @@ -35,7 +35,7 @@ ask CVS about it: Reverse temporary changes to w83l785ts mappings Fix vt1211 and vt8231 uch_config not being writable Add 2.6 lm80 support - Add w83637hf support + Add w83637hf support 2.8.4 (20040207) @@ -243,7 +243,7 @@ ask CVS about it: Improve LM82 and LM83 detection Handle "to-be-written" cleanly Add detection for 47M14x Super I/O - Handle the one-address-many-chips-same-driver + Handle the one-address-many-chips-same-driver case diff --git a/kernel/chips/vt1211.c b/kernel/chips/vt1211.c index 7035ead3..88fb3795 100644 --- a/kernel/chips/vt1211.c +++ b/kernel/chips/vt1211.c @@ -301,10 +301,13 @@ static ctl_table vt1211_dir_table_template[] = { &i2c_sysctl_real, NULL, &vt1211_in}, {VT1211_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &vt1211_in}, +/* + datasheet says these are reserved {VT1211_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &vt1211_in}, {VT1211_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &vt1211_temp}, +*/ {VT1211_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &vt1211_temp}, {VT1211_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, @@ -498,7 +501,7 @@ static void vt1211_update_client(struct i2c_client *client) if ((jiffies - data->last_updated > HZ + HZ / 2) || (jiffies < data->last_updated) || !data->valid) { data->uch_config = vt_rdval(client, VT1211_REG_UCH_CONFIG); - for (i = 0; i <= 6; i++) { + for (i = 0; i <= 5; i++) { if(ISVOLT(i, data->uch_config)) { data->in[i] = vt_rdval(client, VT1211_REG_IN(i)); data->in_min[i] = vt_rdval(client, @@ -516,7 +519,7 @@ static void vt1211_update_client(struct i2c_client *client) data->fan_min[i - 1] = vt_rdval(client, VT1211_REG_FAN_MIN(i)); } - for (i = 1; i <= 7; i++) { + for (i = 2; i <= 7; i++) { if(ISTEMP(i, data->uch_config)) { data->temp[i - 1] = vt_rdval(client, VT1211_REG_TEMP(i)) << 2; diff --git a/kernel/chips/vt8231.c b/kernel/chips/vt8231.c index 87fdfc85..fccfdcdd 100644 --- a/kernel/chips/vt8231.c +++ b/kernel/chips/vt8231.c @@ -260,10 +260,13 @@ static ctl_table vt8231_dir_table_template[] = { &i2c_sysctl_real, NULL, &vt8231_in}, {VT8231_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &vt8231_in}, +/* + not in 8231 {VT8231_SYSCTL_IN6, "in6", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &vt8231_in}, {VT8231_SYSCTL_TEMP, "temp1", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &vt8231_temp}, +*/ {VT8231_SYSCTL_TEMP2, "temp2", NULL, 0, 0644, NULL, &i2c_proc_real, &i2c_sysctl_real, NULL, &vt8231_temp}, {VT8231_SYSCTL_TEMP3, "temp3", NULL, 0, 0644, NULL, @@ -470,7 +473,7 @@ static void vt8231_update_client(struct i2c_client *client) if ((jiffies - data->last_updated > HZ + HZ / 2) || (jiffies < data->last_updated) || !data->valid) { data->uch_config = vt_rdval(client, VT8231_REG_UCH_CONFIG); - for (i = 0; i <= 6; i++) { + for (i = 0; i <= 5; i++) { if(ISVOLT(i, data->uch_config)) { data->in[i] = vt_rdval(client, VT8231_REG_IN(i)); data->in_min[i] = vt_rdval(client, @@ -488,7 +491,7 @@ static void vt8231_update_client(struct i2c_client *client) data->fan_min[i - 1] = vt_rdval(client, VT8231_REG_FAN_MIN(i)); } - for (i = 1; i <= 7; i++) { + for (i = 2; i <= 7; i++) { if(ISTEMP(i, data->uch_config)) { data->temp[i - 1] = vt_rdval(client, VT8231_REG_TEMP(i)) << 2;