Patchwork [2.6.31] windfarm: add detection for second cpu pump

login
register
mail settings
Submitter Bolko Maass
Date Nov. 27, 2009, 3:44 p.m.
Message ID <20091127164433.0b5087de.krautilein@gmx.de>
Download mbox | patch
Permalink /patch/39630/
State Accepted
Headers show

Comments

Bolko Maass - Nov. 27, 2009, 3:44 p.m.
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>
Benjamin Herrenschmidt - Nov. 27, 2009, 9:36 p.m.
On Fri, 2009-11-27 at 16:44 +0100, Bolko Maass wrote:
> 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.
> 

Thanks.

BTW. The Signed-off-by: line normally goes -before- the patch :-) (And
after the description).

I'll get that upstream asap.

Cheers,
Ben.

> 
> diff -uprN a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
> --- a/drivers/macintosh/windfarm_smu_controls.c 2009-11-27 16:24:55.000000000 +0100
> +++ b/drivers/macintosh/windfarm_smu_controls.c 2009-11-16 18:22:33.000000000 +0100
> @@ -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";
> 
> 
> 
> Signed-off by: Bolko Maass <bmaass@math.uni-bremen.de>
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev@lists.ozlabs.org
> https://lists.ozlabs.org/listinfo/linuxppc-dev

Patch

diff -uprN a/drivers/macintosh/windfarm_smu_controls.c b/drivers/macintosh/windfarm_smu_controls.c
--- a/drivers/macintosh/windfarm_smu_controls.c 2009-11-27 16:24:55.000000000 +0100
+++ b/drivers/macintosh/windfarm_smu_controls.c 2009-11-16 18:22:33.000000000 +0100
@@ -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";