[lm-sensors] [PATCH] applesmc - add temperature sensors set for

[lm-sensors] [PATCH] applesmc - add temperature sensors set for

[Nicolas Boichat]

Hello,

This patch improves temperature readings on Macbook (non-Pro).

It applies cleanly after applesmc-switch-to-using-input-polldev.patch in 
-mm, but it is logically independent.

Best regards,

Nicolas

applesmc: Add temperature sensors set on Macbook (non-pro).

From: Martin Szulecki <mactel@sukimashita.com>
Signed-off-by: Nicolas Boichat <nicolas@boichat.ch>

---

 drivers/hwmon/applesmc.c |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index eb81a64..232cbad 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -79,11 +79,15 @@
 
 /*
  * Temperature sensors keys (sp78 - 2 bytes).
- * First set for Macbook(Pro), second for Macmini.
  */
 static const char* temperature_sensors_sets[][13] = {
+/* Set 0: Macbook Pro */
 	{ "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
 	  "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
+/* Set 1: Macbook set */
+	{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S",
+	  "Th1H", "Ts0P", NULL },
+/* Set 2: Macmini set */
 	{ "TC0D", "TC0P", NULL }
 };
 
@@ -1129,10 +1133,10 @@ static void applesmc_release_accelerometer(void)
 static __initdata struct dmi_match_data applesmc_dmi_data[] = {
 /* MacBook Pro: accelerometer, backlight and temperature set 0 */
 	{ .accelerometer = 1, .light = 1, .temperature_set = 0 },
-/* MacBook: accelerometer and temperature set 0 */
-	{ .accelerometer = 1, .light = 0, .temperature_set = 0 },
-/* MacBook: temperature set 1 */
-	{ .accelerometer = 0, .light = 0, .temperature_set = 1 }
+/* MacBook: accelerometer and temperature set 1 */
+	{ .accelerometer = 1, .light = 0, .temperature_set = 1 },
+/* MacMini: temperature set 2 */
+	{ .accelerometer = 0, .light = 0, .temperature_set = 2 }
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".


_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH] applesmc - add temperature sensors set for

[Jean Delvare]

Hi Nicolas,

On Fri, 29 Jun 2007 23:04:45 +0200, Nicolas Boichat wrote:
> applesmc: Add temperature sensors set on Macbook (non-pro).
> 
> From: Martin Szulecki <mactel@sukimashita.com>
> Signed-off-by: Nicolas Boichat <nicolas@boichat.ch>
> 
> ---
> 
>  drivers/hwmon/applesmc.c |   14 +++++++++-----
>  1 files changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
> index eb81a64..232cbad 100644
> --- a/drivers/hwmon/applesmc.c
> +++ b/drivers/hwmon/applesmc.c
> @@ -79,11 +79,15 @@
>  
>  /*
>   * Temperature sensors keys (sp78 - 2 bytes).
> - * First set for Macbook(Pro), second for Macmini.
>   */
>  static const char* temperature_sensors_sets[][13] = {
> +/* Set 0: Macbook Pro */
>  	{ "TA0P", "TB0T", "TC0D", "TC0P", "TG0H", "TG0P", "TG0T", "Th0H",
>  	  "Th1H", "Tm0P", "Ts0P", "Ts1P", NULL },
> +/* Set 1: Macbook set */
> +	{ "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TN1P", "Th0H", "Th0S",
> +	  "Th1H", "Ts0P", NULL },
> +/* Set 2: Macmini set */
>  	{ "TC0D", "TC0P", NULL }
>  };
>  
> @@ -1129,10 +1133,10 @@ static void applesmc_release_accelerometer(void)
>  static __initdata struct dmi_match_data applesmc_dmi_data[] = {
>  /* MacBook Pro: accelerometer, backlight and temperature set 0 */
>  	{ .accelerometer = 1, .light = 1, .temperature_set = 0 },
> -/* MacBook: accelerometer and temperature set 0 */
> -	{ .accelerometer = 1, .light = 0, .temperature_set = 0 },
> -/* MacBook: temperature set 1 */
> -	{ .accelerometer = 0, .light = 0, .temperature_set = 1 }
> +/* MacBook: accelerometer and temperature set 1 */
> +	{ .accelerometer = 1, .light = 0, .temperature_set = 1 },
> +/* MacMini: temperature set 2 */
> +	{ .accelerometer = 0, .light = 0, .temperature_set = 2 }
>  };

You should add a trailing comma to the last item of such arrays, it
makes patches easier in case you need to add more entries in the future.

>  
>  /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".

Other than that (and the fact that I can't test it), patch looks good.

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors