From 2fdbae7c211c8bee4f2852b738fd02a8a5bd7e02 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 15 Apr 2016 21:12:24 -0300 Subject: linux-libre kernels: fix patches --- ...ake-the-driver-load-without-the-firmwares.patch | 2 +- ...gadget-no-TTY-hangup-on-USB-disconnect-WI.patch | 2 +- ...03-fix-Atmel-maXTouch-touchscreen-support.patch | 37 ++++++++++++++++++++++ ...03-fix-atmel-maxtouch-touchscreen-support.patch | 13 -------- libre/linux-libre-grsec/PKGBUILD | 10 +++--- 5 files changed, 44 insertions(+), 20 deletions(-) create mode 100644 libre/linux-libre-grsec/0003-fix-Atmel-maXTouch-touchscreen-support.patch delete mode 100644 libre/linux-libre-grsec/0003-fix-atmel-maxtouch-touchscreen-support.patch (limited to 'libre/linux-libre-grsec') 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 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?= 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 +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 +Signed-off-by: mytbk +--- + 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 -- cgit v1.2.3-54-g00ecf