From 054b95205a37b63ef87013d755d950952326fdc8 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Wed, 18 Apr 2012 22:16:54 +0000 Subject: [PATCH] --- yaml --- r: 305355 b: refs/heads/master c: d839ba2ab2f3270fe4f067e082a7233ba06bcf9c h: refs/heads/master i: 305353: 532a41befb8584e310644867456313159faaf52b 305351: 351eaa309240835883e83f39568f115f6f8643a7 v: v3 --- [refs] | 2 +- trunk/drivers/macintosh/windfarm_lm75_sensor.c | 11 ++++++----- trunk/drivers/macintosh/windfarm_max6690_sensor.c | 11 +++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 68e225d9c33d..6db389f06d76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 08fe5bc75f8c43042963dee4f33c9c6cb7791b69 +refs/heads/master: d839ba2ab2f3270fe4f067e082a7233ba06bcf9c diff --git a/trunk/drivers/macintosh/windfarm_lm75_sensor.c b/trunk/drivers/macintosh/windfarm_lm75_sensor.c index 4cc3f935709d..b0c2d3695b34 100644 --- a/trunk/drivers/macintosh/windfarm_lm75_sensor.c +++ b/trunk/drivers/macintosh/windfarm_lm75_sensor.c @@ -116,6 +116,12 @@ static int wf_lm75_probe(struct i2c_client *client, name = "optical-drive-temp"; else if (!strcmp(loc, "HD Temp")) name = "hard-drive-temp"; + else if (!strcmp(loc, "PCI SLOTS")) + name = "slots-temp"; + else if (!strcmp(loc, "CPU A INLET")) + name = "cpu-inlet-temp-0"; + else if (!strcmp(loc, "CPU B INLET")) + name = "cpu-inlet-temp-1"; else return -ENXIO; @@ -170,11 +176,6 @@ static struct i2c_driver wf_lm75_driver = { static int __init wf_lm75_sensor_init(void) { - /* Don't register on old machines that use therm_pm72 for now */ - if (of_machine_is_compatible("PowerMac7,2") || - of_machine_is_compatible("PowerMac7,3") || - of_machine_is_compatible("RackMac3,1")) - return -ENODEV; return i2c_add_driver(&wf_lm75_driver); } diff --git a/trunk/drivers/macintosh/windfarm_max6690_sensor.c b/trunk/drivers/macintosh/windfarm_max6690_sensor.c index f4902f4cf8cb..371b058d2f7d 100644 --- a/trunk/drivers/macintosh/windfarm_max6690_sensor.c +++ b/trunk/drivers/macintosh/windfarm_max6690_sensor.c @@ -74,7 +74,11 @@ static int wf_max6690_probe(struct i2c_client *client, return -ENXIO; } - if (!strcmp(loc, "BACKSIDE")) + /* + * We only expose the external temperature register for + * now as this is all we need for our control loops + */ + if (!strcmp(loc, "BACKSIDE") || !strcmp(loc, "SYS CTRLR AMBIENT")) name = "backside-temp"; else if (!strcmp(loc, "NB Ambient")) name = "north-bridge-temp"; @@ -128,11 +132,6 @@ static struct i2c_driver wf_max6690_driver = { static int __init wf_max6690_sensor_init(void) { - /* Don't register on old machines that use therm_pm72 for now */ - if (of_machine_is_compatible("PowerMac7,2") || - of_machine_is_compatible("PowerMac7,3") || - of_machine_is_compatible("RackMac3,1")) - return -ENODEV; return i2c_add_driver(&wf_max6690_driver); }