summaryrefslogtreecommitdiff
path: root/libre/linux-libre-lts
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-04-11 10:26:30 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-04-11 10:26:30 -0300
commit7478640f3d88b7f15bfa7824d834245f029d3d60 (patch)
tree0b0d91cb62a595a83cd8f20787bf1d9915e303f4 /libre/linux-libre-lts
parent72e465d2a522a43977125dd3b6a8ba7e89857f45 (diff)
linux-libre-lts-4.1.21_gnu-1.1: fix Atmel maXTouch touchscreen support -> https://labs.parabola.nu/issues/877
Diffstat (limited to 'libre/linux-libre-lts')
-rw-r--r--libre/linux-libre-lts/0003-fix-atmel-maxtouch-touchscreen-support.patch13
-rw-r--r--libre/linux-libre-lts/PKGBUILD9
2 files changed, 21 insertions, 1 deletions
diff --git a/libre/linux-libre-lts/0003-fix-atmel-maxtouch-touchscreen-support.patch b/libre/linux-libre-lts/0003-fix-atmel-maxtouch-touchscreen-support.patch
new file mode 100644
index 000000000..9d2444252
--- /dev/null
+++ b/libre/linux-libre-lts/0003-fix-atmel-maxtouch-touchscreen-support.patch
@@ -0,0 +1,13 @@
+diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
+index 726a83e..d818834 100644
+--- a/drivers/input/touchscreen/atmel_mxt_ts.c
++++ b/drivers/input/touchscreen/atmel_mxt_ts.c
+@@ -1989,7 +1989,7 @@ static int mxt_initialize(struct mxt_data *data)
+ if (error)
+ goto err_free_object_table;
+
+- error = reject_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,
++ error = request_firmware_nowait(THIS_MODULE, true, MXT_CFG_NAME,
+ &client->dev, GFP_KERNEL, data,
+ mxt_config_cb);
+ if (error) {
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 729494c2c..a04315cb9 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -19,7 +19,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
_srcname=linux-${_pkgbasever%-*}
_archpkgver=${_pkgver%-*}
pkgver=${_pkgver//-/_}
-pkgrel=1
+pkgrel=1.1
rcnrel=armv7-x7
arch=('i686' 'x86_64' 'armv7h')
url="http://linux-libre.fsfla.org/"
@@ -46,6 +46,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
'change-default-console-loglevel.patch'
'0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch'
'0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
+ '0003-fix-atmel-maxtouch-touchscreen-support.patch'
# armv7h patches
"https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
"https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
@@ -75,6 +76,7 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
'38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d'
'3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
+ '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
'3743d0478507d160f24326241831df8c4d3f2e268bcaf2f62dfe2ef5e8a69188'
'SKIP'
'bb3113130feedd411bd0947bd8217c7643519659ddb9ca57f7b53a1a51fb67a0'
@@ -150,6 +152,11 @@ prepare() {
# http://www.coreboot.org/EHCI_Gadget_Debug
patch -p1 -i "${srcdir}/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch"
+ # fix Atmel maXTouch touchscreen support
+ # https://labs.parabola.nu/issues/877
+ # http://www.fsfla.org/pipermail/linux-libre/2015-November/003202.html
+ patch -p1 -i "${srcdir}/0003-fix-atmel-maxtouch-touchscreen-support.patch"
+
cat "${srcdir}/config.${CARCH}" > ./.config
# append pkgrel to extraversion