Minor fix

6 files changed, 55 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 568804758eaa..8e7738cd2fb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Fri Apr 15 15:47:42 UTC 2016
+# Tue Apr 19 12:57:48 UTC 2016
 pkgbase = linux-libre
 	pkgver = 4.5.1_gnu
 	pkgrel = 1
@@ -31,7 +31,7 @@ pkgbase = linux-libre
 	source = change-default-console-loglevel.patch
 	source = 0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
 	source = 0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
-	source = 0003-fix-atmel-maxtouch-touchscreen-support.patch
+	source = 0003-fix-Atmel-maXTouch-touchscreen-support.patch
 	source = https://repo.parabola.nu/other/rcn-libre/patches/4.5.1/rcn-libre-4.5.1-armv7-x2.patch
 	source = https://repo.parabola.nu/other/rcn-libre/patches/4.5.1/rcn-libre-4.5.1-armv7-x2.patch.sig
 	source = 0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -59,9 +59,9 @@ pkgbase = linux-libre
 	sha256sums = 7eccf2c95c69b07bddbac5bf336e694b5cc21bc77feb01a07275606568ce3ee8
 	sha256sums = f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c
 	sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
-	sha256sums = 2f5fe30332d1feb853ffe76a5390329ab23963fa07b06f22e48773064f90f20c
-	sha256sums = 3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808
-	sha256sums = 0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d
+	sha256sums = 91e087cddaf2149d050b90720d5b3004263ec3ab07dece0241551d045ff0a91f
+	sha256sums = 96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8
+	sha256sums = 2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4
 	sha256sums = b878510fb1ba2c83999b9faf9bf270779d6f1a1c33ec39fb3701d3e2aba053dc
 	sha256sums = SKIP
 	sha256sums = d09937cbca4f408dbcde270e465bdfe0589a0b41ed07d260a596a38fe6cca987
diff --git a/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch b/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
index a14ea9fc513a..120d1e1c1f47 100644
--- a/0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch
+++ b/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.
 
 Reviewed-by: André Silva <emulatorman@parabola.nu>
diff --git a/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch b/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
index adf5a48ff074..b241525c8f2f 100644
--- a/0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch
+++ b/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/0003-fix-Atmel-maXTouch-touchscreen-support.patch b/0003-fix-Atmel-maXTouch-touchscreen-support.patch
new file mode 100644
index 000000000000..e85f3514a425
--- /dev/null
+++ b/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/0003-fix-atmel-maxtouch-touchscreen-support.patch b/0003-fix-atmel-maxtouch-touchscreen-support.patch
deleted file mode 100644
index 9d2444252a94..000000000000
--- a/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/PKGBUILD b/PKGBUILD
index 04c245fda153..e45d33225383 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -47,7 +47,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"
@@ -76,9 +76,9 @@ sha256sums=('c37a135518d5a69b26bae8441bc20e5a5ea87d3228cfe72f75a714cff730a84e'
             '7eccf2c95c69b07bddbac5bf336e694b5cc21bc77feb01a07275606568ce3ee8'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
-            '2f5fe30332d1feb853ffe76a5390329ab23963fa07b06f22e48773064f90f20c'
-            '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
-            '0a6f76bbc03ae6e846a4ba4e31bbc0a40b1ae538c1271defcbe3089e00a4b53d'
+            '91e087cddaf2149d050b90720d5b3004263ec3ab07dece0241551d045ff0a91f'
+            '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
+            '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
             'b878510fb1ba2c83999b9faf9bf270779d6f1a1c33ec39fb3701d3e2aba053dc'
             'SKIP'
             'd09937cbca4f408dbcde270e465bdfe0589a0b41ed07d260a596a38fe6cca987'
@@ -116,9 +116,10 @@ prepare() {
   fi
 
   if [ "${CARCH}" = "armv7h" ]; then
-    # RCN patch (CM3 firmware deblobbed)
-    # Note: features not merged into mainline kernel were removed in the RCN patch (eg. AUFS)
-    # since it are being supported by our custom kernels (eg. linux-libre-pck).
+    # RCN patch (CM3 firmware deblobbed and AUFS removed)
+    # Note: AUFS was removed in the RCN patch since it are being supported by
+    # linux-libre-pck through PCK patch for all available architectures.
+    # See https://wiki.parabola.nu/PCK for further details.
     git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
 
     # ALARM patches
@@ -159,7 +160,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
 
@@ -395,7 +396,7 @@ _package-headers() {
   # remove unneeded architectures
   find "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch -mindepth 1 -maxdepth 1 -type d -not -name "$KARCH" -exec rm -rf {} +
 
-  # remove a files already in docs package
+  # remove files already in docs package
   rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-01"
   rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.recursion-issue-02"
   rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/kbuild/Kconfig.select-break"
@@ -414,7 +415,7 @@ _package-docs() {
   find "${pkgdir}" -type f -exec chmod 444 {} \;
   find "${pkgdir}" -type d -exec chmod 755 {} \;
 
-  # remove a file already in linux package
+  # remove a file already in kernel package
   rm -f "${pkgdir}/usr/lib/modules/${_kernver}/build/Documentation/DocBook/Makefile"
 }