diff options
author | Étienne Bersac <bersace@gmail.com> | 2008-04-29 15:39:55 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-04-29 15:57:35 +1000 |
commit | 80ff974dba8cc432ab81676fc09d3c357cb11276 (patch) | |
tree | b775a81b3ceca1a6df40fec751293d0398c7c36f /drivers/macintosh/windfarm_smu_controls.c | |
parent | 21e38dfee53a2159d14a24a3d2277ae757599efa (diff) | |
download | kernel-crypto-80ff974dba8cc432ab81676fc09d3c357cb11276.tar.gz kernel-crypto-80ff974dba8cc432ab81676fc09d3c357cb11276.tar.xz kernel-crypto-80ff974dba8cc432ab81676fc09d3c357cb11276.zip |
[POWERPC] windfarm: Add PowerMac 12,1 support
This implements a new driver named windfarm_pm121, which drives the
fans on PowerMac 12,1 machines : iMac G5 iSight (rev C) 17" and
20". It's based on the windfarm_pm81 driver from Benjamin
Herrenschmidt.
This includes fixes from David Woodhouse correcting the names of some
of the sensors.
Signed-off-by: Étienne Bersac <bersace@gmail.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/macintosh/windfarm_smu_controls.c')
-rw-r--r-- | drivers/macintosh/windfarm_smu_controls.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c index 58c2590f05e..961fa0e7c2c 100644 --- a/drivers/macintosh/windfarm_smu_controls.c +++ b/drivers/macintosh/windfarm_smu_controls.c @@ -218,6 +218,10 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node, fct->ctrl.name = "cpu-fan"; else if (!strcmp(l, "Hard Drive") || !strcmp(l, "Hard drive")) fct->ctrl.name = "drive-bay-fan"; + else if (!strcmp(l, "HDD Fan")) /* seen on iMac G5 iSight */ + fct->ctrl.name = "hard-drive-fan"; + else if (!strcmp(l, "ODD Fan")) /* same */ + fct->ctrl.name = "optical-drive-fan"; /* Unrecognized fan, bail out */ if (fct->ctrl.name == NULL) |