Merge remote-tracking branch 'upstream/master'

Conflicts:
	dkms.conf

Author: bboozzoo

.gitignore

@@ -0,0 +1,7 @@
+*.cmd
+*.ko
+*.mod.c
+*.o
+.tmp_versions
+Module.symvers
+modules.order

Makefile

@@ -1,11 +1,11 @@
 ifndef TP_MODULES
 # This part runs as a normal, top-level Makefile:
 X:=$(shell false)
-KVER        := $(shell uname -r)
-KBASE       := /lib/modules/$(KVER)
-KSRC        := $(KBASE)/source
-KBUILD      := $(KBASE)/build
-MOD_DIR     := $(KBASE)/kernel
+KVER        ?= $(shell uname -r)
+KBASE       ?= /lib/modules/$(KVER)
+KSRC        ?= $(KBASE)/source
+KBUILD      ?= $(KBASE)/build
+MOD_DIR     ?= $(KBASE)/kernel
 PWD         := $(shell pwd)
 IDIR        := include/linux
 TP_DIR      := drivers/platform/x86
@@ -25,6 +25,11 @@ else
 THINKPAD_EC_PARAM :=
 endif
 
+ifneq ($(KERNELRELEASE),)
+	obj-m  := $(TP_MODULES)
+else
+endif
+
 DEBUG := 0
 
 .PHONY: default clean modules load unload install patch check_hdaps mk-hdaps.diff \
@@ -78,13 +83,13 @@ ifeq ($(HDAPS),1)
 	rm -f $(MOD_DIR)/extra/hdaps.ko
 endif
 	$(MAKE) -C $(KBUILD) M=$(PWD) O=$(KBUILD) modules_install
-	depmod -a
+	depmod $(KVER)
 
 
 #####################################################################
 # Generate a stand-alone kernel patch
 
-TP_VER := ${shell sed -ne 's/^\#define TP_VERSION \"\(.*\)\"/\1/gp' tp_smapi.c}
+TP_VER := 0.41
 ORG    := a
 NEW    := b
 PATCH  := tp_smapi-$(TP_VER)-for-$(KVER).patch
@@ -149,6 +154,8 @@ check-ver:
 set-version: check-ver
 	perl -i -pe 's/^(tp_smapi version ).*/$${1}$(VER)/' README
 	perl -i -pe 's/^(#define TP_VERSION ").*/$${1}$(VER)"/' thinkpad_ec.c tp_smapi.c
+	perl -i -pe 's/^(TP_VER := ).*/$${1}$(VER)/' Makefile
+	perl -i -pe 's/^(PACKAGE_VERSION=").*/$${1}$(VER)"/' dkms.conf
 
 create-tgz: check-ver
 	git archive  --format=tar --prefix=tp_smapi-$(VER)/ HEAD | gzip -c > $(TGZ)

TODO

@@ -14,4 +14,4 @@ Save and and restore inhibit_charge_minutes across suspend-to-disk, as done
 for charge thresholds (requires the above time calculations too).
 
 Use the new Linux battery model introduced in kernel 2.6.23 (see the kernel's
-Documentation/power_supply_class.txt).
+Documentation/power/power_supply_class.txt).

dkms.conf

@@ -1,16 +1,11 @@
-PACKAGE_VERSION="0.41"
 PACKAGE_NAME="tp_smapi"
-# Makefile expects the list of modules to be passed as TP_MODULES
-# build from kernel tree
-MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build TP_MODULES='thinkpad_ec.o tp_smapi.o hdaps.o' modules"
-# clean from driver three
-CLEAN="make -C ${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
-
-BUILT_MODULE_NAME[0]="tp_smapi"
-BUILT_MODULE_NAME[1]="thinkpad_ec"
+PACKAGE_VERSION="0.41"
+MAKE[0]="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build HDAPS=1"
+CLEAN="make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build clean"
+BUILT_MODULE_NAME[0]="thinkpad_ec"
+BUILT_MODULE_NAME[1]="tp_smapi"
 BUILT_MODULE_NAME[2]="hdaps"
 DEST_MODULE_LOCATION[0]="/extra"
 DEST_MODULE_LOCATION[1]="/extra"
-DEST_MODULE_LOCATION[2]="/extra"
-
+DEST_MODULE_LOCATION[2]="/updates"
 AUTOINSTALL="yes"

hdaps.c

@@ -752,8 +752,10 @@ struct dmi_system_id __initdata hdaps_whitelist[] = {
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X61", HDAPS_ORIENT_SWAP | HDAPS_ORIENT_INVERT_X),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T400s", HDAPS_ORIENT_INVERT_X),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T400", HDAPS_ORIENT_INVERT_XY),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T410s", HDAPS_ORIENT_SWAP),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T410", HDAPS_ORIENT_INVERT_XY),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad T500", HDAPS_ORIENT_INVERT_XY),
+	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad W51O", HDAPS_ORIENT_MAX),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X200", HDAPS_ORIENT_SWAP | HDAPS_ORIENT_INVERT_X | HDAPS_ORIENT_INVERT_Y),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X201 Tablet", HDAPS_ORIENT_SWAP | HDAPS_ORIENT_INVERT_XY),
 	HDAPS_DMI_MATCH_INVERT("LENOVO", "ThinkPad X201s", HDAPS_ORIENT_SWAP | HDAPS_ORIENT_INVERT_XY),