mm-commits.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [merged] hwmon-applesmc-fix-light-sensor-readings-on-newer-macbooks.patch removed from -mm tree
@ 2009-01-16 19:17 akpm
  0 siblings, 0 replies; only message in thread
From: akpm @ 2009-01-16 19:17 UTC (permalink / raw)
  To: murray.alex, nicolas, rydberg, mm-commits


The patch titled
     hwmon: applesmc: fix light sensor readings on newer MacBooks
has been removed from the -mm tree.  Its filename was
     hwmon-applesmc-fix-light-sensor-readings-on-newer-macbooks.patch

This patch was dropped because it was merged into mainline or a subsystem tree

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: hwmon: applesmc: fix light sensor readings on newer MacBooks
From: Alex Murray <murray.alex@gmail.com>

The light sensors ALV0 and ALV1 on newer MacBooks (early 2008 and later)
changed to report 10 bytes instead the earlier 6, and the sensor encoding
subsequently changed.  As a result, the reported light sensors readings
are much too low.

Via experiments leading up to this patch, it seems only the ALV0 is
reporting data, and the most useful value therein is a 10-bit big-endian
value at offset 6.  This suggests that a new protocol was added as a
backward-compatible replacement on top of the old one.

This patch makes applesmc report the improved light sensor reading for the
new machines, on a scale in conformance with earlier ones.

Signed-off-by: Alex Murray <murray.alex@gmail.com>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
Cc: Nicolas Boichat <nicolas@boichat.ch>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/hwmon/applesmc.c |    5 +++++
 1 file changed, 5 insertions(+)

diff -puN drivers/hwmon/applesmc.c~hwmon-applesmc-fix-light-sensor-readings-on-newer-macbooks drivers/hwmon/applesmc.c
--- a/drivers/hwmon/applesmc.c~hwmon-applesmc-fix-light-sensor-readings-on-newer-macbooks
+++ a/drivers/hwmon/applesmc.c
@@ -590,6 +590,11 @@ static ssize_t applesmc_light_show(struc
 	}
 
 	ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, data_length);
+	/* newer macbooks report a single 10-bit bigendian value */
+	if (data_length == 10) {
+		left = be16_to_cpu(*(__be16 *)(buffer + 6)) >> 2;
+		goto out;
+	}
 	left = buffer[2];
 	if (ret)
 		goto out;
_

Patches currently in -mm which might be from murray.alex@gmail.com are

origin.patch


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-01-16 19:17 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-16 19:17 [merged] hwmon-applesmc-fix-light-sensor-readings-on-newer-macbooks.patch removed from -mm tree akpm

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).