Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363044
b: refs/heads/master
c: 0fc1f8f
h: refs/heads/master
v: v3
  • Loading branch information
Guenter Roeck committed Apr 8, 2013
1 parent a9ad39f commit 1d7cf38
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e9285b0bb2ab48924032147baa29699c0bbee7c
refs/heads/master: 0fc1f8fc614ca0fef78011b34ef8da638eb9acea
30 changes: 24 additions & 6 deletions trunk/drivers/hwmon/nct6775.c
Original file line number Diff line number Diff line change
Expand Up @@ -3401,6 +3401,8 @@ static int nct6775_probe(struct platform_device *pdev)
const u16 *reg_temp, *reg_temp_over, *reg_temp_hyst, *reg_temp_config;
const u16 *reg_temp_alternate, *reg_temp_crit;
int num_reg_temp;
bool have_vid = false;
u8 cr2a;

res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!devm_request_region(&pdev->dev, res->start, IOREGION_LENGTH,
Expand Down Expand Up @@ -3769,17 +3771,31 @@ static int nct6775_probe(struct platform_device *pdev)
/* Initialize the chip */
nct6775_init_device(data);

data->vrm = vid_which_vrm();
err = superio_enter(sio_data->sioreg);
if (err)
return err;

cr2a = superio_inb(sio_data->sioreg, 0x2a);
switch (data->kind) {
case nct6775:
have_vid = (cr2a & 0x40);
break;
case nct6776:
have_vid = (cr2a & 0x60) == 0x40;
break;
case nct6779:
break;
}

/*
* Read VID value
* We can get the VID input values directly at logical device D 0xe3.
*/
superio_select(sio_data->sioreg, NCT6775_LD_VID);
data->vid = superio_inb(sio_data->sioreg, 0xe3);
if (have_vid) {
superio_select(sio_data->sioreg, NCT6775_LD_VID);
data->vid = superio_inb(sio_data->sioreg, 0xe3);
data->vrm = vid_which_vrm();
}

if (fan_debounce) {
u8 tmp;
Expand All @@ -3804,9 +3820,11 @@ static int nct6775_probe(struct platform_device *pdev)

superio_exit(sio_data->sioreg);

err = device_create_file(dev, &dev_attr_cpu0_vid);
if (err)
return err;
if (have_vid) {
err = device_create_file(dev, &dev_attr_cpu0_vid);
if (err)
return err;
}

err = nct6775_check_fan_inputs(sio_data, data);
if (err)
Expand Down

0 comments on commit 1d7cf38

Please sign in to comment.