Resend: [PATCH 1/6] MacBookAir3,1(3,2) applesmc support

[gimli]

Typo fixed patch.

Signed-off-by: Edgar (gimli) Hucek <gimli@xxxxxxxxxxxxxx>

On Wed, 03 Nov 2010 11:21:35 +0100, Henrik Rydberg <rydberg@xxxxxxxxxxx>
wrote:
> On 11/03/2010 10:39 AM, gimli wrote:
> 
>> On Tue, 02 Nov 2010 17:43:28 +0100, Henrik Rydberg <rydberg@xxxxxxxxxxx>
>> wrote:
>>> On 11/02/2010 08:17 AM, gimli wrote:
>>>
>>>> This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the
>>>> applesmc driver.
>>>>
>>>> Signed-off-by: Edgar (gimli) Hucek <gimli@xxxxxxxxxxxxxx>
>>>
>>>
>>> Thanks for this information. The patch is conflicting with a makeover
>>> currently
>>> on review, but it is a candidate for inclusion in 2.6.37 and stable.
>>>
>>>>  /* List of keys used to read/write fan speeds */
>>>> @@ -1524,11 +1528,21 @@
>>>>  	{ .accelerometer = 1, .light = 1, .temperature_set = 21 },
>>>>  /* MacBook Pro 7,1: accelerometer, backlight and temperature set 22
*/
>>>>  	{ .accelerometer = 1, .light = 1, .temperature_set = 22 },
>>>> +/* MacBook Air 3,1: accelerometer, backlight and temperature set 15
*/
>>>> +	{ .accelerometer = 0, .light = 0, .temperature_set = 23 },
>>>>  };
>>>
>>> Comment "temperature set 15" is confusing.
>>>
>> 
>> This is a copy and paste error. Should be :
>> 
>> +/* MacBook Air 3,1(2): temperature set 23 */
>> 
>> 
>> 
>>>>  /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
>>>>   * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
>>>>  static __initdata struct dmi_system_id applesmc_whitelist[] = {
>>>> +	{ applesmc_dmi_match, "Apple MacBook Air 3", {
>>>> +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
>>>> +	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,2") },
>>>> +		&applesmc_dmi_data[23]},
>>>> +	{ applesmc_dmi_match, "Apple MacBook Air 3", {
>>>> +	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
>>>> +	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,1") },
>>>> +		&applesmc_dmi_data[23]},
>>>
>>> What is the different between models 3,1 and 3,2? If there is no
>>> difference, a
>>> single entry will suffice.
>> 
>> They are both the same.
> 
> 
> Great - would you care to resend the patch with the changes incorporated?
> 
> Thanks,
> Henrikdiff -uNr linux-2.6.35/drivers/hwmon/applesmc.c linux-2.6.35-MacbookAir/drivers/hwmon/applesmc.c
--- linux-2.6.35/drivers/hwmon/applesmc.c	2010-08-02 00:11:14.000000000 +0200
+++ linux-2.6.35-MacbookAir/drivers/hwmon/applesmc.c	2010-10-24 07:45:02.085679002 +0200
@@ -162,6 +162,10 @@
 /* Set 22: MacBook Pro 7,1 */
 	{ "TB0T", "TB1T", "TB2T", "TC0D", "TC0P", "TN0D", "TN0P", "TN0S",
 	  "TN1D", "TN1F", "TN1G", "TN1S", "Th1H", "Ts0P", "Ts0S", NULL },
+/* Set 23: MacBook Air 3,1(2) */
+	{ "TB0T", "TB1T", "TB2T", "TC0D", "TC0E", "TC0P", "TC1E", "TCZ3",
+	  "TCZ4", "TCZ5", "TG0E", "TG1E", "TG2E", "TGZ3", "TGZ4", "TGZ5",
+	  "TH0F", "TH0O", "TM0P" },
 };
 
 /* List of keys used to read/write fan speeds */
@@ -1524,11 +1528,21 @@
 	{ .accelerometer = 1, .light = 1, .temperature_set = 21 },
 /* MacBook Pro 7,1: accelerometer, backlight and temperature set 22 */
 	{ .accelerometer = 1, .light = 1, .temperature_set = 22 },
+/* MacBook Air 3,1(2): temperature set 23 */
+	{ .accelerometer = 0, .light = 0, .temperature_set = 23 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
  * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
 static __initdata struct dmi_system_id applesmc_whitelist[] = {
+	{ applesmc_dmi_match, "Apple MacBook Air 3", {
+	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,2") },
+		&applesmc_dmi_data[23]},
+	{ applesmc_dmi_match, "Apple MacBook Air 3", {
+	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir3,1") },
+		&applesmc_dmi_data[23]},
 	{ applesmc_dmi_match, "Apple MacBook Air 2", {
 	  DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
 	  DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") },