upd to 4.12 and add id=24 to whitelist

author: vantu5z 2017-09-01 09:13:07 +0300
committer: vantu5z 2017-09-01 09:13:07 +0300
commit: 4542181b2fca5d03474e3d4e3c35fef957327edf (patch)
tree: 9a937ccaf53abab171f928f63db855bef3e21ea8
parent: 4397c9e6815671a02eb60e363b79d4b34f1692a1 (diff)
download: aur-4542181b2fca5d03474e3d4e3c35fef957327edf.tar.gz
4 files changed, 52 insertions, 49 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d5d8960f395..5f5e5a043507 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = synaptics-led
 	pkgdesc = Synaptics LED enabled psmouse kernel module
-	pkgver = 4.11
+	pkgver = 4.12
 	pkgrel = 1
 	url = https://github.com/mmonaco/PKGBUILDs
 	install = synaptics-led.install
@@ -13,9 +13,9 @@ pkgbase = synaptics-led
 	source = SHA256SUMS
 	source = synaptics-led.install
 	source = kernel.patch
-	sha256sums = 046ce4f196ccd9d1b11aa66aaace03b68624b3385fdeb5c3a6c0130f6df19d13
+	sha256sums = 2885223d051e27f5156b892a193a4750bfb91cbb78081c07e5a8dc80cc8bc207
 	sha256sums = b46af61822e8ec8639faa1b60dd3b6b1a64e24854611902499b9f81d2691e22c
-	sha256sums = 972419e2e1999c02f01af01f27e39e72ddd20fbc9eabf7d170f0c12a6b7a6f6a
+	sha256sums = 999670dc8a03a1f2232f6d77b692493327492bc25218ad1663d6f65ccbbafa24
 
 pkgname = synaptics-led
 
diff --git a/PKGBUILD b/PKGBUILD
index 99a411f2b5cc..8e150b4dbb7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # https://bugzilla.novell.com/768506
 # https://bugzilla.novell.com/765524
 
-_kver=4.11
+_kver=4.12
 _gitroot=git://repo.or.cz/linux.git
 _gitcommit=linux-$_kver.y
 _cur_kernel="$(uname -r)"
@@ -28,9 +28,9 @@ source=(
 	kernel.patch
 )
 
-sha256sums=('046ce4f196ccd9d1b11aa66aaace03b68624b3385fdeb5c3a6c0130f6df19d13'
+sha256sums=('2885223d051e27f5156b892a193a4750bfb91cbb78081c07e5a8dc80cc8bc207'
             'b46af61822e8ec8639faa1b60dd3b6b1a64e24854611902499b9f81d2691e22c'
-            '972419e2e1999c02f01af01f27e39e72ddd20fbc9eabf7d170f0c12a6b7a6f6a')
+            '999670dc8a03a1f2232f6d77b692493327492bc25218ad1663d6f65ccbbafa24')
 
 build() {
 
diff --git a/SHA256SUMS b/SHA256SUMS
index d93e6ce5451a..6ca5cd9b81e9 100644
--- a/SHA256SUMS
+++ b/SHA256SUMS
@@ -1,7 +1,7 @@
-cdee73bef0b4b096200555854424598cad1e7038359d03d3ecb163c881650952  Kconfig
-07c923337a1b312404b5ee77ab261356da107a67f3706a82371cdb2b97a18a7e  Makefile
-37c3b5608384f0edbcde76c603a27f9f5eafe6c7d9d9cfe6d9a7f743df8e21fa  alps.c
-4406b7b13c8c0754944fb38f7d15d7adc3823765518cfc15521762cb7fa21339  alps.h
+f2ec019c85c6d4becee1590797658c29f7172158456fb69d0e259469309c0b33  Kconfig
+5779d3a8afc1e3169ea369fc23d79fed86677ad26ee093371ebdd0f3ed65e651  Makefile
+2905db3947c689d96a886b9a745f8ae666b5502a54b423afd0e0baf87be75680  alps.c
+ee6e2ad2a965f9fa213094b1d1d2d8b476aa6fb164c37cf530e17500863213fd  alps.h
 e7a9606b0603b04073159a7d34b8e538b4ae44e54a21e0c6d50460cb9897f67f  amimouse.c
 6f1011b46f43871cf81f5f8b6916590adc674db5a0a6263c6aa3bcbbd608eabe  appletouch.c
 a45f9c95a85df2b904fd76c81be244d9644ae3f0a1950f34d6e58d1651db786e  atarimouse.c
@@ -16,8 +16,8 @@ c799163e4406f7b0b4b1a0161df9c962bf6a9f0df0e9ed51c278710260e3da09  cyapa_gen6.c
 0742ca478f80506172224e85f531ec446f4a3b63c60ee4aa690c7b3df051e1e9  cypress_ps2.c
 b8fe539fe130396962989947bca6b193f2faad9684943523c272346ed85a43fb  cypress_ps2.h
 a7b53f5e629e195c422293674841698b1b49a4f663aaeb9e8fdc18de85e2103d  elan_i2c.h
-c4434de4d4b5c3d6bdebc645aee081596e81ce7408a6cf0764ba175b5a35405a  elan_i2c_core.c
-09f9096c017a74fc8b6fd7adabc44706bc8bbd5ed3fe736c24b716e17e4fdc50  elan_i2c_i2c.c
+42be1ec7d64d6662b12fd0e61e556f364d1640dc19bd6b43f17e333c144ffd20  elan_i2c_core.c
+fec4bdf26fea458200c5a77f66e52785595689b5f38a7d52d6add59c1d02493c  elan_i2c_i2c.c
 e2a21c57884f2d7b0198c3f0a1d82ca2a24d5cbc2be66b13eeb250a8b281adbc  elan_i2c_smbus.c
 495c7d43b5e5ebd66ed636d6255a0304eed34756a12957e57c8d5cee1c13e23d  elantech.c
 7cb7317e25dce3f9ed06088ccd6f8e77f014baf2f4fc729991b98232bcdf943d  elantech.h
@@ -26,30 +26,31 @@ b948a6129304a202a57740ef09bf556472b51e87beaa7120f81ce41650d2d3db  focaltech.c
 70da32d77b232938566f8ab7a032c9970d07a0f5ee5b3b28b96c3ab4626223f5  gpio_mouse.c
 acb09e19029e4937032dd7ae723850c46df44c6a54b832d07451b6bfb37ca3a7  hgpk.c
 2f1749025abca804a3c63bf096796da3479b4912cb36d04cf595b843f18f3219  hgpk.h
-744dda4f6cae839d60cccfcfd7d8c4d09667b754a9db29efcae4609c50a67451  inport.c
+78b890d1b8a4a99603469191a5fde0f10c8f426c351677cc805beedb040f9feb  inport.c
 788fec9d5f994ad38049e9910670f362199c0acfa9be7fee3abdcb2e2545566e  lifebook.c
 f15d019a84d82ae9f2be9540c4fe218f161090c79223d83b40d3619cb23c33b8  lifebook.h
-23d3ebd5230d8f12b6b1dfd9d454566efc6a27da7381604e3d9d2be0ab4bf681  logibm.c
+1720e4849e2104e84f922f8e64bafdbb8a124690b9ca696a0a51a9dd8598a288  logibm.c
 f29be044ec6469110ff2d2461a6081844be2af9b300cfe9c8c6dbae929b60095  logips2pp.c
 47c739d1f5ab17082be68a649238b710741579fd96854e649a34a9ee5e9054c6  logips2pp.h
 ee139d68209d5a061caf3dba01d97b217abbb202528c699425fd2c006b37a79d  maplemouse.c
 55cfd509d7d230a1bd945f84fe55c0b10c3dcc5482c48c5ae2c75afde9882279  navpoint.c
 31bc8307b89a6aff998b9f86eb25853e9d0e07cef6564b339a9f6a47866fed95  pc110pad.c
-0477d82f4c32b7710c7601ed692464c315a10bfaaf4b4862d12f46ac975a407c  psmouse-base.c
-46821f0a6490a0882b7ffd252fb82c1851e63316a488e768c63535fb27ba9a69  psmouse.h
+8db4f4aa22d0bd2eb0b8fa28cd9ac074ddcfac5354fa682c9fe5758c4710add7  psmouse-base.c
+3e87bda9063b78b7e1a9ab20fe6669bf5870df3a8092c80f5cd139f4c5d65d3d  psmouse-smbus.c
+c49542f9114f416dd3a18565ebef5bbceefceb10e6a0aa1c3902ea0fb595abf4  psmouse.h
 db3bca3e9a95905407ac5cdee0c81021a779054a065ece15d2693857c13768b0  pxa930_trkball.c
 d0f0193d44d8cc5389975593c459669912ed5e9d78a32760ee0831ebaa5ee3c9  rpcmouse.c
 c9fe62da465e69feea25cf03e1e2fa3e8714e07db8e876e9ac9048cdb2cbf979  sentelic.c
 b5a1797219f864e7603800fe8d1438702645f75ede19d27190d137991fc9f01e  sentelic.h
 21e184ec8178acb1954139b7e4fa02eb52f15a2cff9cbac752bbc442b7ef019a  sermouse.c
-6de6e4f075d3bc9b94e18b274d46ce3883454198baf140901857f998b6468e7c  synaptics.c
-7ea83c83708cef36c572609510d0de422126b74603eb2739c324dfde1cd06fa2  synaptics.h
-6deb0d09cad57f6eaad6795fc44ce32c2a62c8bf44fb64f19b4fb5d8f767eeed  synaptics_i2c.c
+c2a55bd6c6291c53cd348e37912c4c3387b68f5d791bb3fd70153f11d309da10  synaptics.c
+6f706e807d3962438c8cc9d7570295f0eee1514d47ed92dfeb2f40f3f24593b9  synaptics.h
+da52cc0ccb0f7ad74be080ca32dbb1e4d583d0c29b0626ac682743be68ceecb2  synaptics_i2c.c
 73c487b6e2e7b47ceb729af7a77702dadccd7fec03fb93494d01ebf6bb6cbc56  synaptics_usb.c
 9deddee7be1816896cc7e560c7e2ee727f930ef4ed91415e126d22fc781a4216  touchkit_ps2.c
 2927dbb2b4ad2282a34097df99718d29f228defb918ba5f25a2fd2b145e292f1  touchkit_ps2.h
-cdd44aeed9bfeddee4f0ce816ddb9d9284c2e4021968687f3bfec35a36fd03ed  trackpoint.c
-82e3d930d7b391ab1179e2b2375f9bb3ffd9d5ca0f90295a0dc0d1d92002a471  trackpoint.h
+d0833e360a0bfc37a56a74518238ab1a92ae6b1f0016986526909e58f63ac720  trackpoint.c
+ea6f56a383be2debaa1243f1f60f13e012da43891fc56c2ca22ba34511bd37d3  trackpoint.h
 36ba373d1aa66a3f3f5f3b7bad46a58e77c490ab6eb9d95948476d1cd4845efb  vmmouse.c
 9fba68a31d4584914c509180866be9414a50b96d9c50e772757bd9f8499f4510  vmmouse.h
 59fb79014d752c5e3bdbfc64a998c171a4cdcfb334af8787fb69a4c66209c0a1  vsxxxaa.c
diff --git a/kernel.patch b/kernel.patch
index a0aa4cfbfc81..7fe52b358f61 100644
--- a/kernel.patch
+++ b/kernel.patch
@@ -1,7 +1,7 @@
 diff -ur old/drivers/input/mouse/Kconfig new/drivers/input/mouse/Kconfig
---- old/drivers/input/mouse/Kconfig	2016-11-26 11:57:13.000000000 +0300
-+++ new/drivers/input/mouse/Kconfig	2016-11-28 15:23:20.404814951 +0300
-@@ -88,6 +88,15 @@
+--- old/drivers/input/mouse/Kconfig	2017-08-30 11:32:30.000000000 +0300
++++ new/drivers/input/mouse/Kconfig	2017-09-01 08:14:12.460494857 +0300
+@@ -100,6 +100,15 @@
  
           If unsure, say Y.
  
@@ -18,17 +18,17 @@ diff -ur old/drivers/input/mouse/Kconfig new/drivers/input/mouse/Kconfig
  	bool "Fujitsu Lifebook PS/2 mouse protocol extension" if EXPERT
  	default y
 diff -ur old/drivers/input/mouse/synaptics.c new/drivers/input/mouse/synaptics.c
---- old/drivers/input/mouse/synaptics.c	2016-11-26 11:57:13.000000000 +0300
-+++ new/drivers/input/mouse/synaptics.c	2016-11-28 15:27:28.091341662 +0300
+--- old/drivers/input/mouse/synaptics.c	2017-08-30 11:32:30.000000000 +0300
++++ new/drivers/input/mouse/synaptics.c	2017-09-01 09:02:43.033831830 +0300
 @@ -29,6 +29,7 @@
  #include <linux/input/mt.h>
  #include <linux/serio.h>
  #include <linux/libps2.h>
 +#include <linux/leds.h>
+ #include <linux/rmi.h>
+ #include <linux/i2c.h>
  #include <linux/slab.h>
- #include "psmouse.h"
- #include "synaptics.h"
-@@ -657,6 +658,139 @@
+@@ -712,6 +713,141 @@
  	serio_register_port(serio);
  }
  
@@ -92,27 +92,29 @@ diff -ur old/drivers/input/mouse/synaptics.c new/drivers/input/mouse/synaptics.c
 +{
 +	printk(KERN_NOTICE "synaptics: led: checking for led\n");
 +
-+	if (!priv->ext_cap_0c) {
++	if (!priv->info.ext_cap_0c) {
 +		printk(KERN_NOTICE "synaptics: led: !priv->ext_cap_0c is true... no led\n");
 +		return false;
 +	}
 +
-+	printk(KERN_NOTICE "synaptics: led: your product ID is %2lx\n", SYN_CAP_PRODUCT_ID(priv->ext_cap));
++	printk(KERN_NOTICE "synaptics: led: your product ID is %2lx\n", SYN_CAP_PRODUCT_ID(priv->info.ext_cap));
 +
 +	/* FIXME: LED is supposedly detectable in cap0c[1] 0x20, but it seems
 +	 * not working on real machines.
 +	 * So we check the product id to be sure.
++	 * Added ID 0x24 experimental.
 +	 */
 +
-+	if (SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0xe4 &&
-+	    SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0x64 &&
-+	    SYN_CAP_PRODUCT_ID(priv->ext_cap) != 0x84) {
++	if (SYN_CAP_PRODUCT_ID(priv->info.ext_cap) != 0x24 &&
++       SYN_CAP_PRODUCT_ID(priv->info.ext_cap) != 0xe4 &&
++	    SYN_CAP_PRODUCT_ID(priv->info.ext_cap) != 0x64 &&
++	    SYN_CAP_PRODUCT_ID(priv->info.ext_cap) != 0x84) {
 +		printk(KERN_NOTICE "synaptics: led: your product ID is not in the whitelist\n");
 +		return false;
 +	}
 +
-+	if (!(priv->ext_cap_0c & 0x2000) &&
-+	    (priv->capabilities & 0xd000ff) != 0xd00073) {
++	if (!(priv->info.ext_cap_0c & 0x2000) &&
++	    (priv->info.capabilities & 0xd000ff) != 0xd00073) {
 +		printk(KERN_NOTICE "synaptics: led: failed capabilities check\n");
 +		return false;
 +	}
@@ -168,7 +170,7 @@ diff -ur old/drivers/input/mouse/synaptics.c new/drivers/input/mouse/synaptics.c
  /*****************************************************************************
   *	Functions to interpret the absolute mode packets
   ****************************************************************************/
-@@ -1304,6 +1438,7 @@
+@@ -1370,6 +1506,7 @@
  		device_remove_file(&psmouse->ps2dev.serio->dev,
  				   &psmouse_attr_disable_gesture.dattr);
  
@@ -176,8 +178,8 @@ diff -ur old/drivers/input/mouse/synaptics.c new/drivers/input/mouse/synaptics.c
  	synaptics_reset(psmouse);
  	kfree(priv);
  	psmouse->private = NULL;
-@@ -1362,6 +1497,8 @@
- 		return -1;
+@@ -1430,6 +1567,8 @@
+ 		return -ENXIO;
  	}
  
 +	synaptics_sync_led(psmouse);
@@ -185,9 +187,9 @@ diff -ur old/drivers/input/mouse/synaptics.c new/drivers/input/mouse/synaptics.c
  	return 0;
  }
  
-@@ -1492,6 +1629,9 @@
- 		     priv->capabilities, priv->ext_cap, priv->ext_cap_0c,
- 		     priv->ext_cap_10, priv->board_id, priv->firmware_id);
+@@ -1548,6 +1687,9 @@
+ 		     info->capabilities, info->ext_cap, info->ext_cap_0c,
+ 		     info->ext_cap_10, info->board_id, info->firmware_id);
  
 +	if (synaptics_init_led(psmouse) < 0)
 +		goto init_fail;
@@ -196,18 +198,18 @@ diff -ur old/drivers/input/mouse/synaptics.c new/drivers/input/mouse/synaptics.c
  
  	/*
 diff -ur old/drivers/input/mouse/synaptics.h new/drivers/input/mouse/synaptics.h
---- old/drivers/input/mouse/synaptics.h	2016-11-26 11:57:13.000000000 +0300
-+++ new/drivers/input/mouse/synaptics.h	2016-11-28 15:29:08.441039455 +0300
-@@ -161,6 +161,8 @@
- 	signed char scroll;
+--- old/drivers/input/mouse/synaptics.h	2017-08-30 11:32:30.000000000 +0300
++++ new/drivers/input/mouse/synaptics.h	2017-09-01 08:27:07.849088154 +0300
+@@ -180,6 +180,8 @@
+ 	u32 x_min, y_min;	/* Min coordinates (from FW) */
  };
  
 +struct synaptics_led;
 +
  struct synaptics_data {
- 	/* Data read from the touchpad */
- 	unsigned long int model_id;		/* Model-ID */
-@@ -196,6 +198,7 @@
+ 	struct synaptics_device_info info;
+ 
+@@ -204,6 +206,7 @@
  	bool					press;
  	bool					report_press;
  	bool					is_forcepad;
author	vantu5z	2017-09-01 09:13:07 +0300
committer	vantu5z	2017-09-01 09:13:07 +0300
commit	4542181b2fca5d03474e3d4e3c35fef957327edf (patch)
tree	9a937ccaf53abab171f928f63db855bef3e21ea8
parent	4397c9e6815671a02eb60e363b79d4b34f1692a1 (diff)
download	aur-4542181b2fca5d03474e3d4e3c35fef957327edf.tar.gz