Merge pull request #1546 from MilhouseVH/linux41010+

linux: update to linux-4.10.11
This commit is contained in:
Christian Hewitt 2017-04-22 06:28:15 +04:00 committed by GitHub
commit 2fee7b331e
9 changed files with 16712 additions and 499 deletions

View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="bcm2835-driver" PKG_NAME="bcm2835-driver"
PKG_VERSION="b038854" PKG_VERSION="4b79411"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="http://www.broadcom.com" PKG_SITE="http://www.broadcom.com"

View File

@ -59,7 +59,7 @@ case "$LINUX" in
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced" PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET imx6-status-led imx6-soc-fan irqbalanced"
;; ;;
*) *)
PKG_VERSION="4.10.9" PKG_VERSION="4.10.11"
PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_URL="http://www.kernel.org/pub/linux/kernel/v4.x/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_PATCH_DIRS="default" PKG_PATCH_DIRS="default"
;; ;;

View File

@ -1,7 +1,37 @@
diff -Naur linux-3.19/drivers/hid/hid-core.c linux-3.19.patch/drivers/hid/hid-core.c diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
--- linux-3.19/drivers/hid/hid-core.c 2015-02-09 03:54:22.000000000 +0100 index cd4599c..86b22f7 100644
+++ linux-3.19.patch/drivers/hid/hid-core.c 2015-02-11 00:06:14.966131308 +0100 --- a/drivers/hid/Kconfig
@@ -1886,6 +1886,10 @@ +++ b/drivers/hid/Kconfig
@@ -768,6 +768,12 @@ config HID_STEELSERIES
---help---
Support for Steelseries SRW-S1 steering wheel
+config HID_SPINELPLUS
+ tristate "Spinel Plus remote control"
+ depends on USB_HID
+ ---help---
+ Say Y here if you have a Spinel Plus (0471:206c/20cc/0613/2168) remote
+
config HID_SUNPLUS
tristate "Sunplus wireless desktop"
depends on HID
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 86b2b57..89dbf38 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -88,6 +88,7 @@ obj-$(CONFIG_HID_SAMSUNG) += hid-samsung.o
obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
obj-$(CONFIG_HID_SONY) += hid-sony.o
obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o
+obj-$(CONFIG_HID_SPINELPLUS) += hid-spinelplus.o
obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 2b89c70..c83cfdc 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -2014,6 +2014,10 @@ static const struct hid_device_id hid_have_special_driver[] = {
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) }, { HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
{ HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_6000) }, { HID_USB_DEVICE(USB_VENDOR_ID_PENMOUNT, USB_DEVICE_ID_PENMOUNT_6000) },
{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) }, { HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
@ -11,11 +41,12 @@ diff -Naur linux-3.19/drivers/hid/hid-core.c linux-3.19.patch/drivers/hid/hid-co
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_4) }, + { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_4) },
{ HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) }, { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) },
{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) }, { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) },
#if IS_ENABLED(CONFIG_HID_ROCCAT) { HID_USB_DEVICE(USB_VENDOR_ID_RISO_KAGAKU, USB_DEVICE_ID_RI_KA_WEBMAIL) },
diff -Naur linux-3.19/drivers/hid/hid-ids.h linux-3.19.patch/drivers/hid/hid-ids.h diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
--- linux-3.19/drivers/hid/hid-ids.h 2015-02-09 03:54:22.000000000 +0100 index 9845189..e016cd1 100644
+++ linux-3.19.patch/drivers/hid/hid-ids.h 2015-02-11 00:04:45.885977057 +0100 --- a/drivers/hid/hid-ids.h
@@ -743,6 +743,10 @@ +++ b/drivers/hid/hid-ids.h
@@ -813,6 +813,10 @@
#define USB_VENDOR_ID_PHILIPS 0x0471 #define USB_VENDOR_ID_PHILIPS 0x0471
#define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617 #define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617
@ -26,10 +57,12 @@ diff -Naur linux-3.19/drivers/hid/hid-ids.h linux-3.19.patch/drivers/hid/hid-ids
#define USB_VENDOR_ID_PI_ENGINEERING 0x05f3 #define USB_VENDOR_ID_PI_ENGINEERING 0x05f3
#define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff #define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff
diff -Naur linux-3.19/drivers/hid/hid-spinelplus.c linux-3.19.patch/drivers/hid/hid-spinelplus.c diff --git a/drivers/hid/hid-spinelplus.c b/drivers/hid/hid-spinelplus.c
--- linux-3.19/drivers/hid/hid-spinelplus.c 1970-01-01 01:00:00.000000000 +0100 new file mode 100644
+++ linux-3.19.patch/drivers/hid/hid-spinelplus.c 2015-02-11 00:04:45.886977059 +0100 index 0000000..381c7b3
@@ -0,0 +1,104 @@ --- /dev/null
+++ b/drivers/hid/hid-spinelplus.c
@@ -0,0 +1,95 @@
+/* +/*
+ * HID driver for "PHILIPS MCE USB IR Receiver- Spinel plus" remotes + * HID driver for "PHILIPS MCE USB IR Receiver- Spinel plus" remotes
+ * + *
@ -122,43 +155,6 @@ diff -Naur linux-3.19/drivers/hid/hid-spinelplus.c linux-3.19.patch/drivers/hid/
+ .probe = spinelplus_probe, + .probe = spinelplus_probe,
+}; +};
+ +
+static int __init spinelplus_init(void) +module_hid_driver(spinelplus_driver);
+{
+ return hid_register_driver(&spinelplus_driver);
+}
+ +
+static void __exit spinelplus_exit(void)
+{
+ hid_unregister_driver(&spinelplus_driver);
+}
+
+module_init(spinelplus_init);
+module_exit(spinelplus_exit);
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff -Naur linux-3.19/drivers/hid/Kconfig linux-3.19.patch/drivers/hid/Kconfig
--- linux-3.19/drivers/hid/Kconfig 2015-02-09 03:54:22.000000000 +0100
+++ linux-3.19.patch/drivers/hid/Kconfig 2015-02-11 00:04:45.886977059 +0100
@@ -702,6 +702,12 @@
---help---
Support for Steelseries SRW-S1 steering wheel
+config HID_SPINELPLUS
+ tristate "Spinel Plus remote control"
+ depends on USB_HID
+ ---help---
+ Say Y here if you have a Spinel Plus (0471:206c/20cc/0613/2168) remote
+
config HID_SUNPLUS
tristate "Sunplus wireless desktop"
depends on HID
diff -Naur linux-3.19/drivers/hid/Makefile linux-3.19.patch/drivers/hid/Makefile
--- linux-3.19/drivers/hid/Makefile 2015-02-09 03:54:22.000000000 +0100
+++ linux-3.19.patch/drivers/hid/Makefile 2015-02-11 00:04:45.886977059 +0100
@@ -107,6 +107,7 @@
obj-$(CONFIG_HID_SMARTJOYPLUS) += hid-sjoy.o
obj-$(CONFIG_HID_SONY) += hid-sony.o
obj-$(CONFIG_HID_SPEEDLINK) += hid-speedlink.o
+obj-$(CONFIG_HID_SPINELPLUS) += hid-spinelplus.o
obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o
obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o
obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o

View File

@ -1,27 +0,0 @@
From aefcd1a6b1ec22e4e0d26eb932b618c5d12f7e9c Mon Sep 17 00:00:00 2001
From: fritsch <peter.fruehberger@gmail.com>
Date: Sun, 21 Feb 2016 12:39:16 +0100
Subject: [PATCH] i915_irq: enable legacy turbo (4.6)
---
drivers/gpu/drm/i915/i915_irq.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 1c21220..6507643 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -4557,12 +4557,7 @@ void intel_irq_init(struct drm_i915_private *dev_priv)
INIT_WORK(&dev_priv->rps.work, gen6_pm_rps_work);
INIT_WORK(&dev_priv->l3_parity.error_work, ivybridge_parity_work);
- /* Let's track the enabled rps events */
- if (IS_VALLEYVIEW(dev_priv))
- /* WaGsvRC0ResidencyMethod:vlv */
- dev_priv->pm_rps_events = GEN6_PM_RP_DOWN_EI_EXPIRED | GEN6_PM_RP_UP_EI_EXPIRED;
- else
- dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
+ dev_priv->pm_rps_events = GEN6_PM_RPS_EVENTS;
INIT_DELAYED_WORK(&dev_priv->gpu_error.hangcheck_work,
i915_hangcheck_elapsed);

View File

@ -17,7 +17,7 @@
################################################################################ ################################################################################
PKG_NAME="bcm2835-bootloader" PKG_NAME="bcm2835-bootloader"
PKG_VERSION="b038854" PKG_VERSION="4b79411"
PKG_ARCH="arm" PKG_ARCH="arm"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="http://www.broadcom.com" PKG_SITE="http://www.broadcom.com"

View File

@ -3792,7 +3792,7 @@ CONFIG_HID_SONY=y
CONFIG_SONY_FF=y CONFIG_SONY_FF=y
# CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_SPEEDLINK is not set
# CONFIG_HID_STEELSERIES is not set # CONFIG_HID_STEELSERIES is not set
CONFIG_HID_SPINELPLUS=y CONFIG_HID_SPINELPLUS=m
CONFIG_HID_SUNPLUS=y CONFIG_HID_SUNPLUS=y
CONFIG_HID_RMI=y CONFIG_HID_RMI=y
# CONFIG_HID_GREENASIA is not set # CONFIG_HID_GREENASIA is not set

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 4.10.9 Kernel Configuration # Linux/arm 4.10.11 Kernel Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_HAS_SG_CHAIN=y
@ -2513,6 +2513,11 @@ CONFIG_VIDEO_CX25840=m
# #
# Sensors used on soc_camera driver # Sensors used on soc_camera driver
# #
#
# Media SPI Adapters
#
CONFIG_CXD2880_SPI_DRV=m
CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA8290=m
@ -3034,7 +3039,7 @@ CONFIG_HID_SONY=y
CONFIG_SONY_FF=y CONFIG_SONY_FF=y
# CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_SPEEDLINK is not set
# CONFIG_HID_STEELSERIES is not set # CONFIG_HID_STEELSERIES is not set
CONFIG_HID_SPINELPLUS=y CONFIG_HID_SPINELPLUS=m
CONFIG_HID_SUNPLUS=y CONFIG_HID_SUNPLUS=y
CONFIG_HID_RMI=y CONFIG_HID_RMI=y
# CONFIG_HID_GREENASIA is not set # CONFIG_HID_GREENASIA is not set

View File

@ -1,6 +1,6 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/arm 4.10.9 Kernel Configuration # Linux/arm 4.10.11 Kernel Configuration
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_HAS_SG_CHAIN=y
@ -2604,6 +2604,11 @@ CONFIG_VIDEO_CX25840=m
# #
# Sensors used on soc_camera driver # Sensors used on soc_camera driver
# #
#
# Media SPI Adapters
#
CONFIG_CXD2880_SPI_DRV=m
CONFIG_MEDIA_TUNER=m CONFIG_MEDIA_TUNER=m
CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_SIMPLE=m
CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA8290=m
@ -3125,7 +3130,7 @@ CONFIG_HID_SONY=y
CONFIG_SONY_FF=y CONFIG_SONY_FF=y
# CONFIG_HID_SPEEDLINK is not set # CONFIG_HID_SPEEDLINK is not set
# CONFIG_HID_STEELSERIES is not set # CONFIG_HID_STEELSERIES is not set
CONFIG_HID_SPINELPLUS=y CONFIG_HID_SPINELPLUS=m
CONFIG_HID_SUNPLUS=y CONFIG_HID_SUNPLUS=y
CONFIG_HID_RMI=y CONFIG_HID_RMI=y
# CONFIG_HID_GREENASIA is not set # CONFIG_HID_GREENASIA is not set

File diff suppressed because it is too large Load Diff