Merge pull request #1798 from MilhouseVH/linux4121+

linux: update to linux-4.12.4

packages/graphics/bcm2835-driver/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="bcm2835-driver"
-PKG_VERSION="715f2d9"
-PKG_SHA256="9378e99e3c22c7558b9cbc7cde02558b51f44cb0a960c26070445e65a537d61a"
+PKG_VERSION="2304778"
+PKG_SHA256="a49d3908c36a84c4b2e9f739787d376fadedb1ae90d365941037c0d26e8aa112"
 PKG_ARCH="any"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"

packages/linux-firmware/kernel-firmware/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="kernel-firmware"
-PKG_VERSION="df40d15"
-PKG_SHA256="bad57a97b2b096df83f3b87f051ddf1227a617c7836fe800bd43e7e51a47cdc4"
+PKG_VERSION="7d2c913"
+PKG_SHA256="fd127d2e36d8a0d2c1e9f70b37d7e31350260fb0755485d9a8c50638596f1791"
 PKG_ARCH="any"
 PKG_LICENSE="other"
 PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/"

packages/linux/package.mk

@@ -63,8 +63,8 @@ case "$LINUX" in
     PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
     ;;
   *)
-    PKG_VERSION="4.12"
-    PKG_SHA256="a45c3becd4d08ce411c14628a949d08e2433d8cdeca92036c7013980e93858ab"
+    PKG_VERSION="4.12.4"
+    PKG_SHA256="f470d75f1f5a375f6882958daf96e7f8552fff28702b70abf3744e1711ef5ac9"
     PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
     PKG_PATCH_DIRS="default"
     ;;

packages/linux/patches/default/linux-999-4.11-button-repeat-fix.patch

@@ -1,38 +0,0 @@
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
-index d845336..a89d7bd 100644
---- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -1699,6 +1699,16 @@ static int rc_setup_rx_device(struct rc_dev *dev)
- 	if (dev->close)
- 		dev->input_dev->close = ir_close;
- 
-+	dev->input_dev->dev.parent = &dev->dev;
-+	memcpy(&dev->input_dev->id, &dev->input_id, sizeof(dev->input_id));
-+	dev->input_dev->phys = dev->input_phys;
-+	dev->input_dev->name = dev->input_name;
-+
-+	/* rc_open will be called here */
-+	rc = input_register_device(dev->input_dev);
-+	if (rc)
-+		goto out_table;
-+
- 	/*
- 	 * Default delay of 250ms is too short for some protocols, especially
- 	 * since the timeout is currently set to 250ms. Increase it to 500ms,
-@@ -1714,16 +1724,6 @@ static int rc_setup_rx_device(struct rc_dev *dev)
- 	 */
- 	dev->input_dev->rep[REP_PERIOD] = 125;
- 
--	dev->input_dev->dev.parent = &dev->dev;
--	memcpy(&dev->input_dev->id, &dev->input_id, sizeof(dev->input_id));
--	dev->input_dev->phys = dev->input_phys;
--	dev->input_dev->name = dev->input_name;
--
--	/* rc_open will be called here */
--	rc = input_register_device(dev->input_dev);
--	if (rc)
--		goto out_table;
--
- 	return 0;
- 
- out_table:

packages/linux/patches/default/linux-999.LIRC_GET_REC_RESOLUTION_should_return_microseconds.patch

@@ -0,0 +1,33 @@
+From 29b67f9aaa06adae4db23b775fa92b0e376a36a3 Mon Sep 17 00:00:00 2001
+From: Sean Young <sean@mess.org>
+Date: Fri, 7 Jul 2017 18:49:18 -0300
+Subject: media: lirc: LIRC_GET_REC_RESOLUTION should return microseconds
+
+Since commit e8f4818895b3 ("[media] lirc: advertise
+LIRC_CAN_GET_REC_RESOLUTION and improve") lircd uses the ioctl
+LIRC_GET_REC_RESOLUTION to determine the shortest pulse or space that
+the hardware can detect. This breaks decoding in lirc because lircd
+expects the answer in microseconds, but nanoseconds is returned.
+
+Cc: <stable@vger.kernel.org> # v2.6.36+
+Reported-by: Derek <user.vdr@gmail.com>
+Tested-by: Derek <user.vdr@gmail.com>
+Signed-off-by: Sean Young <sean@mess.org>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
+
+diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
+index a30af91..d2223c0 100644
+--- a/drivers/media/rc/ir-lirc-codec.c
++++ b/drivers/media/rc/ir-lirc-codec.c
+@@ -266,7 +266,7 @@ static long ir_lirc_ioctl(struct file *filep, unsigned int cmd,
+ 		if (!dev->rx_resolution)
+ 			return -ENOTTY;
+ 
+-		val = dev->rx_resolution;
++		val = dev->rx_resolution / 1000;
+ 		break;
+ 
+ 	case LIRC_SET_WIDEBAND_RECEIVER:
+-- 
+cgit v0.10.2
+

packages/tools/bcm2835-bootloader/package.mk

@@ -17,8 +17,8 @@
 ################################################################################
 
 PKG_NAME="bcm2835-bootloader"
-PKG_VERSION="715f2d9"
-PKG_SHA256="0d9026e6a1000710093e0e980787a9e84198f51ffa0d7963e256897eeaac991a"
+PKG_VERSION="2304778"
+PKG_SHA256="357677ed2bdb3cb67046fda00bab5b1fb8dec9aa09602f13e5cf629544abf887"
 PKG_ARCH="arm"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.broadcom.com"