mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
linux: update to linux-3.10
TODO: sync configs Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
parent
1edf52d75b
commit
c92d1f9eff
@ -33,10 +33,14 @@ case "$LINUX" in
|
||||
PKG_VERSION="2.6.38-ti-omap4"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
|
||||
;;
|
||||
*)
|
||||
3.9)
|
||||
PKG_VERSION="3.9.8"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
*)
|
||||
PKG_VERSION="3.10"
|
||||
PKG_URL="http://www.kernel.org/pub/linux/kernel/v3.x/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
;;
|
||||
esac
|
||||
|
||||
PKG_REV="1"
|
||||
@ -55,5 +59,5 @@ PKG_AUTORECONF="no"
|
||||
|
||||
if [ "$DEVTOOLS" = "yes" ]; then
|
||||
PKG_DEPENDS="$PKG_DEPENDS Python"
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS newt slang elfutils Python"
|
||||
PKG_BUILD_DEPENDS="$PKG_BUILD_DEPENDS slang elfutils Python"
|
||||
fi
|
||||
|
21
packages/linux/patches/3.10/linux-003-no_dev_console.patch
vendored
Normal file
21
packages/linux/patches/3.10/linux-003-no_dev_console.patch
vendored
Normal file
@ -0,0 +1,21 @@
|
||||
diff --git a/init/main.c b/init/main.c
|
||||
index 9484f4b..db55edd 100644
|
||||
--- a/init/main.c
|
||||
+++ b/init/main.c
|
||||
@@ -880,8 +880,14 @@ static noinline void __init kernel_init_freeable(void)
|
||||
do_basic_setup();
|
||||
|
||||
/* Open the /dev/console on the rootfs, this should never fail */
|
||||
- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
|
||||
- pr_err("Warning: unable to open an initial console.\n");
|
||||
+ char *console = "/dev_console";
|
||||
+
|
||||
+ if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) {
|
||||
+ sys_mknod(console, S_IFCHR|0600, (TTYAUX_MAJOR<<8)|1);
|
||||
+ if (sys_open(console, O_RDWR, 0) < 0)
|
||||
+ printk(KERN_WARNING "Warning: unable to open an initial console.\n");
|
||||
+ sys_unlink(console);
|
||||
+ }
|
||||
|
||||
(void) sys_dup(0);
|
||||
(void) sys_dup(0);
|
18
packages/linux/patches/3.10/linux-010-perf_crosscompiling.patch
vendored
Normal file
18
packages/linux/patches/3.10/linux-010-perf_crosscompiling.patch
vendored
Normal file
@ -0,0 +1,18 @@
|
||||
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
|
||||
index b0f164b..ecb1af6 100644
|
||||
--- a/tools/perf/Makefile
|
||||
+++ b/tools/perf/Makefile
|
||||
@@ -687,12 +687,10 @@ ifndef NO_LIBAUDIT
|
||||
endif
|
||||
|
||||
ifndef NO_SLANG
|
||||
- FLAGS_SLANG=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -I/usr/include/slang -lslang
|
||||
+ FLAGS_SLANG=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) -lslang
|
||||
ifneq ($(call try-cc,$(SOURCE_SLANG),$(FLAGS_SLANG),libslang),y)
|
||||
msg := $(warning slang not found, disables TUI support. Please install slang-devel or libslang-dev);
|
||||
else
|
||||
- # Fedora has /usr/include/slang/slang.h, but ubuntu /usr/include/slang.h
|
||||
- BASIC_CFLAGS += -I/usr/include/slang
|
||||
BASIC_CFLAGS += -DSLANG_SUPPORT
|
||||
EXTLIBS += -lslang
|
||||
LIB_OBJS += $(OUTPUT)ui/browser.o
|
1029
packages/linux/patches/3.10/linux-052-XBOX_remote_support.patch
vendored
Normal file
1029
packages/linux/patches/3.10/linux-052-XBOX_remote_support.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
161
packages/linux/patches/3.10/linux-053-spinelplus-remote-0.2.patch
vendored
Normal file
161
packages/linux/patches/3.10/linux-053-spinelplus-remote-0.2.patch
vendored
Normal file
@ -0,0 +1,161 @@
|
||||
diff -Naur linux-3.9/drivers/hid/hid-core.c linux-3.9.patch/drivers/hid/hid-core.c
|
||||
--- linux-3.9/drivers/hid/hid-core.c 2013-04-29 02:36:01.000000000 +0200
|
||||
+++ linux-3.9.patch/drivers/hid/hid-core.c 2013-04-29 17:08:40.528324010 +0200
|
||||
@@ -1681,6 +1681,9 @@
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_PKB1700) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ORTEK, USB_DEVICE_ID_ORTEK_WKB2000) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS, USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_KEYBOARD) },
|
||||
#if IS_ENABLED(CONFIG_HID_ROCCAT)
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_ROCCAT, USB_DEVICE_ID_ROCCAT_KONE) },
|
||||
diff -Naur linux-3.9/drivers/hid/hid-ids.h linux-3.9.patch/drivers/hid/hid-ids.h
|
||||
--- linux-3.9/drivers/hid/hid-ids.h 2013-04-29 02:36:01.000000000 +0200
|
||||
+++ linux-3.9.patch/drivers/hid/hid-ids.h 2013-04-29 17:08:40.537323981 +0200
|
||||
@@ -663,6 +663,9 @@
|
||||
|
||||
#define USB_VENDOR_ID_PHILIPS 0x0471
|
||||
#define USB_DEVICE_ID_PHILIPS_IEEE802154_DONGLE 0x0617
|
||||
+#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1 0x206c
|
||||
+#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2 0x20cc
|
||||
+#define USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3 0x0613
|
||||
|
||||
#define USB_VENDOR_ID_PI_ENGINEERING 0x05f3
|
||||
#define USB_DEVICE_ID_PI_ENGINEERING_VEC_USB_FOOTPEDAL 0xff
|
||||
diff -Naur linux-3.9/drivers/hid/hid-spinelplus.c linux-3.9.patch/drivers/hid/hid-spinelplus.c
|
||||
--- linux-3.9/drivers/hid/hid-spinelplus.c 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ linux-3.9.patch/drivers/hid/hid-spinelplus.c 2013-04-29 17:08:40.537323981 +0200
|
||||
@@ -0,0 +1,104 @@
|
||||
+/*
|
||||
+ * HID driver for "PHILIPS MCE USB IR Receiver- Spinel plus" remotes
|
||||
+ *
|
||||
+ * Copyright (c) 2010 Panagiotis Skintzos
|
||||
+ *
|
||||
+ * Renamed to Spinel, cleanup and modified to also support
|
||||
+ * Spinel Plus 0471:20CC by Stephan Raue 2012.
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * This program is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License as published by the Free
|
||||
+ * Software Foundation; either version 2 of the License, or (at your option)
|
||||
+ * any later version.
|
||||
+ */
|
||||
+
|
||||
+#include <linux/device.h>
|
||||
+#include <linux/input.h>
|
||||
+#include <linux/hid.h>
|
||||
+#include <linux/module.h>
|
||||
+
|
||||
+#include "hid-ids.h"
|
||||
+
|
||||
+#define spinelplus_map_key(c) set_bit(EV_REP, hi->input->evbit); \
|
||||
+ hid_map_usage_clear(hi, usage, bit, max, EV_KEY, (c))
|
||||
+
|
||||
+static int spinelplus_input_mapping(struct hid_device *hdev,
|
||||
+ struct hid_input *hi, struct hid_field *field, struct hid_usage *usage,
|
||||
+ unsigned long **bit, int *max)
|
||||
+{
|
||||
+ switch (usage->hid) {
|
||||
+ case 0xffbc000d: spinelplus_map_key(KEY_MEDIA); break;
|
||||
+ case 0xffbc0024: spinelplus_map_key(KEY_MEDIA); break;
|
||||
+ case 0xffbc0027: spinelplus_map_key(KEY_ZOOM); break;
|
||||
+ case 0xffbc0033: spinelplus_map_key(KEY_HOME); break;
|
||||
+ case 0xffbc0035: spinelplus_map_key(KEY_CAMERA); break;
|
||||
+ case 0xffbc0036: spinelplus_map_key(KEY_EPG); break;
|
||||
+ case 0xffbc0037: spinelplus_map_key(KEY_DVD); break;
|
||||
+ case 0xffbc0038: spinelplus_map_key(KEY_HOME); break;
|
||||
+ case 0xffbc0039: spinelplus_map_key(KEY_MP3); break;
|
||||
+ case 0xffbc003a: spinelplus_map_key(KEY_VIDEO); break;
|
||||
+ case 0xffbc005a: spinelplus_map_key(KEY_TEXT); break;
|
||||
+ case 0xffbc005b: spinelplus_map_key(KEY_RED); break;
|
||||
+ case 0xffbc005c: spinelplus_map_key(KEY_GREEN); break;
|
||||
+ case 0xffbc005d: spinelplus_map_key(KEY_YELLOW); break;
|
||||
+ case 0xffbc005e: spinelplus_map_key(KEY_BLUE); break;
|
||||
+ default:
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+static int spinelplus_probe(struct hid_device *hdev,
|
||||
+ const struct hid_device_id *id)
|
||||
+{
|
||||
+ int ret;
|
||||
+ /* Connect only to hid input (not hiddev & hidraw)*/
|
||||
+ unsigned int cmask = HID_CONNECT_HIDINPUT;
|
||||
+
|
||||
+ ret = hid_parse(hdev);
|
||||
+ if (ret) {
|
||||
+ dev_err(&hdev->dev, "parse failed\n");
|
||||
+ goto err_free;
|
||||
+ }
|
||||
+
|
||||
+ ret = hid_hw_start(hdev, cmask);
|
||||
+ if (ret) {
|
||||
+ dev_err(&hdev->dev, "hw start failed\n");
|
||||
+ goto err_free;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+err_free:
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static const struct hid_device_id spinelplus_devices[] = {
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_1) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_2) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_PHILIPS,USB_DEVICE_ID_PHILIPS_SPINEL_PLUS_3) },
|
||||
+ { }
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(hid, spinelplus_devices);
|
||||
+
|
||||
+static struct hid_driver spinelplus_driver = {
|
||||
+ .name = "SpinelPlus",
|
||||
+ .id_table = spinelplus_devices,
|
||||
+ .input_mapping = spinelplus_input_mapping,
|
||||
+ .probe = spinelplus_probe,
|
||||
+};
|
||||
+
|
||||
+static int __init spinelplus_init(void)
|
||||
+{
|
||||
+ 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");
|
||||
diff -Naur linux-3.9/drivers/hid/Kconfig linux-3.9.patch/drivers/hid/Kconfig
|
||||
--- linux-3.9/drivers/hid/Kconfig 2013-04-29 02:36:01.000000000 +0200
|
||||
+++ linux-3.9.patch/drivers/hid/Kconfig 2013-04-29 17:08:40.538323977 +0200
|
||||
@@ -602,6 +602,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) remote
|
||||
+
|
||||
config HID_SUNPLUS
|
||||
tristate "Sunplus wireless desktop"
|
||||
depends on USB_HID
|
||||
diff -Naur linux-3.9/drivers/hid/Makefile linux-3.9.patch/drivers/hid/Makefile
|
||||
--- linux-3.9/drivers/hid/Makefile 2013-04-29 02:36:01.000000000 +0200
|
||||
+++ linux-3.9.patch/drivers/hid/Makefile 2013-04-29 17:09:26.744173841 +0200
|
||||
@@ -101,6 +101,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
|
@ -0,0 +1,12 @@
|
||||
diff -Naur linux-3.0/drivers/media/rc/nuvoton-cir.c linux-3.0.patch/drivers/media/rc/nuvoton-cir.c
|
||||
--- linux-3.0/drivers/media/rc/nuvoton-cir.c 2011-07-22 04:17:23.000000000 +0200
|
||||
+++ linux-3.0.patch/drivers/media/rc/nuvoton-cir.c 2011-07-22 21:30:48.374591146 +0200
|
||||
@@ -1110,7 +1110,7 @@
|
||||
rdev->dev.parent = &pdev->dev;
|
||||
rdev->driver_name = NVT_DRIVER_NAME;
|
||||
rdev->map_name = RC_MAP_RC6_MCE;
|
||||
- rdev->timeout = MS_TO_NS(100);
|
||||
+ rdev->timeout = US_TO_NS(1000);
|
||||
/* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */
|
||||
rdev->rx_resolution = US_TO_NS(CIR_SAMPLE_PERIOD);
|
||||
#if 0
|
11
packages/linux/patches/3.10/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
vendored
Normal file
11
packages/linux/patches/3.10/linux-055-add_Formosa_eHome_Infrared_Receiver.patch
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
--- linux-3.2.2.orig/drivers/media/rc/mceusb.c 2012-01-30 23:37:12.374473509 +0100
|
||||
+++ linux-3.2.2/drivers/media/rc/mceusb.c 2012-01-30 23:40:57.989652931 +0100
|
||||
@@ -350,6 +350,8 @@
|
||||
{ USB_DEVICE(VENDOR_FORMOSA, 0xe015) },
|
||||
/* Formosa21 / eHome Infrared Receiver */
|
||||
{ USB_DEVICE(VENDOR_FORMOSA, 0xe016) },
|
||||
+ /* Formosa21 / eHome Infrared Receiver */
|
||||
+ { USB_DEVICE(VENDOR_FORMOSA, 0xe042) },
|
||||
/* Formosa aim / Trust MCE Infrared Receiver */
|
||||
{ USB_DEVICE(VENDOR_FORMOSA, 0xe017),
|
||||
.driver_info = MCE_GEN2_NO_TX },
|
20
packages/linux/patches/3.10/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
vendored
Normal file
20
packages/linux/patches/3.10/linux-056-add_Adaptec_eHome_Infrared_Receiver.patch
vendored
Normal file
@ -0,0 +1,20 @@
|
||||
diff -Naur linux-3.6.7/drivers/media/rc/mceusb.c linux-3.6.7.patch/drivers/media/rc/mceusb.c
|
||||
--- linux-3.6.7/drivers/media/rc/mceusb.c 2012-11-29 04:45:51.142129739 +0100
|
||||
+++ linux-3.6.7.patch/drivers/media/rc/mceusb.c 2012-11-29 04:51:30.982828558 +0100
|
||||
@@ -200,6 +200,7 @@
|
||||
#define VENDOR_TIVO 0x105a
|
||||
#define VENDOR_CONEXANT 0x0572
|
||||
#define VENDOR_TWISTEDMELON 0x2596
|
||||
+#define VENDOR_ADAPTEC 0x03f3
|
||||
|
||||
enum mceusb_model_type {
|
||||
MCE_GEN2 = 0, /* Most boards */
|
||||
@@ -400,6 +401,8 @@
|
||||
{ USB_DEVICE(VENDOR_TWISTEDMELON, 0x8016) },
|
||||
/* Twisted Melon Inc. - Manta Transceiver */
|
||||
{ USB_DEVICE(VENDOR_TWISTEDMELON, 0x8042) },
|
||||
+ /* Adaptec / HP eHome Receiver */
|
||||
+ { USB_DEVICE(VENDOR_ADAPTEC, 0x0094) },
|
||||
/* Terminating entry */
|
||||
{ }
|
||||
};
|
22
packages/linux/patches/3.10/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
vendored
Normal file
22
packages/linux/patches/3.10/linux-057-Removed-MCE-customer-code-restriction-in-rc6-decode.patch
vendored
Normal file
@ -0,0 +1,22 @@
|
||||
--- linux/drivers/media/rc/ir-rc6-decoder.c 2012-11-25 22:08:13.148418669 -0800
|
||||
+++ linux.patch/drivers/media/rc/ir-rc6-decoder.c 2012-11-25 22:07:48.864417975 -0800
|
||||
@@ -39,7 +39,6 @@
|
||||
#define RC6_STARTBIT_MASK 0x08 /* for the header bits */
|
||||
#define RC6_6A_MCE_TOGGLE_MASK 0x8000 /* for the body bits */
|
||||
#define RC6_6A_LCC_MASK 0xffff0000 /* RC6-6A-32 long customer code mask */
|
||||
-#define RC6_6A_MCE_CC 0x800f0000 /* MCE customer code */
|
||||
#ifndef CHAR_BIT
|
||||
#define CHAR_BIT 8 /* Normally in <limits.h> */
|
||||
#endif
|
||||
@@ -242,9 +241,8 @@ again:
|
||||
}
|
||||
|
||||
scancode = data->body;
|
||||
- if (data->count == RC6_6A_32_NBITS &&
|
||||
- (scancode & RC6_6A_LCC_MASK) == RC6_6A_MCE_CC) {
|
||||
- /* MCE RC */
|
||||
+ if (data->count == RC6_6A_32_NBITS) {
|
||||
+ /* MCE compatible RC */
|
||||
toggle = (scancode & RC6_6A_MCE_TOGGLE_MASK) ? 1 : 0;
|
||||
scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
|
||||
} else {
|
13
packages/linux/patches/3.10/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
vendored
Normal file
13
packages/linux/patches/3.10/linux-057-add_SMK_Manufacturing_Inc_Infrared_Receiver.patch
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
diff -Naur linux-3.9.4/drivers/media/rc/mceusb.c linux-3.9.4.patch/drivers/media/rc/mceusb.c
|
||||
--- linux-3.9.4/drivers/media/rc/mceusb.c 2013-05-24 20:45:59.000000000 +0200
|
||||
+++ linux-3.9.4.patch/drivers/media/rc/mceusb.c 2013-05-27 12:28:12.811230633 +0200
|
||||
@@ -309,6 +309,9 @@
|
||||
/* SMK/I-O Data GV-MC7/RCKIT Receiver */
|
||||
{ USB_DEVICE(VENDOR_SMK, 0x0353),
|
||||
.driver_info = MCE_GEN2_NO_TX },
|
||||
+ /* SMK Manufacturing, Inc. Receiver */
|
||||
+ { USB_DEVICE(VENDOR_SMK, 0x0357),
|
||||
+ .driver_info = MCE_GEN2_NO_TX },
|
||||
/* Tatung eHome Infrared Transceiver */
|
||||
{ USB_DEVICE(VENDOR_TATUNG, 0x9150) },
|
||||
/* Shuttle eHome Infrared Transceiver */
|
867
packages/linux/patches/3.10/linux-058.01-HID-Sony-upstream_patches.patch
vendored
Normal file
867
packages/linux/patches/3.10/linux-058.01-HID-Sony-upstream_patches.patch
vendored
Normal file
@ -0,0 +1,867 @@
|
||||
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
|
||||
index 427b759..22d320e 100644
|
||||
--- a/drivers/hid/Kconfig
|
||||
+++ b/drivers/hid/Kconfig
|
||||
@@ -561,15 +561,6 @@ config HID_PRIMAX
|
||||
Support for Primax devices that are not fully compliant with the
|
||||
HID standard.
|
||||
|
||||
-config HID_PS3REMOTE
|
||||
- tristate "Sony PS3 BD Remote Control"
|
||||
- depends on HID
|
||||
- ---help---
|
||||
- Support for the Sony PS3 Blue-ray Disk Remote Control and Logitech
|
||||
- Harmony Adapter for PS3, which connect over Bluetooth.
|
||||
-
|
||||
- Support for the 6-axis controllers is provided by HID_SONY.
|
||||
-
|
||||
config HID_ROCCAT
|
||||
tristate "Roccat device support"
|
||||
depends on USB_HID
|
||||
@@ -594,12 +585,17 @@ config HID_SAMSUNG
|
||||
Support for Samsung InfraRed remote control or keyboards.
|
||||
|
||||
config HID_SONY
|
||||
- tristate "Sony PS3 controller"
|
||||
+ tristate "Sony PS2/3 accessories"
|
||||
depends on USB_HID
|
||||
+ depends on NEW_LEDS
|
||||
+ depends on LEDS_CLASS
|
||||
---help---
|
||||
- Support for Sony PS3 6-axis controllers.
|
||||
-
|
||||
- Support for the Sony PS3 BD Remote is provided by HID_PS3REMOTE.
|
||||
+ Support for
|
||||
+
|
||||
+ * Sony PS3 6-axis controllers
|
||||
+ * Buzz controllers
|
||||
+ * Sony PS3 Blue-ray Disk Remote Control (Bluetooth)
|
||||
+ * Logitech Harmony adapter for Sony Playstation 3 (Bluetooth)
|
||||
|
||||
config HID_SPEEDLINK
|
||||
tristate "Speedlink VAD Cezanne mouse support"
|
||||
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
|
||||
index b545124..419b7ca 100644
|
||||
--- a/drivers/hid/Makefile
|
||||
+++ b/drivers/hid/Makefile
|
||||
@@ -92,7 +92,6 @@ hid-picolcd-y += hid-picolcd_debugfs.o
|
||||
endif
|
||||
|
||||
obj-$(CONFIG_HID_PRIMAX) += hid-primax.o
|
||||
-obj-$(CONFIG_HID_PS3REMOTE) += hid-ps3remote.o
|
||||
obj-$(CONFIG_HID_ROCCAT) += hid-roccat.o hid-roccat-common.o \
|
||||
hid-roccat-arvo.o hid-roccat-isku.o hid-roccat-kone.o \
|
||||
hid-roccat-koneplus.o hid-roccat-konepure.o hid-roccat-kovaplus.o \
|
||||
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
||||
index b885a28..37e35c0 100644
|
||||
--- a/drivers/hid/hid-core.c
|
||||
+++ b/drivers/hid/hid-core.c
|
||||
@@ -1683,6 +1683,8 @@ static const struct hid_device_id hid_have_special_driver[] = {
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_WIRELESS_KBD_MOUSE) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SKYCABLE, USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER) },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER) },
|
||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER) },
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index 56b224e..c11cca1 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -737,6 +737,8 @@
|
||||
#define USB_DEVICE_ID_SONY_PS3_BDREMOTE 0x0306
|
||||
#define USB_DEVICE_ID_SONY_PS3_CONTROLLER 0x0268
|
||||
#define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f
|
||||
+#define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002
|
||||
+#define USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER 0x1000
|
||||
|
||||
#define USB_VENDOR_ID_SOUNDGRAPH 0x15c2
|
||||
#define USB_DEVICE_ID_SOUNDGRAPH_IMON_FIRST 0x0034
|
||||
diff --git a/drivers/hid/hid-ps3remote.c b/drivers/hid/hid-ps3remote.c
|
||||
deleted file mode 100644
|
||||
index f1239d3..0000000
|
||||
--- a/drivers/hid/hid-ps3remote.c
|
||||
+++ /dev/null
|
||||
@@ -1,204 +0,0 @@
|
||||
-/*
|
||||
- * HID driver for Sony PS3 BD Remote Control
|
||||
- *
|
||||
- * Copyright (c) 2012 David Dillow <dave@thedillows.org>
|
||||
- * Based on a blend of the bluez fakehid user-space code by Marcel Holtmann
|
||||
- * and other kernel HID drivers.
|
||||
- */
|
||||
-
|
||||
-/*
|
||||
- * This program is free software; you can redistribute it and/or modify it
|
||||
- * under the terms of the GNU General Public License as published by the Free
|
||||
- * Software Foundation; either version 2 of the License, or (at your option)
|
||||
- * any later version.
|
||||
- */
|
||||
-
|
||||
-/* NOTE: in order for the Sony PS3 BD Remote Control to be found by
|
||||
- * a Bluetooth host, the key combination Start+Enter has to be kept pressed
|
||||
- * for about 7 seconds with the Bluetooth Host Controller in discovering mode.
|
||||
- *
|
||||
- * There will be no PIN request from the device.
|
||||
- */
|
||||
-
|
||||
-#include <linux/device.h>
|
||||
-#include <linux/hid.h>
|
||||
-#include <linux/module.h>
|
||||
-
|
||||
-#include "hid-ids.h"
|
||||
-
|
||||
-static __u8 ps3remote_rdesc[] = {
|
||||
- 0x05, 0x01, /* GUsagePage Generic Desktop */
|
||||
- 0x09, 0x05, /* LUsage 0x05 [Game Pad] */
|
||||
- 0xA1, 0x01, /* MCollection Application (mouse, keyboard) */
|
||||
-
|
||||
- /* Use collection 1 for joypad buttons */
|
||||
- 0xA1, 0x02, /* MCollection Logical (interrelated data) */
|
||||
-
|
||||
- /* Ignore the 1st byte, maybe it is used for a controller
|
||||
- * number but it's not needed for correct operation */
|
||||
- 0x75, 0x08, /* GReportSize 0x08 [8] */
|
||||
- 0x95, 0x01, /* GReportCount 0x01 [1] */
|
||||
- 0x81, 0x01, /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
|
||||
-
|
||||
- /* Bytes from 2nd to 4th are a bitmap for joypad buttons, for these
|
||||
- * buttons multiple keypresses are allowed */
|
||||
- 0x05, 0x09, /* GUsagePage Button */
|
||||
- 0x19, 0x01, /* LUsageMinimum 0x01 [Button 1 (primary/trigger)] */
|
||||
- 0x29, 0x18, /* LUsageMaximum 0x18 [Button 24] */
|
||||
- 0x14, /* GLogicalMinimum [0] */
|
||||
- 0x25, 0x01, /* GLogicalMaximum 0x01 [1] */
|
||||
- 0x75, 0x01, /* GReportSize 0x01 [1] */
|
||||
- 0x95, 0x18, /* GReportCount 0x18 [24] */
|
||||
- 0x81, 0x02, /* MInput 0x02 (Data[0] Var[1] Abs[2]) */
|
||||
-
|
||||
- 0xC0, /* MEndCollection */
|
||||
-
|
||||
- /* Use collection 2 for remote control buttons */
|
||||
- 0xA1, 0x02, /* MCollection Logical (interrelated data) */
|
||||
-
|
||||
- /* 5th byte is used for remote control buttons */
|
||||
- 0x05, 0x09, /* GUsagePage Button */
|
||||
- 0x18, /* LUsageMinimum [No button pressed] */
|
||||
- 0x29, 0xFE, /* LUsageMaximum 0xFE [Button 254] */
|
||||
- 0x14, /* GLogicalMinimum [0] */
|
||||
- 0x26, 0xFE, 0x00, /* GLogicalMaximum 0x00FE [254] */
|
||||
- 0x75, 0x08, /* GReportSize 0x08 [8] */
|
||||
- 0x95, 0x01, /* GReportCount 0x01 [1] */
|
||||
- 0x80, /* MInput */
|
||||
-
|
||||
- /* Ignore bytes from 6th to 11th, 6th to 10th are always constant at
|
||||
- * 0xff and 11th is for press indication */
|
||||
- 0x75, 0x08, /* GReportSize 0x08 [8] */
|
||||
- 0x95, 0x06, /* GReportCount 0x06 [6] */
|
||||
- 0x81, 0x01, /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
|
||||
-
|
||||
- /* 12th byte is for battery strength */
|
||||
- 0x05, 0x06, /* GUsagePage Generic Device Controls */
|
||||
- 0x09, 0x20, /* LUsage 0x20 [Battery Strength] */
|
||||
- 0x14, /* GLogicalMinimum [0] */
|
||||
- 0x25, 0x05, /* GLogicalMaximum 0x05 [5] */
|
||||
- 0x75, 0x08, /* GReportSize 0x08 [8] */
|
||||
- 0x95, 0x01, /* GReportCount 0x01 [1] */
|
||||
- 0x81, 0x02, /* MInput 0x02 (Data[0] Var[1] Abs[2]) */
|
||||
-
|
||||
- 0xC0, /* MEndCollection */
|
||||
-
|
||||
- 0xC0 /* MEndCollection [Game Pad] */
|
||||
-};
|
||||
-
|
||||
-static const unsigned int ps3remote_keymap_joypad_buttons[] = {
|
||||
- [0x01] = KEY_SELECT,
|
||||
- [0x02] = BTN_THUMBL, /* L3 */
|
||||
- [0x03] = BTN_THUMBR, /* R3 */
|
||||
- [0x04] = BTN_START,
|
||||
- [0x05] = KEY_UP,
|
||||
- [0x06] = KEY_RIGHT,
|
||||
- [0x07] = KEY_DOWN,
|
||||
- [0x08] = KEY_LEFT,
|
||||
- [0x09] = BTN_TL2, /* L2 */
|
||||
- [0x0a] = BTN_TR2, /* R2 */
|
||||
- [0x0b] = BTN_TL, /* L1 */
|
||||
- [0x0c] = BTN_TR, /* R1 */
|
||||
- [0x0d] = KEY_OPTION, /* options/triangle */
|
||||
- [0x0e] = KEY_BACK, /* back/circle */
|
||||
- [0x0f] = BTN_0, /* cross */
|
||||
- [0x10] = KEY_SCREEN, /* view/square */
|
||||
- [0x11] = KEY_HOMEPAGE, /* PS button */
|
||||
- [0x14] = KEY_ENTER,
|
||||
-};
|
||||
-static const unsigned int ps3remote_keymap_remote_buttons[] = {
|
||||
- [0x00] = KEY_1,
|
||||
- [0x01] = KEY_2,
|
||||
- [0x02] = KEY_3,
|
||||
- [0x03] = KEY_4,
|
||||
- [0x04] = KEY_5,
|
||||
- [0x05] = KEY_6,
|
||||
- [0x06] = KEY_7,
|
||||
- [0x07] = KEY_8,
|
||||
- [0x08] = KEY_9,
|
||||
- [0x09] = KEY_0,
|
||||
- [0x0e] = KEY_ESC, /* return */
|
||||
- [0x0f] = KEY_CLEAR,
|
||||
- [0x16] = KEY_EJECTCD,
|
||||
- [0x1a] = KEY_MENU, /* top menu */
|
||||
- [0x28] = KEY_TIME,
|
||||
- [0x30] = KEY_PREVIOUS,
|
||||
- [0x31] = KEY_NEXT,
|
||||
- [0x32] = KEY_PLAY,
|
||||
- [0x33] = KEY_REWIND, /* scan back */
|
||||
- [0x34] = KEY_FORWARD, /* scan forward */
|
||||
- [0x38] = KEY_STOP,
|
||||
- [0x39] = KEY_PAUSE,
|
||||
- [0x40] = KEY_CONTEXT_MENU, /* pop up/menu */
|
||||
- [0x60] = KEY_FRAMEBACK, /* slow/step back */
|
||||
- [0x61] = KEY_FRAMEFORWARD, /* slow/step forward */
|
||||
- [0x63] = KEY_SUBTITLE,
|
||||
- [0x64] = KEY_AUDIO,
|
||||
- [0x65] = KEY_ANGLE,
|
||||
- [0x70] = KEY_INFO, /* display */
|
||||
- [0x80] = KEY_BLUE,
|
||||
- [0x81] = KEY_RED,
|
||||
- [0x82] = KEY_GREEN,
|
||||
- [0x83] = KEY_YELLOW,
|
||||
-};
|
||||
-
|
||||
-static __u8 *ps3remote_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||
- unsigned int *rsize)
|
||||
-{
|
||||
- *rsize = sizeof(ps3remote_rdesc);
|
||||
- return ps3remote_rdesc;
|
||||
-}
|
||||
-
|
||||
-static int ps3remote_mapping(struct hid_device *hdev, struct hid_input *hi,
|
||||
- struct hid_field *field, struct hid_usage *usage,
|
||||
- unsigned long **bit, int *max)
|
||||
-{
|
||||
- unsigned int key = usage->hid & HID_USAGE;
|
||||
-
|
||||
- if ((usage->hid & HID_USAGE_PAGE) != HID_UP_BUTTON)
|
||||
- return -1;
|
||||
-
|
||||
- switch (usage->collection_index) {
|
||||
- case 1:
|
||||
- if (key >= ARRAY_SIZE(ps3remote_keymap_joypad_buttons))
|
||||
- return -1;
|
||||
-
|
||||
- key = ps3remote_keymap_joypad_buttons[key];
|
||||
- if (!key)
|
||||
- return -1;
|
||||
- break;
|
||||
- case 2:
|
||||
- if (key >= ARRAY_SIZE(ps3remote_keymap_remote_buttons))
|
||||
- return -1;
|
||||
-
|
||||
- key = ps3remote_keymap_remote_buttons[key];
|
||||
- if (!key)
|
||||
- return -1;
|
||||
- break;
|
||||
- default:
|
||||
- return -1;
|
||||
- }
|
||||
-
|
||||
- hid_map_usage_clear(hi, usage, bit, max, EV_KEY, key);
|
||||
- return 1;
|
||||
-}
|
||||
-
|
||||
-static const struct hid_device_id ps3remote_devices[] = {
|
||||
- /* PS3 BD Remote Control */
|
||||
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
|
||||
- /* Logitech Harmony Adapter for PS3 */
|
||||
- { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3) },
|
||||
- { }
|
||||
-};
|
||||
-MODULE_DEVICE_TABLE(hid, ps3remote_devices);
|
||||
-
|
||||
-static struct hid_driver ps3remote_driver = {
|
||||
- .name = "ps3_remote",
|
||||
- .id_table = ps3remote_devices,
|
||||
- .report_fixup = ps3remote_fixup,
|
||||
- .input_mapping = ps3remote_mapping,
|
||||
-};
|
||||
-module_hid_driver(ps3remote_driver);
|
||||
-
|
||||
-MODULE_LICENSE("GPL");
|
||||
-MODULE_AUTHOR("David Dillow <dave@thedillows.org>, Antonio Ospite <ospite@studenti.unina.it>");
|
||||
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
|
||||
index 312098e..83f9629 100644
|
||||
--- a/drivers/hid/hid-sony.c
|
||||
+++ b/drivers/hid/hid-sony.c
|
||||
@@ -1,11 +1,13 @@
|
||||
/*
|
||||
- * HID driver for some sony "special" devices
|
||||
+ * HID driver for Sony / PS2 / PS3 BD devices.
|
||||
*
|
||||
* Copyright (c) 1999 Andreas Gal
|
||||
* Copyright (c) 2000-2005 Vojtech Pavlik <vojtech@suse.cz>
|
||||
* Copyright (c) 2005 Michael Haboustak <mike-@cinci.rr.com> for Concept2, Inc
|
||||
* Copyright (c) 2008 Jiri Slaby
|
||||
- * Copyright (c) 2006-2008 Jiri Kosina
|
||||
+ * Copyright (c) 2012 David Dillow <dave@thedillows.org>
|
||||
+ * Copyright (c) 2006-2013 Jiri Kosina
|
||||
+ * Copyright (c) 2013 Colin Leitner <colin.leitner@gmail.com>
|
||||
*/
|
||||
|
||||
/*
|
||||
@@ -15,17 +17,28 @@
|
||||
* any later version.
|
||||
*/
|
||||
|
||||
+/* NOTE: in order for the Sony PS3 BD Remote Control to be found by
|
||||
+ * a Bluetooth host, the key combination Start+Enter has to be kept pressed
|
||||
+ * for about 7 seconds with the Bluetooth Host Controller in discovering mode.
|
||||
+ *
|
||||
+ * There will be no PIN request from the device.
|
||||
+ */
|
||||
+
|
||||
#include <linux/device.h>
|
||||
#include <linux/hid.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/usb.h>
|
||||
+#include "usbhid/usbhid.h"
|
||||
+#include <linux/leds.h>
|
||||
|
||||
#include "hid-ids.h"
|
||||
|
||||
#define VAIO_RDESC_CONSTANT (1 << 0)
|
||||
#define SIXAXIS_CONTROLLER_USB (1 << 1)
|
||||
#define SIXAXIS_CONTROLLER_BT (1 << 2)
|
||||
+#define BUZZ_CONTROLLER (1 << 3)
|
||||
+#define PS3REMOTE (1 << 4)
|
||||
|
||||
static const u8 sixaxis_rdesc_fixup[] = {
|
||||
0x95, 0x13, 0x09, 0x01, 0x81, 0x02, 0x95, 0x0C,
|
||||
@@ -55,10 +68,214 @@ static const u8 sixaxis_rdesc_fixup2[] = {
|
||||
0xb1, 0x02, 0xc0, 0xc0,
|
||||
};
|
||||
|
||||
+static __u8 ps3remote_rdesc[] = {
|
||||
+ 0x05, 0x01, /* GUsagePage Generic Desktop */
|
||||
+ 0x09, 0x05, /* LUsage 0x05 [Game Pad] */
|
||||
+ 0xA1, 0x01, /* MCollection Application (mouse, keyboard) */
|
||||
+
|
||||
+ /* Use collection 1 for joypad buttons */
|
||||
+ 0xA1, 0x02, /* MCollection Logical (interrelated data) */
|
||||
+
|
||||
+ /* Ignore the 1st byte, maybe it is used for a controller
|
||||
+ * number but it's not needed for correct operation */
|
||||
+ 0x75, 0x08, /* GReportSize 0x08 [8] */
|
||||
+ 0x95, 0x01, /* GReportCount 0x01 [1] */
|
||||
+ 0x81, 0x01, /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
|
||||
+
|
||||
+ /* Bytes from 2nd to 4th are a bitmap for joypad buttons, for these
|
||||
+ * buttons multiple keypresses are allowed */
|
||||
+ 0x05, 0x09, /* GUsagePage Button */
|
||||
+ 0x19, 0x01, /* LUsageMinimum 0x01 [Button 1 (primary/trigger)] */
|
||||
+ 0x29, 0x18, /* LUsageMaximum 0x18 [Button 24] */
|
||||
+ 0x14, /* GLogicalMinimum [0] */
|
||||
+ 0x25, 0x01, /* GLogicalMaximum 0x01 [1] */
|
||||
+ 0x75, 0x01, /* GReportSize 0x01 [1] */
|
||||
+ 0x95, 0x18, /* GReportCount 0x18 [24] */
|
||||
+ 0x81, 0x02, /* MInput 0x02 (Data[0] Var[1] Abs[2]) */
|
||||
+
|
||||
+ 0xC0, /* MEndCollection */
|
||||
+
|
||||
+ /* Use collection 2 for remote control buttons */
|
||||
+ 0xA1, 0x02, /* MCollection Logical (interrelated data) */
|
||||
+
|
||||
+ /* 5th byte is used for remote control buttons */
|
||||
+ 0x05, 0x09, /* GUsagePage Button */
|
||||
+ 0x18, /* LUsageMinimum [No button pressed] */
|
||||
+ 0x29, 0xFE, /* LUsageMaximum 0xFE [Button 254] */
|
||||
+ 0x14, /* GLogicalMinimum [0] */
|
||||
+ 0x26, 0xFE, 0x00, /* GLogicalMaximum 0x00FE [254] */
|
||||
+ 0x75, 0x08, /* GReportSize 0x08 [8] */
|
||||
+ 0x95, 0x01, /* GReportCount 0x01 [1] */
|
||||
+ 0x80, /* MInput */
|
||||
+
|
||||
+ /* Ignore bytes from 6th to 11th, 6th to 10th are always constant at
|
||||
+ * 0xff and 11th is for press indication */
|
||||
+ 0x75, 0x08, /* GReportSize 0x08 [8] */
|
||||
+ 0x95, 0x06, /* GReportCount 0x06 [6] */
|
||||
+ 0x81, 0x01, /* MInput 0x01 (Const[0] Arr[1] Abs[2]) */
|
||||
+
|
||||
+ /* 12th byte is for battery strength */
|
||||
+ 0x05, 0x06, /* GUsagePage Generic Device Controls */
|
||||
+ 0x09, 0x20, /* LUsage 0x20 [Battery Strength] */
|
||||
+ 0x14, /* GLogicalMinimum [0] */
|
||||
+ 0x25, 0x05, /* GLogicalMaximum 0x05 [5] */
|
||||
+ 0x75, 0x08, /* GReportSize 0x08 [8] */
|
||||
+ 0x95, 0x01, /* GReportCount 0x01 [1] */
|
||||
+ 0x81, 0x02, /* MInput 0x02 (Data[0] Var[1] Abs[2]) */
|
||||
+
|
||||
+ 0xC0, /* MEndCollection */
|
||||
+
|
||||
+ 0xC0 /* MEndCollection [Game Pad] */
|
||||
+};
|
||||
+
|
||||
+static const unsigned int ps3remote_keymap_joypad_buttons[] = {
|
||||
+ [0x01] = KEY_SELECT,
|
||||
+ [0x02] = BTN_THUMBL, /* L3 */
|
||||
+ [0x03] = BTN_THUMBR, /* R3 */
|
||||
+ [0x04] = BTN_START,
|
||||
+ [0x05] = KEY_UP,
|
||||
+ [0x06] = KEY_RIGHT,
|
||||
+ [0x07] = KEY_DOWN,
|
||||
+ [0x08] = KEY_LEFT,
|
||||
+ [0x09] = BTN_TL2, /* L2 */
|
||||
+ [0x0a] = BTN_TR2, /* R2 */
|
||||
+ [0x0b] = BTN_TL, /* L1 */
|
||||
+ [0x0c] = BTN_TR, /* R1 */
|
||||
+ [0x0d] = KEY_OPTION, /* options/triangle */
|
||||
+ [0x0e] = KEY_BACK, /* back/circle */
|
||||
+ [0x0f] = BTN_0, /* cross */
|
||||
+ [0x10] = KEY_SCREEN, /* view/square */
|
||||
+ [0x11] = KEY_HOMEPAGE, /* PS button */
|
||||
+ [0x14] = KEY_ENTER,
|
||||
+};
|
||||
+static const unsigned int ps3remote_keymap_remote_buttons[] = {
|
||||
+ [0x00] = KEY_1,
|
||||
+ [0x01] = KEY_2,
|
||||
+ [0x02] = KEY_3,
|
||||
+ [0x03] = KEY_4,
|
||||
+ [0x04] = KEY_5,
|
||||
+ [0x05] = KEY_6,
|
||||
+ [0x06] = KEY_7,
|
||||
+ [0x07] = KEY_8,
|
||||
+ [0x08] = KEY_9,
|
||||
+ [0x09] = KEY_0,
|
||||
+ [0x0e] = KEY_ESC, /* return */
|
||||
+ [0x0f] = KEY_CLEAR,
|
||||
+ [0x16] = KEY_EJECTCD,
|
||||
+ [0x1a] = KEY_MENU, /* top menu */
|
||||
+ [0x28] = KEY_TIME,
|
||||
+ [0x30] = KEY_PREVIOUS,
|
||||
+ [0x31] = KEY_NEXT,
|
||||
+ [0x32] = KEY_PLAY,
|
||||
+ [0x33] = KEY_REWIND, /* scan back */
|
||||
+ [0x34] = KEY_FORWARD, /* scan forward */
|
||||
+ [0x38] = KEY_STOP,
|
||||
+ [0x39] = KEY_PAUSE,
|
||||
+ [0x40] = KEY_CONTEXT_MENU, /* pop up/menu */
|
||||
+ [0x60] = KEY_FRAMEBACK, /* slow/step back */
|
||||
+ [0x61] = KEY_FRAMEFORWARD, /* slow/step forward */
|
||||
+ [0x63] = KEY_SUBTITLE,
|
||||
+ [0x64] = KEY_AUDIO,
|
||||
+ [0x65] = KEY_ANGLE,
|
||||
+ [0x70] = KEY_INFO, /* display */
|
||||
+ [0x80] = KEY_BLUE,
|
||||
+ [0x81] = KEY_RED,
|
||||
+ [0x82] = KEY_GREEN,
|
||||
+ [0x83] = KEY_YELLOW,
|
||||
+};
|
||||
+
|
||||
+static const unsigned int buzz_keymap[] = {
|
||||
+ /* The controller has 4 remote buzzers, each with one LED and 5
|
||||
+ * buttons.
|
||||
+ *
|
||||
+ * We use the mapping chosen by the controller, which is:
|
||||
+ *
|
||||
+ * Key Offset
|
||||
+ * -------------------
|
||||
+ * Buzz 1
|
||||
+ * Blue 5
|
||||
+ * Orange 4
|
||||
+ * Green 3
|
||||
+ * Yellow 2
|
||||
+ *
|
||||
+ * So, for example, the orange button on the third buzzer is mapped to
|
||||
+ * BTN_TRIGGER_HAPPY14
|
||||
+ */
|
||||
+ [ 1] = BTN_TRIGGER_HAPPY1,
|
||||
+ [ 2] = BTN_TRIGGER_HAPPY2,
|
||||
+ [ 3] = BTN_TRIGGER_HAPPY3,
|
||||
+ [ 4] = BTN_TRIGGER_HAPPY4,
|
||||
+ [ 5] = BTN_TRIGGER_HAPPY5,
|
||||
+ [ 6] = BTN_TRIGGER_HAPPY6,
|
||||
+ [ 7] = BTN_TRIGGER_HAPPY7,
|
||||
+ [ 8] = BTN_TRIGGER_HAPPY8,
|
||||
+ [ 9] = BTN_TRIGGER_HAPPY9,
|
||||
+ [10] = BTN_TRIGGER_HAPPY10,
|
||||
+ [11] = BTN_TRIGGER_HAPPY11,
|
||||
+ [12] = BTN_TRIGGER_HAPPY12,
|
||||
+ [13] = BTN_TRIGGER_HAPPY13,
|
||||
+ [14] = BTN_TRIGGER_HAPPY14,
|
||||
+ [15] = BTN_TRIGGER_HAPPY15,
|
||||
+ [16] = BTN_TRIGGER_HAPPY16,
|
||||
+ [17] = BTN_TRIGGER_HAPPY17,
|
||||
+ [18] = BTN_TRIGGER_HAPPY18,
|
||||
+ [19] = BTN_TRIGGER_HAPPY19,
|
||||
+ [20] = BTN_TRIGGER_HAPPY20,
|
||||
+};
|
||||
+
|
||||
struct sony_sc {
|
||||
unsigned long quirks;
|
||||
+
|
||||
+ void *extra;
|
||||
};
|
||||
|
||||
+struct buzz_extra {
|
||||
+ int led_state;
|
||||
+ struct led_classdev *leds[4];
|
||||
+};
|
||||
+
|
||||
+static __u8 *ps3remote_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||
+ unsigned int *rsize)
|
||||
+{
|
||||
+ *rsize = sizeof(ps3remote_rdesc);
|
||||
+ return ps3remote_rdesc;
|
||||
+}
|
||||
+
|
||||
+static int ps3remote_mapping(struct hid_device *hdev, struct hid_input *hi,
|
||||
+ struct hid_field *field, struct hid_usage *usage,
|
||||
+ unsigned long **bit, int *max)
|
||||
+{
|
||||
+ unsigned int key = usage->hid & HID_USAGE;
|
||||
+
|
||||
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_BUTTON)
|
||||
+ return -1;
|
||||
+
|
||||
+ switch (usage->collection_index) {
|
||||
+ case 1:
|
||||
+ if (key >= ARRAY_SIZE(ps3remote_keymap_joypad_buttons))
|
||||
+ return -1;
|
||||
+
|
||||
+ key = ps3remote_keymap_joypad_buttons[key];
|
||||
+ if (!key)
|
||||
+ return -1;
|
||||
+ break;
|
||||
+ case 2:
|
||||
+ if (key >= ARRAY_SIZE(ps3remote_keymap_remote_buttons))
|
||||
+ return -1;
|
||||
+
|
||||
+ key = ps3remote_keymap_remote_buttons[key];
|
||||
+ if (!key)
|
||||
+ return -1;
|
||||
+ break;
|
||||
+ default:
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ hid_map_usage_clear(hi, usage, bit, max, EV_KEY, key);
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/* Sony Vaio VGX has wrongly mouse pointer declared as constant */
|
||||
static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||
unsigned int *rsize)
|
||||
@@ -95,6 +312,10 @@ static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||
*rsize = sizeof(sixaxis_rdesc_fixup2);
|
||||
memcpy(rdesc, &sixaxis_rdesc_fixup2, *rsize);
|
||||
}
|
||||
+
|
||||
+ if (sc->quirks & PS3REMOTE)
|
||||
+ return ps3remote_fixup(hdev, rdesc, rsize);
|
||||
+
|
||||
return rdesc;
|
||||
}
|
||||
|
||||
@@ -117,6 +338,41 @@ static int sony_raw_event(struct hid_device *hdev, struct hid_report *report,
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static int sony_mapping(struct hid_device *hdev, struct hid_input *hi,
|
||||
+ struct hid_field *field, struct hid_usage *usage,
|
||||
+ unsigned long **bit, int *max)
|
||||
+{
|
||||
+ struct sony_sc *sc = hid_get_drvdata(hdev);
|
||||
+
|
||||
+ if (sc->quirks & BUZZ_CONTROLLER) {
|
||||
+ unsigned int key = usage->hid & HID_USAGE;
|
||||
+
|
||||
+ if ((usage->hid & HID_USAGE_PAGE) != HID_UP_BUTTON)
|
||||
+ return -1;
|
||||
+
|
||||
+ switch (usage->collection_index) {
|
||||
+ case 1:
|
||||
+ if (key >= ARRAY_SIZE(buzz_keymap))
|
||||
+ return -1;
|
||||
+
|
||||
+ key = buzz_keymap[key];
|
||||
+ if (!key)
|
||||
+ return -1;
|
||||
+ break;
|
||||
+ default:
|
||||
+ return -1;
|
||||
+ }
|
||||
+
|
||||
+ hid_map_usage_clear(hi, usage, bit, max, EV_KEY, key);
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ if (sc->quirks & PS3REMOTE)
|
||||
+ return ps3remote_mapping(hdev, hi, field, usage, bit, max);
|
||||
+
|
||||
+ return -1;
|
||||
+}
|
||||
+
|
||||
/*
|
||||
* The Sony Sixaxis does not handle HID Output Reports on the Interrupt EP
|
||||
* like it should according to usbhid/hid-core.c::usbhid_output_raw_report()
|
||||
@@ -192,11 +448,181 @@ static int sixaxis_set_operational_bt(struct hid_device *hdev)
|
||||
return hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT);
|
||||
}
|
||||
|
||||
+static void buzz_set_leds(struct hid_device *hdev, int leds)
|
||||
+{
|
||||
+ struct list_head *report_list =
|
||||
+ &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
|
||||
+ struct hid_report *report = list_entry(report_list->next,
|
||||
+ struct hid_report, list);
|
||||
+ __s32 *value = report->field[0]->value;
|
||||
+
|
||||
+ value[0] = 0x00;
|
||||
+ value[1] = (leds & 1) ? 0xff : 0x00;
|
||||
+ value[2] = (leds & 2) ? 0xff : 0x00;
|
||||
+ value[3] = (leds & 4) ? 0xff : 0x00;
|
||||
+ value[4] = (leds & 8) ? 0xff : 0x00;
|
||||
+ value[5] = 0x00;
|
||||
+ value[6] = 0x00;
|
||||
+ hid_hw_request(hdev, report, HID_REQ_SET_REPORT);
|
||||
+}
|
||||
+
|
||||
+static void buzz_led_set_brightness(struct led_classdev *led,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ struct device *dev = led->dev->parent;
|
||||
+ struct hid_device *hdev = container_of(dev, struct hid_device, dev);
|
||||
+ struct sony_sc *drv_data;
|
||||
+ struct buzz_extra *buzz;
|
||||
+
|
||||
+ int n;
|
||||
+
|
||||
+ drv_data = hid_get_drvdata(hdev);
|
||||
+ if (!drv_data || !drv_data->extra) {
|
||||
+ hid_err(hdev, "No device data\n");
|
||||
+ return;
|
||||
+ }
|
||||
+ buzz = drv_data->extra;
|
||||
+
|
||||
+ for (n = 0; n < 4; n++) {
|
||||
+ if (led == buzz->leds[n]) {
|
||||
+ int on = !! (buzz->led_state & (1 << n));
|
||||
+ if (value == LED_OFF && on) {
|
||||
+ buzz->led_state &= ~(1 << n);
|
||||
+ buzz_set_leds(hdev, buzz->led_state);
|
||||
+ } else if (value != LED_OFF && !on) {
|
||||
+ buzz->led_state |= (1 << n);
|
||||
+ buzz_set_leds(hdev, buzz->led_state);
|
||||
+ }
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+static enum led_brightness buzz_led_get_brightness(struct led_classdev *led)
|
||||
+{
|
||||
+ struct device *dev = led->dev->parent;
|
||||
+ struct hid_device *hdev = container_of(dev, struct hid_device, dev);
|
||||
+ struct sony_sc *drv_data;
|
||||
+ struct buzz_extra *buzz;
|
||||
+
|
||||
+ int n;
|
||||
+ int on = 0;
|
||||
+
|
||||
+ drv_data = hid_get_drvdata(hdev);
|
||||
+ if (!drv_data || !drv_data->extra) {
|
||||
+ hid_err(hdev, "No device data\n");
|
||||
+ return LED_OFF;
|
||||
+ }
|
||||
+ buzz = drv_data->extra;
|
||||
+
|
||||
+ for (n = 0; n < 4; n++) {
|
||||
+ if (led == buzz->leds[n]) {
|
||||
+ on = !! (buzz->led_state & (1 << n));
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ return on ? LED_FULL : LED_OFF;
|
||||
+}
|
||||
+
|
||||
+static int buzz_init(struct hid_device *hdev)
|
||||
+{
|
||||
+ struct sony_sc *drv_data;
|
||||
+ struct buzz_extra *buzz;
|
||||
+ int n, ret = 0;
|
||||
+ struct led_classdev *led;
|
||||
+ size_t name_sz;
|
||||
+ char *name;
|
||||
+
|
||||
+ drv_data = hid_get_drvdata(hdev);
|
||||
+ BUG_ON(!(drv_data->quirks & BUZZ_CONTROLLER));
|
||||
+
|
||||
+ buzz = kzalloc(sizeof(*buzz), GFP_KERNEL);
|
||||
+ if (!buzz) {
|
||||
+ hid_err(hdev, "Insufficient memory, cannot allocate driver data\n");
|
||||
+ return -ENOMEM;
|
||||
+ }
|
||||
+ drv_data->extra = buzz;
|
||||
+
|
||||
+ /* Clear LEDs as we have no way of reading their initial state. This is
|
||||
+ * only relevant if the driver is loaded after somebody actively set the
|
||||
+ * LEDs to on */
|
||||
+ buzz_set_leds(hdev, 0x00);
|
||||
+
|
||||
+ name_sz = strlen(dev_name(&hdev->dev)) + strlen("::buzz#") + 1;
|
||||
+
|
||||
+ for (n = 0; n < 4; n++) {
|
||||
+ led = kzalloc(sizeof(struct led_classdev) + name_sz, GFP_KERNEL);
|
||||
+ if (!led) {
|
||||
+ hid_err(hdev, "Couldn't allocate memory for LED %d\n", n);
|
||||
+ goto error_leds;
|
||||
+ }
|
||||
+
|
||||
+ name = (void *)(&led[1]);
|
||||
+ snprintf(name, name_sz, "%s::buzz%d", dev_name(&hdev->dev), n + 1);
|
||||
+ led->name = name;
|
||||
+ led->brightness = 0;
|
||||
+ led->max_brightness = 1;
|
||||
+ led->brightness_get = buzz_led_get_brightness;
|
||||
+ led->brightness_set = buzz_led_set_brightness;
|
||||
+
|
||||
+ if (led_classdev_register(&hdev->dev, led)) {
|
||||
+ hid_err(hdev, "Failed to register LED %d\n", n);
|
||||
+ kfree(led);
|
||||
+ goto error_leds;
|
||||
+ }
|
||||
+
|
||||
+ buzz->leds[n] = led;
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+
|
||||
+error_leds:
|
||||
+ for (n = 0; n < 4; n++) {
|
||||
+ led = buzz->leds[n];
|
||||
+ buzz->leds[n] = NULL;
|
||||
+ if (!led)
|
||||
+ continue;
|
||||
+ led_classdev_unregister(led);
|
||||
+ kfree(led);
|
||||
+ }
|
||||
+
|
||||
+ kfree(drv_data->extra);
|
||||
+ drv_data->extra = NULL;
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static void buzz_remove(struct hid_device *hdev)
|
||||
+{
|
||||
+ struct sony_sc *drv_data;
|
||||
+ struct buzz_extra *buzz;
|
||||
+ struct led_classdev *led;
|
||||
+ int n;
|
||||
+
|
||||
+ drv_data = hid_get_drvdata(hdev);
|
||||
+ BUG_ON(!(drv_data->quirks & BUZZ_CONTROLLER));
|
||||
+
|
||||
+ buzz = drv_data->extra;
|
||||
+
|
||||
+ for (n = 0; n < 4; n++) {
|
||||
+ led = buzz->leds[n];
|
||||
+ buzz->leds[n] = NULL;
|
||||
+ if (!led)
|
||||
+ continue;
|
||||
+ led_classdev_unregister(led);
|
||||
+ kfree(led);
|
||||
+ }
|
||||
+
|
||||
+ kfree(drv_data->extra);
|
||||
+ drv_data->extra = NULL;
|
||||
+}
|
||||
+
|
||||
static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
{
|
||||
int ret;
|
||||
unsigned long quirks = id->driver_data;
|
||||
struct sony_sc *sc;
|
||||
+ unsigned int connect_mask = HID_CONNECT_DEFAULT;
|
||||
|
||||
sc = kzalloc(sizeof(*sc), GFP_KERNEL);
|
||||
if (sc == NULL) {
|
||||
@@ -213,8 +639,14 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
- ret = hid_hw_start(hdev, HID_CONNECT_DEFAULT |
|
||||
- HID_CONNECT_HIDDEV_FORCE);
|
||||
+ if (sc->quirks & VAIO_RDESC_CONSTANT)
|
||||
+ connect_mask |= HID_CONNECT_HIDDEV_FORCE;
|
||||
+ else if (sc->quirks & SIXAXIS_CONTROLLER_USB)
|
||||
+ connect_mask |= HID_CONNECT_HIDDEV_FORCE;
|
||||
+ else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
|
||||
+ connect_mask |= HID_CONNECT_HIDDEV_FORCE;
|
||||
+
|
||||
+ ret = hid_hw_start(hdev, connect_mask);
|
||||
if (ret) {
|
||||
hid_err(hdev, "hw start failed\n");
|
||||
goto err_free;
|
||||
@@ -226,6 +658,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
}
|
||||
else if (sc->quirks & SIXAXIS_CONTROLLER_BT)
|
||||
ret = sixaxis_set_operational_bt(hdev);
|
||||
+ else if (sc->quirks & BUZZ_CONTROLLER)
|
||||
+ ret = buzz_init(hdev);
|
||||
else
|
||||
ret = 0;
|
||||
|
||||
@@ -242,8 +676,13 @@ err_free:
|
||||
|
||||
static void sony_remove(struct hid_device *hdev)
|
||||
{
|
||||
+ struct sony_sc *sc = hid_get_drvdata(hdev);
|
||||
+
|
||||
+ if (sc->quirks & BUZZ_CONTROLLER)
|
||||
+ buzz_remove(hdev);
|
||||
+
|
||||
hid_hw_stop(hdev);
|
||||
- kfree(hid_get_drvdata(hdev));
|
||||
+ kfree(sc);
|
||||
}
|
||||
|
||||
static const struct hid_device_id sony_devices[] = {
|
||||
@@ -257,17 +696,30 @@ static const struct hid_device_id sony_devices[] = {
|
||||
.driver_data = VAIO_RDESC_CONSTANT },
|
||||
{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE),
|
||||
.driver_data = VAIO_RDESC_CONSTANT },
|
||||
+ /* Wired Buzz Controller. Reported as Sony Hub from its USB ID and as
|
||||
+ * Logitech joystick from the device descriptor. */
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_BUZZ_CONTROLLER),
|
||||
+ .driver_data = BUZZ_CONTROLLER },
|
||||
+ { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_WIRELESS_BUZZ_CONTROLLER),
|
||||
+ .driver_data = BUZZ_CONTROLLER },
|
||||
+ /* PS3 BD Remote Control */
|
||||
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_BDREMOTE),
|
||||
+ .driver_data = PS3REMOTE },
|
||||
+ /* Logitech Harmony Adapter for PS3 */
|
||||
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3),
|
||||
+ .driver_data = PS3REMOTE },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(hid, sony_devices);
|
||||
|
||||
static struct hid_driver sony_driver = {
|
||||
- .name = "sony",
|
||||
- .id_table = sony_devices,
|
||||
- .probe = sony_probe,
|
||||
- .remove = sony_remove,
|
||||
- .report_fixup = sony_report_fixup,
|
||||
- .raw_event = sony_raw_event
|
||||
+ .name = "sony",
|
||||
+ .id_table = sony_devices,
|
||||
+ .input_mapping = sony_mapping,
|
||||
+ .probe = sony_probe,
|
||||
+ .remove = sony_remove,
|
||||
+ .report_fixup = sony_report_fixup,
|
||||
+ .raw_event = sony_raw_event
|
||||
};
|
||||
module_hid_driver(sony_driver);
|
||||
|
61
packages/linux/patches/3.10/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
vendored
Normal file
61
packages/linux/patches/3.10/linux-058.05-hid_sony-add_autorepeat_for_PS3_remotes.patch
vendored
Normal file
@ -0,0 +1,61 @@
|
||||
Betreff: [RFC] hid/sony: add autorepeat for PS3 remotes
|
||||
Von: David Dillow <dave@thedillows.org>
|
||||
Datum: 28.06.2013 04:28
|
||||
An: linux-input@vger.kernel.org
|
||||
Kopie (CC): Stephan Raue <stephan@openelec.tv>
|
||||
|
||||
Some applications using the PS3 remote would like to have autorepeat
|
||||
from the device. Use the input subsystem's software emulation to provide
|
||||
this capability, and enable those that don't need it to turn it off.
|
||||
---
|
||||
I'm not sure this is the correct approach, or if it is even appropriate
|
||||
for a remote to do autorepeat. However, the media/rc subsystem does do
|
||||
it by default, and it's been requested by users, so there is at least
|
||||
some demand.
|
||||
|
||||
This compiled against the hid-sony driver with the PS3 remote changes
|
||||
merged, but I have done no testing of it. If the approach seems
|
||||
reasonable, I'll try to test it when the MythTV is idle.
|
||||
|
||||
drivers/hid/hid-sony.c | 20 ++++++++++++++++++++
|
||||
1 file changed, 20 insertions(+)
|
||||
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
|
||||
index ecbc749..0bbcd07 100644
|
||||
--- a/drivers/hid/hid-sony.c
|
||||
+++ b/drivers/hid/hid-sony.c
|
||||
@@ -274,6 +274,24 @@ static int ps3remote_mapping(struct hid_device *hdev, struct hid_input *hi,
|
||||
return 1;
|
||||
}
|
||||
|
||||
+static int ps3remote_setup_repeat(struct hid_device *hdev)
|
||||
+{
|
||||
+ struct hid_input *hidinput = list_first_entry(&hdev->inputs,
|
||||
+ struct hid_input, list);
|
||||
+ struct input_dev *input = hidinput->input;
|
||||
+
|
||||
+ /*
|
||||
+ * Set up autorepeat defaults per the remote control subsystem;
|
||||
+ * this must be done after hid_hw_start(), as having these non-zero
|
||||
+ * at the time of input_register_device() tells the input system that
|
||||
+ * the hardware does the autorepeat, and the PS3 remote does not.
|
||||
+ */
|
||||
+ set_bit(EV_REP, input->evbit);
|
||||
+ input->rep[REP_DELAY] = 500;
|
||||
+ input->rep[REP_PERIOD] = 125;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
|
||||
/* Sony Vaio VGX has wrongly mouse pointer declared as constant */
|
||||
static __u8 *sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
|
||||
@@ -659,6 +677,8 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
|
||||
ret = sixaxis_set_operational_bt(hdev);
|
||||
else if (sc->quirks & BUZZ_CONTROLLER)
|
||||
ret = buzz_init(hdev);
|
||||
+ else if (sc->quirks & PS3REMOTE)
|
||||
+ ret = ps3remote_setup_repeat(hdev);
|
||||
else
|
||||
ret = 0;
|
||||
|
||||
|
||||
|
11
packages/linux/patches/3.10/linux-059-remove_some_xpad_pids-0.2.patch
vendored
Normal file
11
packages/linux/patches/3.10/linux-059-remove_some_xpad_pids-0.2.patch
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
diff -Naur linux-3.8.4/drivers/input/joystick/xpad.c linux-3.8.4.patch/drivers/input/joystick/xpad.c
|
||||
--- linux-3.8.4/drivers/input/joystick/xpad.c 2013-03-20 21:11:19.000000000 +0100
|
||||
+++ linux-3.8.4.patch/drivers/input/joystick/xpad.c 2013-03-26 20:24:29.273978355 +0100
|
||||
@@ -174,7 +174,6 @@
|
||||
{ 0x1bad, 0xf901, "Gamestop Xbox 360 Controller", 0, XTYPE_XBOX360 },
|
||||
{ 0x1bad, 0xf903, "Tron Xbox 360 controller", 0, XTYPE_XBOX360 },
|
||||
{ 0x24c6, 0x5300, "PowerA MINI PROEX Controller", 0, XTYPE_XBOX360 },
|
||||
- { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX },
|
||||
{ 0x0000, 0x0000, "Generic X-Box pad", 0, XTYPE_UNKNOWN }
|
||||
};
|
||||
|
14
packages/linux/patches/3.10/linux-060-add_AUGUST_DVB-T205.patch
vendored
Normal file
14
packages/linux/patches/3.10/linux-060-add_AUGUST_DVB-T205.patch
vendored
Normal file
@ -0,0 +1,14 @@
|
||||
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||
index 2cc8ec7..985fa11 100644
|
||||
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
||||
@@ -1408,6 +1408,9 @@ static const struct usb_device_id rtl28xxu_id_table[] = {
|
||||
&rtl2832u_props, "Compro VideoMate U620F", NULL) },
|
||||
{ DVB_USB_DEVICE(USB_VID_KWORLD_2, 0xd394,
|
||||
&rtl2832u_props, "MaxMedia HU394-T", NULL) },
|
||||
+ { DVB_USB_DEVICE(USB_VID_GTEK, 0xa803,
|
||||
+ &rtl2832u_props, "Realtek RTL2832U reference design", NULL) },
|
||||
+
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);
|
12
packages/linux/patches/3.10/linux-203-stb0899_enable_low_symbol_rate.patch
vendored
Normal file
12
packages/linux/patches/3.10/linux-203-stb0899_enable_low_symbol_rate.patch
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c
|
||||
--- linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-11 18:19:28.000000000 +0100
|
||||
+++ linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-16 10:25:43.479645317 +0100
|
||||
@@ -1581,7 +1581,7 @@
|
||||
.frequency_max = 2150000,
|
||||
.frequency_stepsize = 0,
|
||||
.frequency_tolerance = 0,
|
||||
- .symbol_rate_min = 5000000,
|
||||
+ .symbol_rate_min = 1000000,
|
||||
.symbol_rate_max = 45000000,
|
||||
|
||||
.caps = FE_CAN_INVERSION_AUTO |
|
6161
packages/linux/patches/3.10/linux-210-dvbsky.patch
vendored
Normal file
6161
packages/linux/patches/3.10/linux-210-dvbsky.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
138
packages/linux/patches/3.10/linux-212-mantis_stb0899_faster_lock.patch
vendored
Normal file
138
packages/linux/patches/3.10/linux-212-mantis_stb0899_faster_lock.patch
vendored
Normal file
@ -0,0 +1,138 @@
|
||||
diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_algo.c linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_algo.c
|
||||
--- linux-3.7.2/drivers/media/dvb-frontends/stb0899_algo.c 2013-01-11 18:19:28.000000000 +0100
|
||||
+++ linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_algo.c 2013-01-16 10:28:33.633409961 +0100
|
||||
@@ -206,7 +206,6 @@
|
||||
static enum stb0899_status stb0899_search_tmg(struct stb0899_state *state)
|
||||
{
|
||||
struct stb0899_internal *internal = &state->internal;
|
||||
- struct stb0899_params *params = &state->params;
|
||||
|
||||
short int derot_step, derot_freq = 0, derot_limit, next_loop = 3;
|
||||
int index = 0;
|
||||
@@ -216,10 +215,9 @@
|
||||
|
||||
/* timing loop computation & symbol rate optimisation */
|
||||
derot_limit = (internal->sub_range / 2L) / internal->mclk;
|
||||
- derot_step = (params->srate / 2L) / internal->mclk;
|
||||
+ derot_step = internal->derot_step * 4; /* dertot_step = decreasing delta */
|
||||
|
||||
while ((stb0899_check_tmg(state) != TIMINGOK) && next_loop) {
|
||||
- index++;
|
||||
derot_freq += index * internal->direction * derot_step; /* next derot zig zag position */
|
||||
|
||||
if (abs(derot_freq) > derot_limit)
|
||||
@@ -230,6 +228,7 @@
|
||||
STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq));
|
||||
stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */
|
||||
}
|
||||
+ index++;
|
||||
internal->direction = -internal->direction; /* Change zigzag direction */
|
||||
}
|
||||
|
||||
@@ -278,14 +277,18 @@
|
||||
{
|
||||
struct stb0899_internal *internal = &state->internal;
|
||||
|
||||
- short int derot_freq = 0, last_derot_freq = 0, derot_limit, next_loop = 3;
|
||||
+ short int derot_freq = 0, last_derot_freq = 0, derot_limit, derot_step, next_loop = 3;
|
||||
int index = 0;
|
||||
+ int base_freq;
|
||||
u8 cfr[2];
|
||||
u8 reg;
|
||||
|
||||
internal->status = NOCARRIER;
|
||||
derot_limit = (internal->sub_range / 2L) / internal->mclk;
|
||||
derot_freq = internal->derot_freq;
|
||||
+ derot_step = internal->derot_step * 2;
|
||||
+ last_derot_freq = internal->derot_freq;
|
||||
+ base_freq = internal->derot_freq;
|
||||
|
||||
reg = stb0899_read_reg(state, STB0899_CFD);
|
||||
STB0899_SETFIELD_VAL(CFD_ON, reg, 1);
|
||||
@@ -294,11 +297,10 @@
|
||||
do {
|
||||
dprintk(state->verbose, FE_DEBUG, 1, "Derot Freq=%d, mclk=%d", derot_freq, internal->mclk);
|
||||
if (stb0899_check_carrier(state) == NOCARRIER) {
|
||||
- index++;
|
||||
last_derot_freq = derot_freq;
|
||||
- derot_freq += index * internal->direction * internal->derot_step; /* next zig zag derotator position */
|
||||
+ derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */
|
||||
|
||||
- if(abs(derot_freq) > derot_limit)
|
||||
+ if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit)
|
||||
next_loop--;
|
||||
|
||||
if (next_loop) {
|
||||
@@ -310,9 +312,10 @@
|
||||
STB0899_SETFIELD_VAL(CFRL, cfr[1], LSB(state->config->inversion * derot_freq));
|
||||
stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */
|
||||
}
|
||||
+ index++;
|
||||
+ internal->direction = -internal->direction; /* Change zigzag direction */
|
||||
}
|
||||
|
||||
- internal->direction = -internal->direction; /* Change zigzag direction */
|
||||
} while ((internal->status != CARRIEROK) && next_loop);
|
||||
|
||||
if (internal->status == CARRIEROK) {
|
||||
@@ -338,6 +341,7 @@
|
||||
int lock = 0, index = 0, dataTime = 500, loop;
|
||||
u8 reg;
|
||||
|
||||
+ msleep(1);
|
||||
internal->status = NODATA;
|
||||
|
||||
/* RESET FEC */
|
||||
@@ -348,6 +352,7 @@
|
||||
reg = stb0899_read_reg(state, STB0899_TSTRES);
|
||||
STB0899_SETFIELD_VAL(FRESACS, reg, 0);
|
||||
stb0899_write_reg(state, STB0899_TSTRES, reg);
|
||||
+ msleep(1);
|
||||
|
||||
if (params->srate <= 2000000)
|
||||
dataTime = 2000;
|
||||
@@ -363,6 +368,7 @@
|
||||
|
||||
stb0899_write_reg(state, STB0899_DSTATUS2, 0x00); /* force search loop */
|
||||
while (1) {
|
||||
+ msleep(1); // Alex: added 1 mSec
|
||||
/* WARNING! VIT LOCKED has to be tested before VIT_END_LOOOP */
|
||||
reg = stb0899_read_reg(state, STB0899_VSTATUS);
|
||||
lock = STB0899_GETFIELD(VSTATUS_LOCKEDVIT, reg);
|
||||
@@ -390,20 +396,21 @@
|
||||
short int derot_freq, derot_step, derot_limit, next_loop = 3;
|
||||
u8 cfr[2];
|
||||
u8 reg;
|
||||
- int index = 1;
|
||||
+ int index = 0;
|
||||
+ int base_freq;
|
||||
|
||||
struct stb0899_internal *internal = &state->internal;
|
||||
- struct stb0899_params *params = &state->params;
|
||||
|
||||
- derot_step = (params->srate / 4L) / internal->mclk;
|
||||
+ derot_step = internal->derot_step;
|
||||
derot_limit = (internal->sub_range / 2L) / internal->mclk;
|
||||
derot_freq = internal->derot_freq;
|
||||
+ base_freq = internal->derot_freq;
|
||||
|
||||
do {
|
||||
if ((internal->status != CARRIEROK) || (stb0899_check_data(state) != DATAOK)) {
|
||||
|
||||
derot_freq += index * internal->direction * derot_step; /* next zig zag derotator position */
|
||||
- if (abs(derot_freq) > derot_limit)
|
||||
+ if (derot_freq > base_freq + derot_limit || derot_freq < base_freq - derot_limit)
|
||||
next_loop--;
|
||||
|
||||
if (next_loop) {
|
||||
@@ -417,9 +424,9 @@
|
||||
stb0899_write_regs(state, STB0899_CFRM, cfr, 2); /* derotator frequency */
|
||||
|
||||
stb0899_check_carrier(state);
|
||||
- index++;
|
||||
}
|
||||
}
|
||||
+ index++;
|
||||
internal->direction = -internal->direction; /* change zig zag direction */
|
||||
} while ((internal->status != DATAOK) && next_loop);
|
||||
|
12735
packages/linux/patches/3.10/linux-221-ngene-octopus.patch
vendored
Normal file
12735
packages/linux/patches/3.10/linux-221-ngene-octopus.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
62
packages/linux/patches/3.10/linux-222-stb0899_signal_quality.patch
vendored
Normal file
62
packages/linux/patches/3.10/linux-222-stb0899_signal_quality.patch
vendored
Normal file
@ -0,0 +1,62 @@
|
||||
diff -Naur linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c
|
||||
--- linux-3.7.2/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-11 18:19:28.000000000 +0100
|
||||
+++ linux-3.7.2.patch/drivers/media/dvb-frontends/stb0899_drv.c 2013-01-16 10:33:10.323380937 +0100
|
||||
@@ -971,6 +971,16 @@
|
||||
|
||||
*strength = stb0899_table_lookup(stb0899_dvbsrf_tab, ARRAY_SIZE(stb0899_dvbsrf_tab) - 1, val);
|
||||
*strength += 750;
|
||||
+
|
||||
+ const int MIN_STRENGTH_DVBS = 0;
|
||||
+ const int MAX_STRENGTH_DVBS = 680;
|
||||
+ if (*strength < MIN_STRENGTH_DVBS)
|
||||
+ *strength = 0;
|
||||
+ else if(*strength > MAX_STRENGTH_DVBS)
|
||||
+ *strength = 0xFFFF;
|
||||
+ else
|
||||
+ *strength = (*strength - MIN_STRENGTH_DVBS) * 0xFFFF / (MAX_STRENGTH_DVBS - MIN_STRENGTH_DVBS);
|
||||
+
|
||||
dprintk(state->verbose, FE_DEBUG, 1, "AGCIQVALUE = 0x%02x, C = %d * 0.1 dBm",
|
||||
val & 0xff, *strength);
|
||||
}
|
||||
@@ -983,6 +993,7 @@
|
||||
|
||||
*strength = stb0899_table_lookup(stb0899_dvbs2rf_tab, ARRAY_SIZE(stb0899_dvbs2rf_tab) - 1, val);
|
||||
*strength += 950;
|
||||
+ *strength = *strength << 4;
|
||||
dprintk(state->verbose, FE_DEBUG, 1, "IF_AGC_GAIN = 0x%04x, C = %d * 0.1 dBm",
|
||||
val & 0x3fff, *strength);
|
||||
}
|
||||
@@ -1016,6 +1027,16 @@
|
||||
val = MAKEWORD16(buf[0], buf[1]);
|
||||
|
||||
*snr = stb0899_table_lookup(stb0899_cn_tab, ARRAY_SIZE(stb0899_cn_tab) - 1, val);
|
||||
+
|
||||
+ const int MIN_SNR_DVBS = 0;
|
||||
+ const int MAX_SNR_DVBS = 200;
|
||||
+ if (*snr < MIN_SNR_DVBS)
|
||||
+ *snr = 0;
|
||||
+ else if(*snr > MAX_SNR_DVBS)
|
||||
+ *snr = 0xFFFF;
|
||||
+ else
|
||||
+ *snr = (*snr - MIN_SNR_DVBS) * 0xFFFF / (MAX_SNR_DVBS - MIN_SNR_DVBS);
|
||||
+
|
||||
dprintk(state->verbose, FE_DEBUG, 1, "NIR = 0x%02x%02x = %u, C/N = %d * 0.1 dBm\n",
|
||||
buf[0], buf[1], val, *snr);
|
||||
}
|
||||
@@ -1040,6 +1061,16 @@
|
||||
val = (quantn - estn) / 10;
|
||||
}
|
||||
*snr = val;
|
||||
+
|
||||
+ const int MIN_SNR_DVBS2 = 10;
|
||||
+ const int MAX_SNR_DVBS2 = 70;
|
||||
+ if (*snr < MIN_SNR_DVBS2)
|
||||
+ *snr = 0;
|
||||
+ else if(*snr > MAX_SNR_DVBS2)
|
||||
+ *snr = 0xFFFF;
|
||||
+ else
|
||||
+ *snr = (*snr - MIN_SNR_DVBS2) * 0xFFFF / (MAX_SNR_DVBS2 - MIN_SNR_DVBS2);
|
||||
+
|
||||
dprintk(state->verbose, FE_DEBUG, 1, "Es/N0 quant = %d (%d) estimate = %u (%d), C/N = %d * 0.1 dBm",
|
||||
quant, quantn, est, estn, val);
|
||||
}
|
17
packages/linux/patches/3.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
vendored
Normal file
17
packages/linux/patches/3.10/linux-223-Fix-video-artifacts-with-tt-3600-s2-usb.patch
vendored
Normal file
@ -0,0 +1,17 @@
|
||||
diff -Naur linux-3.7.9/drivers/media/usb/dvb-usb/pctv452e.c linux-3.7.9.patch/drivers/media/usb/dvb-usb/pctv452e.c
|
||||
--- linux-3.7.9/drivers/media/usb/dvb-usb/pctv452e.c 2013-01-11 18:19:28.000000000 +0100
|
||||
+++ linux-3.7.9.patch/drivers/media/usb/dvb-usb/pctv452e.c 2013-01-16 10:35:01.131342123 +0100
|
||||
@@ -995,11 +995,11 @@
|
||||
/* parameter for the MPEG2-data transfer */
|
||||
.stream = {
|
||||
.type = USB_ISOC,
|
||||
- .count = 7,
|
||||
+ .count = 4,
|
||||
.endpoint = 0x02,
|
||||
.u = {
|
||||
.isoc = {
|
||||
- .framesperurb = 4,
|
||||
+ .framesperurb = 64,
|
||||
.framesize = 940,
|
||||
.interval = 1
|
||||
}
|
1603
packages/linux/patches/3.10/linux-700-jmicron_1_0_8_5.patch
vendored
Normal file
1603
packages/linux/patches/3.10/linux-700-jmicron_1_0_8_5.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
12
packages/linux/patches/3.10/linux-900-hide_tsc_error.patch
vendored
Normal file
12
packages/linux/patches/3.10/linux-900-hide_tsc_error.patch
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
diff -uNr linux-3.6.4-orig/arch/x86/kernel/tsc.c linux-3.6.4-new/arch/x86/kernel/tsc.c
|
||||
--- linux-3.6.4-orig/arch/x86/kernel/tsc.c 2012-11-03 14:19:55.000000000 +0100
|
||||
+++ linux-3.6.4-new/arch/x86/kernel/tsc.c 2012-11-03 14:23:05.000000000 +0100
|
||||
@@ -374,7 +374,7 @@
|
||||
goto success;
|
||||
}
|
||||
}
|
||||
- pr_err("Fast TSC calibration failed\n");
|
||||
+ pr_info("Fast TSC calibration failed\n");
|
||||
return 0;
|
||||
|
||||
success:
|
13031
packages/linux/patches/3.10/linux-950-saa716x_PCIe_interface_chipset.patch
vendored
Normal file
13031
packages/linux/patches/3.10/linux-950-saa716x_PCIe_interface_chipset.patch
vendored
Normal file
File diff suppressed because it is too large
Load Diff
78
packages/linux/patches/3.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch
vendored
Normal file
78
packages/linux/patches/3.10/linux-990.06-hda-Avoid-outputting-HDMI-audio-before-prepare-.patch
vendored
Normal file
@ -0,0 +1,78 @@
|
||||
commit aad0b407edfef6e2527a9bb877ce754e1efb7b10
|
||||
Author: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Mon Jul 1 13:06:10 2013 +0300
|
||||
|
||||
ALSA: hda - Avoid outputting HDMI audio before prepare() and after close()
|
||||
|
||||
adapted to 3.10
|
||||
|
||||
From a6024295fd3290a8c9c5519a03316081ee82378a Mon Sep 17 00:00:00 2001
|
||||
From: Anssi Hannula <anssi.hannula@iki.fi>
|
||||
Date: Sat, 16 Feb 2013 17:42:46 +0200
|
||||
Subject: [PATCH] ALSA: hda - Avoid outputting HDMI audio before prepare() and
|
||||
after close()
|
||||
|
||||
Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100) start
|
||||
transmitting an empty audio stream as soon as PIN_OUT and AC_DIG1_ENABLE
|
||||
are enabled.
|
||||
|
||||
Since commit 6169b673618bf0b2518ce413b54925782a603f06 ("ALSA: hda -
|
||||
Always turn on pins for HDMI/DP") this happens at first open() time, and
|
||||
will continue even after close().
|
||||
|
||||
Additionally, some codecs (at least Intel PantherPoint HDMI) currently
|
||||
continue transmitting HDMI audio even after close() in case some actual
|
||||
audio was output after open() (this happens regardless of PIN_OUT).
|
||||
|
||||
Empty HDMI audio transmission when not intended has the effect that a
|
||||
possible HDMI audio sink/receiver may prefer the empty HDMI audio stream
|
||||
over an actual audio stream on its S/PDIF inputs.
|
||||
|
||||
To avoid the issue before first prepare(), set stream format to 0 on
|
||||
codec initialization. 0 is not a valid format value for HDMI and will
|
||||
prevent the audio stream from being output.
|
||||
|
||||
Additionally, at close() time, make sure that the stream is cleaned up.
|
||||
This will ensure that the format is reset to 0 at that time, preventing
|
||||
audio from being output in that case.
|
||||
|
||||
Thanks to OpenELEC developers and users for their help in investigating
|
||||
this issue on the affected NVIDIA "ION2" hardware. Testing of the final
|
||||
version on NVIDIA ION2 was done by OpenELEC user "MrXIII". Testing on
|
||||
Intel PantherPoint was done by myself.
|
||||
|
||||
Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
|
||||
Cc: stable@vger.kernel.org
|
||||
|
||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
||||
index e12f7a0..9bfdd51 100644
|
||||
--- a/sound/pci/hda/patch_hdmi.c
|
||||
+++ b/sound/pci/hda/patch_hdmi.c
|
||||
@@ -1360,6 +1360,14 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid)
|
||||
if (err < 0)
|
||||
return err;
|
||||
|
||||
+ /*
|
||||
+ * Some HDMI codecs (at least NVIDIA 0x10de000b:0x10de0101:0x100100)
|
||||
+ * start transmitting an empty audio stream as soon as PIN_OUT and
|
||||
+ * AC_DIG1_ENABLE are enabled, which happens at open() time.
|
||||
+ * To avoid that, set format to 0, which is not valid for HDMI.
|
||||
+ */
|
||||
+ snd_hda_codec_write(codec, cvt_nid, 0, AC_VERB_SET_STREAM_FORMAT, 0);
|
||||
+
|
||||
if (spec->num_cvts < ARRAY_SIZE(spec->cvt_nids))
|
||||
spec->cvt_nids[spec->num_cvts] = cvt_nid;
|
||||
spec->num_cvts++;
|
||||
@@ -1474,6 +1482,12 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
|
||||
struct hdmi_spec_per_pin *per_pin;
|
||||
|
||||
if (hinfo->nid) {
|
||||
+ /*
|
||||
+ * Make sure no empty audio is output after this point by
|
||||
+ * setting stream format to 0, which is not valid for HDMI.
|
||||
+ */
|
||||
+ __snd_hda_codec_cleanup_stream(codec, hinfo->nid, 1);
|
||||
+
|
||||
cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid);
|
||||
if (snd_BUG_ON(cvt_idx < 0))
|
||||
return -EINVAL;
|
1577
packages/linux/patches/3.10/linux-995-CX24120-13Z_frontend.patch
vendored
Executable file
1577
packages/linux/patches/3.10/linux-995-CX24120-13Z_frontend.patch
vendored
Executable file
File diff suppressed because it is too large
Load Diff
11
packages/linux/patches/3.10/linux-996-macmini2012-ethernet.patch
vendored
Normal file
11
packages/linux/patches/3.10/linux-996-macmini2012-ethernet.patch
vendored
Normal file
@ -0,0 +1,11 @@
|
||||
--- linux-3.9.2/drivers/net/ethernet/broadcom/tg3.c 2013-05-11 18:19:28.000000000 +0400
|
||||
+++ linux-3.9.2/drivers/net/ethernet/broadcom/tg3.c 2013-05-25 20:55:00.282972605 +0400
|
||||
@@ -333,6 +333,8 @@
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5720)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57762)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57766)},
|
||||
+ {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57782)},
|
||||
+ {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_57786)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5762)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5725)},
|
||||
{PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, TG3PCI_DEVICE_TIGON3_5727)},
|
13
packages/linux/patches/3.10/linux-997-disable-rc6-on-sandybridge-gt1.patch
vendored
Normal file
13
packages/linux/patches/3.10/linux-997-disable-rc6-on-sandybridge-gt1.patch
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
--- a/drivers/gpu/drm/i915/intel_pm.c 2013-05-30 22:57:09.098080381 +0200
|
||||
+++ b/drivers/gpu/drm/i915/intel_pm.c 2013-05-30 23:31:31.644308032 +0200
|
||||
@@ -2503,8 +2503,8 @@
|
||||
if (i915_enable_rc6 >= 0)
|
||||
return i915_enable_rc6;
|
||||
|
||||
- /* Disable RC6 on Ironlake */
|
||||
- if (INTEL_INFO(dev)->gen == 5)
|
||||
+ /* Disable RC6 on Ironlake and Sandybridge GT1 */
|
||||
+ if (INTEL_INFO(dev)->gen == 5 || IS_SNB_GT1(dev))
|
||||
return 0;
|
||||
|
||||
if (IS_HASWELL(dev)) {
|
@ -109,7 +109,7 @@
|
||||
# Kernel to use. values can be:
|
||||
# default: default mainline kernel
|
||||
# ti-omap4: Ti's OMAP4 kernel
|
||||
LINUX="default"
|
||||
LINUX="3.9"
|
||||
|
||||
# use linux-next (latest rc) instead latest released version
|
||||
LINUX_NEXT="no"
|
||||
|
Loading…
x
Reference in New Issue
Block a user