summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-04-15 21:12:24 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-04-15 21:51:16 -0300
commit2fdbae7c211c8bee4f2852b738fd02a8a5bd7e02 (patch)
treecba6c911382417c316c8f67f57b7e0da518385e2
parent7ed49e3d3ef94694c80aa627199bd00a8ffc5fdc (diff)
downloadabslibre-2fdbae7c211c8bee4f2852b738fd02a8a5bd7e02.tar.gz
abslibre-2fdbae7c211c8bee4f2852b738fd02a8a5bd7e02.tar.bz2
abslibre-2fdbae7c211c8bee4f2852b738fd02a8a5bd7e02.zip
linux-libre kernels: fix patches
-rw-r--r--kernels/linux-libre-grsec-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch2
-rw-r--r--kernels/linux-libre-grsec-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch2
-rw-r--r--kernels/linux-libre-grsec-knock/0003-fix-Atmel-maXTouch-touchscreen-support.patch37
-rw-r--r--kernels/linux-libre-grsec-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch13
-rw-r--r--kernels/linux-libre-grsec-knock/PKGBUILD10
-rw-r--r--kernels/linux-libre-lts-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch2
-rw-r--r--kernels/linux-libre-lts-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch2
-rw-r--r--kernels/linux-libre-lts-knock/0003-fix-Atmel-maXTouch-touchscreen-support.patch37
-rw-r--r--kernels/linux-libre-lts-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch13
-rw-r--r--kernels/linux-libre-lts-knock/PKGBUILD10
-rw-r--r--kernels/linux-libre-rt/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch2
-rw-r--r--kernels/linux-libre-rt/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch2
-rw-r--r--kernels/linux-libre-rt/0003-fix-Atmel-maXTouch-touchscreen-support.patch37
-rw-r--r--kernels/linux-libre-rt/0003-fix-atmel-maxtouch-touchscreen-support.patch13
-rw-r--r--kernels/linux-libre-rt/PKGBUILD10
-rw-r--r--libre/linux-libre-grsec/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch2
-rw-r--r--libre/linux-libre-grsec/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch2
-rw-r--r--libre/linux-libre-grsec/0003-fix-Atmel-maXTouch-touchscreen-support.patch37
-rw-r--r--libre/linux-libre-grsec/0003-fix-atmel-maxtouch-touchscreen-support.patch13
-rw-r--r--libre/linux-libre-grsec/PKGBUILD10
-rw-r--r--libre/linux-libre-lts/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch2
-rw-r--r--libre/linux-libre-lts/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch2
-rw-r--r--libre/linux-libre-lts/0003-fix-Atmel-maXTouch-touchscreen-support.patch37
-rw-r--r--libre/linux-libre-lts/0003-fix-atmel-maxtouch-touchscreen-support.patch13
-rw-r--r--libre/linux-libre-lts/PKGBUILD10
25 files changed, 220 insertions, 100 deletions
diff --git a/kernels/linux-libre-grsec-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-grsec-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index 297f2e553..e271d671b 100644
--- a/kernels/linux-libre-grsec-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/kernels/linux-libre-grsec-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
@@ -1,7 +1,7 @@
From e479cd018fcd7f32714e5172265f8d1e7c4d9f0d Mon Sep 17 00:00:00 2001
From: Jason Self <j@jxself.org>
Date: Sun, 30 Aug 2015 14:27:44 -0700
-Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
+Subject: [PATCH 1/3] drm/radeon: Make the driver load without the
firmwares.
---
diff --git a/kernels/linux-libre-grsec-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/kernels/linux-libre-grsec-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
index adf5a48ff..b241525c8 100644
--- a/kernels/linux-libre-grsec-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+++ b/kernels/linux-libre-grsec-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
@@ -1,7 +1,7 @@
From d2702eb8157f845c81b1a6049139f342f12db494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 26 Aug 2013 19:19:44 +0300
-Subject: [PATCH 2/2] usb serial gadget: no TTY hangup on USB disconnect [WIP]
+Subject: [PATCH 2/3] usb serial gadget: no TTY hangup on USB disconnect [WIP]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/kernels/linux-libre-grsec-knock/0003-fix-Atmel-maXTouch-touchscreen-support.patch b/kernels/linux-libre-grsec-knock/0003-fix-Atmel-maXTouch-touchscreen-support.patch
new file mode 100644
index 000000000..e85f3514a
--- /dev/null
+++ b/kernels/linux-libre-grsec-knock/0003-fix-Atmel-maXTouch-touchscreen-support.patch
@@ -0,0 +1,37 @@
+From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001
+From: André Silva <emulatorman@parabola.nu>
+Date: Tue, 22 Mar 2016 17:58:59 -0300
+Subject: [PATCH 3/3] fix Atmel maXTouch touchscreen support
+
+The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu,
+but not with the current longterm and mainline kernels in
+Parabola.
+
+Now it needs to load nonfree firmware in mxt_initialize(),
+which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the
+atmel_mxt_ts driver fails to work.
+
+This driver works if changing reject_firmware_nowait to
+request_firmware_nowait in atmel_mxt_ts.c. This line is
+requesting the file named MXT_CFG_NAME, and it's a config file,
+not the firmware blob.
+
+Signed-off-by: André Silva <emulatorman@parabola.nu>
+Signed-off-by: mytbk <mytbk920423@gmail.com>
+---
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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/kernels/linux-libre-grsec-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch b/kernels/linux-libre-grsec-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch
deleted file mode 100644
index 9d2444252..000000000
--- a/kernels/linux-libre-grsec-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kernels/linux-libre-grsec-knock/PKGBUILD b/kernels/linux-libre-grsec-knock/PKGBUILD
index 37813e8a2..e48c6aba3 100644
--- a/kernels/linux-libre-grsec-knock/PKGBUILD
+++ b/kernels/linux-libre-grsec-knock/PKGBUILD
@@ -55,7 +55,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'
+ '0003-fix-Atmel-maXTouch-touchscreen-support.patch'
# armv7h patches
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig"
@@ -88,9 +88,9 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'cbd876f4a94317461d62adae169906668c3bf914c8f4497ef2eda97bf2e9d756'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
- '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
- '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
+ 'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798'
+ '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
+ '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
'1ddb4826dc41c5e6db05c1ccad396915e678992c97b300089bf47040e0db4f44'
'SKIP'
'1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382'
@@ -179,7 +179,7 @@ prepare() {
# 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"
+ patch -p1 -i "${srcdir}/0003-fix-Atmel-maXTouch-touchscreen-support.patch"
cat "${srcdir}/config.${CARCH}" > ./.config
diff --git a/kernels/linux-libre-lts-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-lts-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index 15da9c081..52f7197ed 100644
--- a/kernels/linux-libre-lts-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/kernels/linux-libre-lts-knock/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
@@ -1,7 +1,7 @@
From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001
From: Jason Self <j@jxself.org>
Date: Wed, 5 Aug 2015 09:16:03 -0700
-Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
+Subject: [PATCH 1/3] drm/radeon: Make the driver load without the
firmwares.
---
diff --git a/kernels/linux-libre-lts-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/kernels/linux-libre-lts-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
index adf5a48ff..b241525c8 100644
--- a/kernels/linux-libre-lts-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+++ b/kernels/linux-libre-lts-knock/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
@@ -1,7 +1,7 @@
From d2702eb8157f845c81b1a6049139f342f12db494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 26 Aug 2013 19:19:44 +0300
-Subject: [PATCH 2/2] usb serial gadget: no TTY hangup on USB disconnect [WIP]
+Subject: [PATCH 2/3] usb serial gadget: no TTY hangup on USB disconnect [WIP]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/kernels/linux-libre-lts-knock/0003-fix-Atmel-maXTouch-touchscreen-support.patch b/kernels/linux-libre-lts-knock/0003-fix-Atmel-maXTouch-touchscreen-support.patch
new file mode 100644
index 000000000..e85f3514a
--- /dev/null
+++ b/kernels/linux-libre-lts-knock/0003-fix-Atmel-maXTouch-touchscreen-support.patch
@@ -0,0 +1,37 @@
+From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001
+From: André Silva <emulatorman@parabola.nu>
+Date: Tue, 22 Mar 2016 17:58:59 -0300
+Subject: [PATCH 3/3] fix Atmel maXTouch touchscreen support
+
+The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu,
+but not with the current longterm and mainline kernels in
+Parabola.
+
+Now it needs to load nonfree firmware in mxt_initialize(),
+which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the
+atmel_mxt_ts driver fails to work.
+
+This driver works if changing reject_firmware_nowait to
+request_firmware_nowait in atmel_mxt_ts.c. This line is
+requesting the file named MXT_CFG_NAME, and it's a config file,
+not the firmware blob.
+
+Signed-off-by: André Silva <emulatorman@parabola.nu>
+Signed-off-by: mytbk <mytbk920423@gmail.com>
+---
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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/kernels/linux-libre-lts-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch b/kernels/linux-libre-lts-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch
deleted file mode 100644
index 9d2444252..000000000
--- a/kernels/linux-libre-lts-knock/0003-fix-atmel-maxtouch-touchscreen-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index 83e7d02e4..2e3a9c914 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -51,7 +51,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'
+ '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"
@@ -85,9 +85,9 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324'
'812dd442ccc6bae054f90928e4646bc023c24857ef84a1682b813b84b04754a2'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d'
- '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
- '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
+ '838d6c91ffcfa0230f048e4d0b3f664e36906041027cd280d131ff88fd9a72e8'
+ '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
+ '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
'3743d0478507d160f24326241831df8c4d3f2e268bcaf2f62dfe2ef5e8a69188'
'SKIP'
'349691937f0a2881c5fc981d7fb85f64ad3c341ce77a716638d328750d3e9f41'
@@ -179,7 +179,7 @@ prepare() {
# 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"
+ patch -p1 -i "${srcdir}/0003-fix-Atmel-maXTouch-touchscreen-support.patch"
cat "${srcdir}/config.${CARCH}" > ./.config
diff --git a/kernels/linux-libre-rt/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/kernels/linux-libre-rt/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index 297f2e553..e271d671b 100644
--- a/kernels/linux-libre-rt/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/kernels/linux-libre-rt/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
@@ -1,7 +1,7 @@
From e479cd018fcd7f32714e5172265f8d1e7c4d9f0d Mon Sep 17 00:00:00 2001
From: Jason Self <j@jxself.org>
Date: Sun, 30 Aug 2015 14:27:44 -0700
-Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
+Subject: [PATCH 1/3] drm/radeon: Make the driver load without the
firmwares.
---
diff --git a/kernels/linux-libre-rt/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/kernels/linux-libre-rt/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
index adf5a48ff..b241525c8 100644
--- a/kernels/linux-libre-rt/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+++ b/kernels/linux-libre-rt/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
@@ -1,7 +1,7 @@
From d2702eb8157f845c81b1a6049139f342f12db494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 26 Aug 2013 19:19:44 +0300
-Subject: [PATCH 2/2] usb serial gadget: no TTY hangup on USB disconnect [WIP]
+Subject: [PATCH 2/3] usb serial gadget: no TTY hangup on USB disconnect [WIP]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/kernels/linux-libre-rt/0003-fix-Atmel-maXTouch-touchscreen-support.patch b/kernels/linux-libre-rt/0003-fix-Atmel-maXTouch-touchscreen-support.patch
new file mode 100644
index 000000000..e85f3514a
--- /dev/null
+++ b/kernels/linux-libre-rt/0003-fix-Atmel-maXTouch-touchscreen-support.patch
@@ -0,0 +1,37 @@
+From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001
+From: André Silva <emulatorman@parabola.nu>
+Date: Tue, 22 Mar 2016 17:58:59 -0300
+Subject: [PATCH 3/3] fix Atmel maXTouch touchscreen support
+
+The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu,
+but not with the current longterm and mainline kernels in
+Parabola.
+
+Now it needs to load nonfree firmware in mxt_initialize(),
+which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the
+atmel_mxt_ts driver fails to work.
+
+This driver works if changing reject_firmware_nowait to
+request_firmware_nowait in atmel_mxt_ts.c. This line is
+requesting the file named MXT_CFG_NAME, and it's a config file,
+not the firmware blob.
+
+Signed-off-by: André Silva <emulatorman@parabola.nu>
+Signed-off-by: mytbk <mytbk920423@gmail.com>
+---
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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/kernels/linux-libre-rt/0003-fix-atmel-maxtouch-touchscreen-support.patch b/kernels/linux-libre-rt/0003-fix-atmel-maxtouch-touchscreen-support.patch
deleted file mode 100644
index 9d2444252..000000000
--- a/kernels/linux-libre-rt/0003-fix-atmel-maxtouch-touchscreen-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD
index 5c16b7de4..16af88b84 100644
--- a/kernels/linux-libre-rt/PKGBUILD
+++ b/kernels/linux-libre-rt/PKGBUILD
@@ -50,7 +50,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'
+ '0003-fix-Atmel-maXTouch-touchscreen-support.patch'
# armv7h patches
"https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch"
"https://repo.parabola.nu/other/rcn-libre-rt/patches/${_pkgver%-*}/rcn-libre-rt-${_pkgver%-*}-${rcnrel}.patch.sig"
@@ -80,9 +80,9 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'c1b28105e8283299a23e9dde63b91563d875a847e4757c525fb521384c68057e'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
- '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
- '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
+ 'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798'
+ '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
+ '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
'7b08c9d339fb782a729c0602eeb507a853deb7ddcc703746b7bbc76b9a1b1ca0'
'SKIP'
'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
@@ -166,7 +166,7 @@ prepare() {
# 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"
+ patch -p1 -i "${srcdir}/0003-fix-Atmel-maXTouch-touchscreen-support.patch"
cat "${srcdir}/config.${CARCH}" > ./.config
diff --git a/libre/linux-libre-grsec/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/libre/linux-libre-grsec/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index 297f2e553..e271d671b 100644
--- a/libre/linux-libre-grsec/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/libre/linux-libre-grsec/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
@@ -1,7 +1,7 @@
From e479cd018fcd7f32714e5172265f8d1e7c4d9f0d Mon Sep 17 00:00:00 2001
From: Jason Self <j@jxself.org>
Date: Sun, 30 Aug 2015 14:27:44 -0700
-Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
+Subject: [PATCH 1/3] drm/radeon: Make the driver load without the
firmwares.
---
diff --git a/libre/linux-libre-grsec/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/libre/linux-libre-grsec/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
index adf5a48ff..b241525c8 100644
--- a/libre/linux-libre-grsec/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+++ b/libre/linux-libre-grsec/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
@@ -1,7 +1,7 @@
From d2702eb8157f845c81b1a6049139f342f12db494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 26 Aug 2013 19:19:44 +0300
-Subject: [PATCH 2/2] usb serial gadget: no TTY hangup on USB disconnect [WIP]
+Subject: [PATCH 2/3] usb serial gadget: no TTY hangup on USB disconnect [WIP]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
diff --git a/libre/linux-libre-grsec/0003-fix-Atmel-maXTouch-touchscreen-support.patch b/libre/linux-libre-grsec/0003-fix-Atmel-maXTouch-touchscreen-support.patch
new file mode 100644
index 000000000..e85f3514a
--- /dev/null
+++ b/libre/linux-libre-grsec/0003-fix-Atmel-maXTouch-touchscreen-support.patch
@@ -0,0 +1,37 @@
+From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001
+From: André Silva <emulatorman@parabola.nu>
+Date: Tue, 22 Mar 2016 17:58:59 -0300
+Subject: [PATCH 3/3] fix Atmel maXTouch touchscreen support
+
+The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu,
+but not with the current longterm and mainline kernels in
+Parabola.
+
+Now it needs to load nonfree firmware in mxt_initialize(),
+which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the
+atmel_mxt_ts driver fails to work.
+
+This driver works if changing reject_firmware_nowait to
+request_firmware_nowait in atmel_mxt_ts.c. This line is
+requesting the file named MXT_CFG_NAME, and it's a config file,
+not the firmware blob.
+
+Signed-off-by: André Silva <emulatorman@parabola.nu>
+Signed-off-by: mytbk <mytbk920423@gmail.com>
+---
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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-grsec/0003-fix-atmel-maxtouch-touchscreen-support.patch b/libre/linux-libre-grsec/0003-fix-atmel-maxtouch-touchscreen-support.patch
deleted file mode 100644
index 9d2444252..000000000
--- a/libre/linux-libre-grsec/0003-fix-atmel-maxtouch-touchscreen-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index 0f0c5547c..c219e0582 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -50,7 +50,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'
+ '0003-fix-Atmel-maXTouch-touchscreen-support.patch'
# armv7h patches
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch"
"https://repo.parabola.nu/other/rcn-libre-grsec/patches/${_pkgver%-*}/rcn-libre-grsec-${_pkgver%-*}-${rcnrel}.patch.sig"
@@ -81,9 +81,9 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
'50808756ec1431b3163dd0579e901146229ec13356f73538b24db25a21bccb6a'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
- '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
- '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
+ 'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798'
+ '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
+ '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
'1ddb4826dc41c5e6db05c1ccad396915e678992c97b300089bf47040e0db4f44'
'SKIP'
'1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382'
@@ -168,7 +168,7 @@ prepare() {
# 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"
+ patch -p1 -i "${srcdir}/0003-fix-Atmel-maXTouch-touchscreen-support.patch"
cat "${srcdir}/config.${CARCH}" > ./.config
diff --git a/libre/linux-libre-lts/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/libre/linux-libre-lts/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index 15da9c081..52f7197ed 100644
--- a/libre/linux-libre-lts/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/libre/linux-libre-lts/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
@@ -1,7 +1,7 @@
From 98e458c66c85472984a4230f34e7386af9e7b8d6 Mon Sep 17 00:00:00 2001
From: Jason Self <j@jxself.org>
Date: Wed, 5 Aug 2015 09:16:03 -0700
-Subject: [PATCH 1/1] [PATCH] drm/radeon: Make the driver load without the
+Subject: [PATCH 1/3] drm/radeon: Make the driver load without the
firmwares.
---
diff --git a/libre/linux-libre-lts/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/libre/linux-libre-lts/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
index adf5a48ff..b241525c8 100644
--- a/libre/linux-libre-lts/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+++ b/libre/linux-libre-lts/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
@@ -1,7 +1,7 @@
From d2702eb8157f845c81b1a6049139f342f12db494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 26 Aug 2013 19:19:44 +0300
-Subject: [PATCH 2/2] usb serial gadget: no TTY hangup on USB disconnect [WIP]
+Subject: [PATCH 2/3] usb serial gadget: no TTY hangup on USB disconnect [WIP]
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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..e85f3514a
--- /dev/null
+++ b/libre/linux-libre-lts/0003-fix-Atmel-maXTouch-touchscreen-support.patch
@@ -0,0 +1,37 @@
+From ab8cc1b2dc1b716d5c08f72dacbe1eded269f304 Mon Sep 17 00:00:00 2001
+From: André Silva <emulatorman@parabola.nu>
+Date: Tue, 22 Mar 2016 17:58:59 -0300
+Subject: [PATCH 3/3] fix Atmel maXTouch touchscreen support
+
+The Atmel maXTouch touchscreen works with Linux-libre 3.13-gnu,
+but not with the current longterm and mainline kernels in
+Parabola.
+
+Now it needs to load nonfree firmware in mxt_initialize(),
+which is in drivers/input/touchscreen/atmel_mxt_ts.c, and the
+atmel_mxt_ts driver fails to work.
+
+This driver works if changing reject_firmware_nowait to
+request_firmware_nowait in atmel_mxt_ts.c. This line is
+requesting the file named MXT_CFG_NAME, and it's a config file,
+not the firmware blob.
+
+Signed-off-by: André Silva <emulatorman@parabola.nu>
+Signed-off-by: mytbk <mytbk920423@gmail.com>
+---
+ drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+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/0003-fix-atmel-maxtouch-touchscreen-support.patch b/libre/linux-libre-lts/0003-fix-atmel-maxtouch-touchscreen-support.patch
deleted file mode 100644
index 9d2444252..000000000
--- a/libre/linux-libre-lts/0003-fix-atmel-maxtouch-touchscreen-support.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 97c735508..af2e75c78 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -46,7 +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'
+ '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"
@@ -78,9 +78,9 @@ sha256sums=('48b2e5ea077d0a0bdcb205e67178e8eb5b2867db3b2364b701dbc801d9755324'
'e64cd7bf23e42a0db85e2d48a5af4fefacb26de5f517da8f268b18d1fc319769'
'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
'1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
- '38cf6bdf70dc070ff0b785937d99347bb91f8531ea2bcca50283c8923a184c6d'
- '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
- '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
+ '838d6c91ffcfa0230f048e4d0b3f664e36906041027cd280d131ff88fd9a72e8'
+ '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
+ '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
'3743d0478507d160f24326241831df8c4d3f2e268bcaf2f62dfe2ef5e8a69188'
'SKIP'
'349691937f0a2881c5fc981d7fb85f64ad3c341ce77a716638d328750d3e9f41'
@@ -168,7 +168,7 @@ prepare() {
# 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"
+ patch -p1 -i "${srcdir}/0003-fix-Atmel-maXTouch-touchscreen-support.patch"
cat "${srcdir}/config.${CARCH}" > ./.config