linux/drivers/macintosh, branch v3.6

powerpc/windfarm: Fix crash on SMU based machine after i2c conversion

2012-05-09T00:58:21Z

We no longer get the device node in platform_data but instead where it belongs in struct device, so get it from there instead of blowing up. Signed-off-by: Benjamin Herrenschmidt

powerpc/windfarm: don't pass const strings to snprintf

2012-05-03T06:54:54Z

Fixes these build warnings: drivers/macintosh/windfarm_smu_sat.c: In function 'wf_sat_probe': drivers/macintosh/windfarm_smu_sat.c:290:3: warning: passing argument 1 of 'snprintf' discards qualifiers from pointer target type include/linux/kernel.h:323:5: note: expected 'char *' but argument is of type 'const char *' drivers/macintosh/windfarm_smu_sat.c:317:3: warning: passing argument 1 of 'snprintf' discards qualifiers from pointer target type include/linux/kernel.h:323:5: note: expected 'char *' but argument is of type 'const char *' Introduced by commit e074d08e2b98 ("powerpc/windfarm: const'ify and add "priv" field to controls & sensors"). Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt

powerpc/windfarm: fix compiler warning

2012-05-03T06:54:53Z

Fixes this warning: drivers/macintosh/windfarm_pm91.c: In function 'wf_smu_cpu_fans_tick': drivers/macintosh/windfarm_pm91.c:237:2: warning: passing argument 1 of 'wf_sensor_get' from incompatible pointer type drivers/macintosh/windfarm.h:124:19: note: expected 'struct wf_sensor *' but argument is of type 'struct wf_sensor **' Introduced by commit 33e6820b767a ("powerpc/windfarm: Add useful accessors"). Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt

powerpc/powermac: New windfarm driver for PowerMac G5 (AGP) and Xserve G5

2012-04-30T05:37:25Z

This replaces the old therm_pm72 using the same windfarm infrastructure that was used for other PowerMac G5 models. The fan speeds and sensors should now be visible in the same location in sysfs. The driver is split into separate core modules for PowerMac7,2 (and 7,3) and RackMac3,1, with a lot of the shared code now in the separate sensor and control modules. Signed-off-by: Benjamin Herrenschmidt

powerpc/windfarm: Add Fan Control Unit controls for G5s

2012-04-30T05:37:25Z

The FCU operates the fans on the earlier generation G5 machines, this module will be used by upcoming windfarm drivers. Signed-off-by: Benjamin Herrenschmidt

powerpc/windfarm: Updates to lm75 and max6690 sensors

2012-04-30T05:37:24Z

This allows those modules to load on PowerMac7,2 PowerMac7,3 and RackMac3,1 and add the sensor name conversion for those machines. This will be used by the corresponding new windfarm modules for those machines. Note that since therm_pm72 is linked first, it will still take priority on those i2c devices if built-in. If using modules it will depend which is loaded first, but you should avoid building therm_pm72 if you are using the new windfarm drivers Signed-off-by: Benjamin Herrenschmidt

powerpc/windfarm: Add lm87 sensor

2012-04-30T05:37:21Z

For use by the upcoming windfarm_rm31 Signed-off-by: Benjamin Herrenschmidt

powerpc/windfarm: Add ad7417 sensor

2012-04-30T05:37:21Z

For user by the upcoming windfarm_pm72 and windfarm_rm31 Signed-off-by: Benjamin Herrenschmidt

powerpc/windfarm: Add useful accessors

2012-04-30T05:37:20Z

Makes the code more readable Signed-off-by: Benjamin Herrenschmidt

powerpc/windfarm: Improve display of fan speeds in sysfs

2012-04-30T05:37:20Z

Controls registered as RPM and PWM fans are now displayed with the "RPM" or "%" suffix respectively to make it clearer to the user what the value actually means since the fan type isn't otherwise obvious. Signed-off-by: Benjamin Herrenschmidt