* [PATCH 1/6] MacBookAir3,1(3,2) applesmc support
@ 2010-11-02 7:17 gimli
2010-11-02 16:43 ` Henrik Rydberg
0 siblings, 1 reply; 6+ messages in thread
From: gimli @ 2010-11-02 7:17 UTC (permalink / raw)
To: linux-kernel
[-- Attachment #1: Type: text/plain, Size: 146 bytes --]
This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the
applesmc driver.
Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com>
[-- Attachment #2: applesmc_macnbookair.patch --]
[-- Type: text/plain, Size: 1746 bytes --]
diff -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 */
+ { "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: accelerometer, backlight and temperature set 15 */
+ { .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") },
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 1/6] MacBookAir3,1(3,2) applesmc support 2010-11-02 7:17 [PATCH 1/6] MacBookAir3,1(3,2) applesmc support gimli @ 2010-11-02 16:43 ` Henrik Rydberg 2010-11-03 9:39 ` gimli 0 siblings, 1 reply; 6+ messages in thread From: Henrik Rydberg @ 2010-11-02 16:43 UTC (permalink / raw) To: gimli; +Cc: linux-kernel 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@dark-green.com> 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. > /* 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. Thanks, Henrik ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/6] MacBookAir3,1(3,2) applesmc support 2010-11-02 16:43 ` Henrik Rydberg @ 2010-11-03 9:39 ` gimli 2010-11-03 10:21 ` Henrik Rydberg 0 siblings, 1 reply; 6+ messages in thread From: gimli @ 2010-11-03 9:39 UTC (permalink / raw) To: linux-kernel; +Cc: Henrik Rydberg On Tue, 02 Nov 2010 17:43:28 +0100, Henrik Rydberg <rydberg@euromail.se> 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@dark-green.com> > > > 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. lg Edgar (gimli) Hucek > Thanks, > Henrik > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/6] MacBookAir3,1(3,2) applesmc support 2010-11-03 9:39 ` gimli @ 2010-11-03 10:21 ` Henrik Rydberg 2010-11-03 10:41 ` Resend: " gimli 0 siblings, 1 reply; 6+ messages in thread From: Henrik Rydberg @ 2010-11-03 10:21 UTC (permalink / raw) To: gimli; +Cc: linux-kernel On 11/03/2010 10:39 AM, gimli wrote: > On Tue, 02 Nov 2010 17:43:28 +0100, Henrik Rydberg <rydberg@euromail.se> > 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@dark-green.com> >> >> >> 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, Henrik ^ permalink raw reply [flat|nested] 6+ messages in thread
* Resend: [PATCH 1/6] MacBookAir3,1(3,2) applesmc support 2010-11-03 10:21 ` Henrik Rydberg @ 2010-11-03 10:41 ` gimli 2010-11-03 11:28 ` Henrik Rydberg 0 siblings, 1 reply; 6+ messages in thread From: gimli @ 2010-11-03 10:41 UTC (permalink / raw) To: Henrik Rydberg; +Cc: linux-kernel [-- Attachment #1: Type: text/plain, Size: 2139 bytes --] Typo fixed patch. Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com> On Wed, 03 Nov 2010 11:21:35 +0100, Henrik Rydberg <rydberg@euromail.se> wrote: > On 11/03/2010 10:39 AM, gimli wrote: > >> On Tue, 02 Nov 2010 17:43:28 +0100, Henrik Rydberg <rydberg@euromail.se> >> 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@dark-green.com> >>> >>> >>> 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, > Henrik [-- Attachment #2: applesmc_macnbookair.patch --] [-- Type: text/plain, Size: 1723 bytes --] diff -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") }, ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Resend: [PATCH 1/6] MacBookAir3,1(3,2) applesmc support 2010-11-03 10:41 ` Resend: " gimli @ 2010-11-03 11:28 ` Henrik Rydberg 0 siblings, 0 replies; 6+ messages in thread From: Henrik Rydberg @ 2010-11-03 11:28 UTC (permalink / raw) To: gimli; +Cc: linux-kernel On 11/03/2010 11:41 AM, gimli wrote: > Typo fixed patch. > > Signed-off-by: Edgar (gimli) Hucek <gimli@dark-green.com> Still two entries... Ok, I can correct this patch myself and incorporate it in the upcoming rebase, which will follow after some discussions regarding the patches currently on review. I would also suggest that you please read through the documentation on how to submit patches, to better help the maintainers and make your submissions smoother. Thanks, Henrik ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-11-03 11:28 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-11-02 7:17 [PATCH 1/6] MacBookAir3,1(3,2) applesmc support gimli 2010-11-02 16:43 ` Henrik Rydberg 2010-11-03 9:39 ` gimli 2010-11-03 10:21 ` Henrik Rydberg 2010-11-03 10:41 ` Resend: " gimli 2010-11-03 11:28 ` Henrik Rydberg
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox