Changeset 2599
- Timestamp:
- 06/19/04 18:24:57 (9 years ago)
- Location:
- lm-sensors/trunk/kernel/chips
- Files:
-
- 2 modified
-
w83627hf.c (modified) (2 diffs)
-
w83781d.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
lm-sensors/trunk/kernel/chips/w83627hf.c
r2594 r2599 854 854 { 855 855 struct w83627hf_data *data = client->data; 856 int vid = 0,i;856 int i; 857 857 int type = data->type; 858 858 u8 tmp; … … 897 897 /* Choose VRM based on "VRM & OVT" register */ 898 898 data->vrm = (data->vrm_ovt & 0x01) ? 90 : 82; 899 900 if (type != w83697hf)901 vid = vid_from_reg(vid, data->vrm);902 899 903 900 tmp = w83627hf_read_value(client, W83781D_REG_SCFG1); -
lm-sensors/trunk/kernel/chips/w83781d.c
r2598 r2599 1265 1265 { 1266 1266 struct w83781d_data *data = client->data; 1267 int vid = 0,i, p;1267 int i, p; 1268 1268 int type = data->type; 1269 1269 u8 tmp; … … 1287 1287 } 1288 1288 1289 if (type != w83697hf) { 1290 vid = w83781d_read_value(client, W83781D_REG_VID_FANDIV) & 0x0f; 1291 vid |= 1292 (w83781d_read_value(client, W83781D_REG_CHIPID) & 0x01) << 4; 1293 if (type == w83791d) { 1294 data->vrm = 90; 1295 } else { 1296 data->vrm = DEFAULT_VRM; 1297 } 1298 vid = vid_from_reg(vid, data->vrm); 1299 } 1289 data->vrm = (type == w83791d) ? 90 : 82; 1300 1290 1301 1291 if ((type != w83781d) && (type != as99127f)) {
