From dc4adff09d3dd32b048645008b67d53887047c00 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Mon, 1 Dec 2008 19:29:37 +0100 Subject: Add support for MacBook Air 2 Signed-off-by: Henrik Rydberg --- Makefile | 2 +- debian/changelog | 6 ++++++ debian/postinst | 2 +- debian/postrm | 2 +- debian/prerm | 2 +- debian/rules | 2 +- usr/src/dkms_source_tree/applesmc.c | 10 ++++++++++ usr/src/dkms_source_tree/dkms.conf | 2 +- 8 files changed, 22 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 8c75829..64240b5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ NAME = applesmc -VERSION = 0.13.1 +VERSION = 0.14.1 SRC = usr/src TARBALL = $(NAME)-$(VERSION).dkms.tar.gz diff --git a/debian/changelog b/debian/changelog index e1d970c..f3c0464 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +applesmc-dkms (0.14.1) unstable; urgency=low + + * Add support for MacBook Air 2 + + -- Henrik Rydberg Sun, 30 Nov 2008 18:32:42 +0100 + applesmc-dkms (0.13.1) unstable; urgency=low * Add autoinstaller directive diff --git a/debian/postinst b/debian/postinst index 5d31b17..6351864 100644 --- a/debian/postinst +++ b/debian/postinst @@ -3,7 +3,7 @@ set -e NAME=applesmc -VERSION=0.13.1 +VERSION=0.14.1 case "$1" in configure) diff --git a/debian/postrm b/debian/postrm index fd37575..454faea 100644 --- a/debian/postrm +++ b/debian/postrm @@ -1,7 +1,7 @@ #!/bin/sh NAME=applesmc -VERSION=0.13.1 +VERSION=0.14.1 set -e diff --git a/debian/prerm b/debian/prerm index 468aede..05315a4 100644 --- a/debian/prerm +++ b/debian/prerm @@ -1,7 +1,7 @@ #!/bin/sh NAME=applesmc -VERSION=0.13.1 +VERSION=0.14.1 set -e diff --git a/debian/rules b/debian/rules index b11bcff..c829ec6 100755 --- a/debian/rules +++ b/debian/rules @@ -5,7 +5,7 @@ #export DH_VERBOSE=1 NAME=applesmc -VERSION=0.13.1 +VERSION=0.14.1 configure: configure-stamp configure-stamp: diff --git a/usr/src/dkms_source_tree/applesmc.c b/usr/src/dkms_source_tree/applesmc.c index dc71080..acd818f 100644 --- a/usr/src/dkms_source_tree/applesmc.c +++ b/usr/src/dkms_source_tree/applesmc.c @@ -131,6 +131,10 @@ static const char* temperature_sensors_sets[][36] = { /* Set 14: iMac 6,1 */ { "TA0P", "TC0D", "TC0H", "TC0P", "TG0D", "TG0H", "TG0P", "TH0P", "TO0P", "Tp0P", NULL }, +/* Set 15: MacBook Air 2,1 */ + { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TN0D", "TTF0", + "TV0P", "TVFP", "TW0P", "Th0P", "Tp0P", "Tp1P", "TpFP", "Ts0P", + "Ts0S", NULL }, }; /* List of keys used to read/write fan speeds */ @@ -1301,11 +1305,17 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = { { .accelerometer = 0, .light = 0, .temperature_set = 13 }, /* iMac 6: light sensor only, temperature set 14 */ { .accelerometer = 0, .light = 0, .temperature_set = 14 }, +/* MacBook Air 2,1: accelerometer, backlight and temperature set 15 */ + { .accelerometer = 1, .light = 1, .temperature_set = 15 }, }; /* 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 2", { + DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), + DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir2") }, + &applesmc_dmi_data[15]}, { applesmc_dmi_match, "Apple MacBook Air", { DMI_MATCH(DMI_BOARD_VENDOR, "Apple"), DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") }, diff --git a/usr/src/dkms_source_tree/dkms.conf b/usr/src/dkms_source_tree/dkms.conf index 325fe0d..06934cf 100644 --- a/usr/src/dkms_source_tree/dkms.conf +++ b/usr/src/dkms_source_tree/dkms.conf @@ -1,5 +1,5 @@ NAME=applesmc -VERSION=0.13.1 +VERSION=0.14.1 PACKAGE_NAME="$NAME" PACKAGE_VERSION="$VERSION" MAKE[0]="make -C ${kernel_source_dir} -- cgit v1.2.3