summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorBolko Maass <krautilein@gmx.de>2009-11-27 05:44:33 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-12-08 16:01:10 +1100
commit529586dc39b0ec47c6290c4e7bed6ea3ffd1d8fb (patch)
tree005f442b7daedf06b6eb9f0b3354972e1861b1db /drivers/macintosh
parent9d2f7342d08896338890904351490739c1035d43 (diff)
downloadlinux-stable-529586dc39b0ec47c6290c4e7bed6ea3ffd1d8fb.tar.gz
linux-stable-529586dc39b0ec47c6290c4e7bed6ea3ffd1d8fb.tar.bz2
linux-stable-529586dc39b0ec47c6290c4e7bed6ea3ffd1d8fb.zip
powerpc/windfarm: Add detection for second cpu pump
Windfarm SMU control is explicitly missing support for a second CPU pump in G5 PowerMacs. Such machines actually exist (specifically Quads with a second pump), so this patch adds detection for it. Signed-off by: Bolko Maass <bmaass@math.uni-bremen.de> CC: <stable@kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/windfarm_smu_controls.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
index 961fa0e7c2cf..6c68b9e5f5c4 100644
--- a/drivers/macintosh/windfarm_smu_controls.c
+++ b/drivers/macintosh/windfarm_smu_controls.c
@@ -202,6 +202,8 @@ static struct smu_fan_control *smu_fan_create(struct device_node *node,
fct->ctrl.name = "cpu-front-fan-1";
else if (!strcmp(l, "CPU A PUMP"))
fct->ctrl.name = "cpu-pump-0";
+ else if (!strcmp(l, "CPU B PUMP"))
+ fct->ctrl.name = "cpu-pump-1";
else if (!strcmp(l, "Slots Fan") || !strcmp(l, "Slots fan") ||
!strcmp(l, "EXPANSION SLOTS INTAKE"))
fct->ctrl.name = "slots-fan";