Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 529586dc39b0ec47c6290c4e7bed6ea3ffd1d8fb

Authored by Bolko Maass
Committed by Benjamin Herrenschmidt
1 parent 9d2f7342d0
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 2 additions and 0 deletions Side-by-side Diff

drivers/macintosh/windfarm_smu_controls.c
Diff comments   View file @ 529586d
... ... @@ -202,6 +202,8 @@
202 202 fct->ctrl.name = "cpu-front-fan-1";
203 203 else if (!strcmp(l, "CPU A PUMP"))
204 204 fct->ctrl.name = "cpu-pump-0";
  205 + else if (!strcmp(l, "CPU B PUMP"))
  206 + fct->ctrl.name = "cpu-pump-1";
205 207 else if (!strcmp(l, "Slots Fan") || !strcmp(l, "Slots fan") ||
206 208 !strcmp(l, "EXPANSION SLOTS INTAKE"))
207 209 fct->ctrl.name = "slots-fan";