| Date | Wed, 16 Dec 2009 19:56:10 -0800 | From | Greg KH <> | Subject | [073/151] powerpc/windfarm: Add detection for second cpu pump |
| |
2.6.32-stable review patch. If anyone has any objections, please let us know.
------------------
From: Bolko Maass <krautilein@gmx.de>
commit 529586dc39b0ec47c6290c4e7bed6ea3ffd1d8fb upstream.
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> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- drivers/macintosh/windfarm_smu_controls.c | 2 ++ 1 file changed, 2 insertions(+)
--- 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_c 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";
|