mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
Stefan Saraev
parent
f653098f08
commit
22b9efab25
@ -20,9 +20,6 @@
|
|||||||
|
|
||||||
PKG_NAME="linux"
|
PKG_NAME="linux"
|
||||||
case "$LINUX" in
|
case "$LINUX" in
|
||||||
3.11)
|
|
||||||
PKG_VERSION="3.11.6"
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="3.12"
|
PKG_VERSION="3.12"
|
||||||
;;
|
;;
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
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);
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,161 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
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
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- 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 },
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
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 */
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
--- 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 {
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
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 */
|
|
||||||
@ -1,867 +0,0 @@
|
|||||||
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);
|
|
||||||
|
|
||||||
@ -1,61 +0,0 @@
|
|||||||
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;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,47 +0,0 @@
|
|||||||
commit 5a601d61d36236a667cc7d170b300d18dd6240c6
|
|
||||||
Author: Juan J. Sierralta <sierralta@gmail.com>
|
|
||||||
Date: Sun Jul 28 09:26:04 2013 +0300
|
|
||||||
|
|
||||||
Add support for SMK-Link PS3 remote
|
|
||||||
|
|
||||||
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
|
|
||||||
index 396d24d..9eb7129 100644
|
|
||||||
--- a/drivers/hid/hid-core.c
|
|
||||||
+++ b/drivers/hid/hid-core.c
|
|
||||||
@@ -1686,6 +1686,7 @@ 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_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SONY_PS3_BDREMOTE) },
|
|
||||||
{ 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) },
|
|
||||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
|
||||||
index dd0511e..2801df1 100644
|
|
||||||
--- a/drivers/hid/hid-ids.h
|
|
||||||
+++ b/drivers/hid/hid-ids.h
|
|
||||||
@@ -734,6 +734,7 @@
|
|
||||||
#define USB_VENDOR_ID_SKYCABLE 0x1223
|
|
||||||
#define USB_DEVICE_ID_SKYCABLE_WIRELESS_PRESENTER 0x3F07
|
|
||||||
|
|
||||||
+#define USB_VENDOR_ID_SMK 0x0609
|
|
||||||
#define USB_VENDOR_ID_SONY 0x054c
|
|
||||||
#define USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE 0x024b
|
|
||||||
#define USB_DEVICE_ID_SONY_VAIO_VGP_MOUSE 0x0374
|
|
||||||
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
|
|
||||||
index 8f425e2..614f057 100644
|
|
||||||
--- a/drivers/hid/hid-sony.c
|
|
||||||
+++ b/drivers/hid/hid-sony.c
|
|
||||||
@@ -728,8 +728,12 @@ static const struct hid_device_id sony_devices[] = {
|
|
||||||
/* Logitech Harmony Adapter for PS3 */
|
|
||||||
{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_PS3),
|
|
||||||
.driver_data = PS3REMOTE },
|
|
||||||
+ /* SMK-Link Universal Remote Control VP3700 */
|
|
||||||
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SMK, USB_DEVICE_ID_SONY_PS3_BDREMOTE),
|
|
||||||
+ .driver_data = PS3REMOTE },
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
+
|
|
||||||
MODULE_DEVICE_TABLE(hid, sony_devices);
|
|
||||||
|
|
||||||
static struct hid_driver sony_driver = {
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
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 }
|
|
||||||
};
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
|
||||||
index c0cd084..c4b279f 100644
|
|
||||||
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
|
||||||
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
|
|
||||||
@@ -1388,6 +1388,8 @@ static const struct usb_device_id rtl28xxu_id_table[] = {
|
|
||||||
&rtl2832u_props, "Leadtek WinFast DTV Dongle mini", NULL) },
|
|
||||||
{ DVB_USB_DEVICE(USB_VID_GTEK, USB_PID_CPYTO_REDI_PC50A,
|
|
||||||
&rtl2832u_props, "Crypto ReDi PC 50 A", NULL) },
|
|
||||||
+ { DVB_USB_DEVICE(USB_VID_GTEK, 0xa803,
|
|
||||||
+ &rtl2832u_props, "Realtek RTL2832U reference design", NULL) },
|
|
||||||
{ }
|
|
||||||
};
|
|
||||||
MODULE_DEVICE_TABLE(usb, rtl28xxu_id_table);
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
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.11.6/linux-210-dvbsky.patch
vendored
6161
packages/linux/patches/3.11.6/linux-210-dvbsky.patch
vendored
File diff suppressed because it is too large
Load Diff
@ -1,31 +0,0 @@
|
|||||||
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
|
|
||||||
index 315809d..54dff7c 100644
|
|
||||||
--- a/drivers/media/dvb-frontends/m88ds3103.c
|
|
||||||
+++ b/drivers/media/dvb-frontends/m88ds3103.c
|
|
||||||
@@ -1244,6 +1244,8 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
|
|
||||||
dprintk("symbol rate = %d\n", c->symbol_rate);
|
|
||||||
dprintk("delivery system = %d\n", c->delivery_system);
|
|
||||||
|
|
||||||
+ state->delivery_system = c->delivery_system;
|
|
||||||
+
|
|
||||||
realFreq = c->frequency;
|
|
||||||
lpf_offset_KHz = 0;
|
|
||||||
if(c->symbol_rate < 5000000){
|
|
||||||
@@ -1501,7 +1503,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
|
|
||||||
}
|
|
||||||
msleep(20);
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+/*
|
|
||||||
if((status & FE_HAS_LOCK) == 0){
|
|
||||||
state->delivery_system = (state->delivery_system == SYS_DVBS) ? SYS_DVBS2 : SYS_DVBS;
|
|
||||||
m88ds3103_demod_connect(fe, offset_khz);
|
|
||||||
@@ -1514,7 +1516,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
|
|
||||||
msleep(20);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
-
|
|
||||||
+*/
|
|
||||||
if (status & FE_HAS_LOCK){
|
|
||||||
if(state->config->ci_mode == 2)
|
|
||||||
m88ds3103_set_clock_ratio(state);
|
|
||||||
@ -1,138 +0,0 @@
|
|||||||
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.11.6/linux-221-ngene-octopus.patch
vendored
12735
packages/linux/patches/3.11.6/linux-221-ngene-octopus.patch
vendored
File diff suppressed because it is too large
Load Diff
@ -1,62 +0,0 @@
|
|||||||
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);
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
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
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,21 +0,0 @@
|
|||||||
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2013-07-21 16:06:37.443909481 +0200
|
|
||||||
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c 2013-07-21 16:11:10.696335476 +0200
|
|
||||||
@@ -1470,15 +1470,18 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
#define BRCMF_USB_VENDOR_ID_BROADCOM 0x0a5c
|
|
||||||
+#define BRCMF_USB_VENDOR_ID_LINKSYS 0x13b1
|
|
||||||
#define BRCMF_USB_DEVICE_ID_43143 0xbd1e
|
|
||||||
#define BRCMF_USB_DEVICE_ID_43236 0xbd17
|
|
||||||
#define BRCMF_USB_DEVICE_ID_43242 0xbd1f
|
|
||||||
+#define BRCMF_USB_DEVICE_ID_AE2500 0x003a
|
|
||||||
#define BRCMF_USB_DEVICE_ID_BCMFW 0x0bdc
|
|
||||||
|
|
||||||
static struct usb_device_id brcmf_usb_devid_table[] = {
|
|
||||||
{ USB_DEVICE(BRCMF_USB_VENDOR_ID_BROADCOM, BRCMF_USB_DEVICE_ID_43143) },
|
|
||||||
{ USB_DEVICE(BRCMF_USB_VENDOR_ID_BROADCOM, BRCMF_USB_DEVICE_ID_43236) },
|
|
||||||
{ USB_DEVICE(BRCMF_USB_VENDOR_ID_BROADCOM, BRCMF_USB_DEVICE_ID_43242) },
|
|
||||||
+ { USB_DEVICE(BRCMF_USB_VENDOR_ID_LINKSYS, BRCMF_USB_DEVICE_ID_AE2500) },
|
|
||||||
/* special entry for device with firmware loaded and running */
|
|
||||||
{ USB_DEVICE(BRCMF_USB_VENDOR_ID_BROADCOM, BRCMF_USB_DEVICE_ID_BCMFW) },
|
|
||||||
{ }
|
|
||||||
@ -1,72 +0,0 @@
|
|||||||
commit 073af93346306a0e079c161e3ed8dd263fef0b20
|
|
||||||
Author: Stefan Saraev <stefan@saraev.ca>
|
|
||||||
Date: Sat Jul 13 19:31:03 2013 +0300
|
|
||||||
|
|
||||||
Support for cheap Ralink 3070 WiFi plug
|
|
||||||
|
|
||||||
source: http://www.geekamole.com/2013/rt2800usb-fix-for-ralinkmediatek-3070-gentoo-linux/
|
|
||||||
|
|
||||||
diff --git a/drivers/net/wireless/rt2x00/rt2800.h b/drivers/net/wireless/rt2x00/rt2800.h
|
|
||||||
index a7630d5..9504d45 100644
|
|
||||||
--- a/drivers/net/wireless/rt2x00/rt2800.h
|
|
||||||
+++ b/drivers/net/wireless/rt2x00/rt2800.h
|
|
||||||
@@ -69,6 +69,7 @@
|
|
||||||
#define RF3320 0x000b
|
|
||||||
#define RF3322 0x000c
|
|
||||||
#define RF3053 0x000d
|
|
||||||
+#define RF3070 0x3070
|
|
||||||
#define RF5592 0x000f
|
|
||||||
#define RF3290 0x3290
|
|
||||||
#define RF5360 0x5360
|
|
||||||
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
|
|
||||||
index 72f32e5..3e18df4 100644
|
|
||||||
--- a/drivers/net/wireless/rt2x00/rt2800lib.c
|
|
||||||
+++ b/drivers/net/wireless/rt2x00/rt2800lib.c
|
|
||||||
@@ -2599,6 +2599,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
|
|
||||||
break;
|
|
||||||
case RF5360:
|
|
||||||
case RF5370:
|
|
||||||
+ case RF3070:
|
|
||||||
case RF5372:
|
|
||||||
case RF5390:
|
|
||||||
case RF5392:
|
|
||||||
@@ -2615,6 +2616,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev,
|
|
||||||
rt2x00_rf(rt2x00dev, RF3322) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5360) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5370) ||
|
|
||||||
+ rt2x00_rf(rt2x00dev, RF3070) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5372) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5390) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5392)) {
|
|
||||||
@@ -3199,6 +3201,7 @@ void rt2800_vco_calibration(struct rt2x00_dev *rt2x00dev)
|
|
||||||
case RF3290:
|
|
||||||
case RF5360:
|
|
||||||
case RF5370:
|
|
||||||
+ case RF3070:
|
|
||||||
case RF5372:
|
|
||||||
case RF5390:
|
|
||||||
case RF5392:
|
|
||||||
@@ -5515,6 +5518,7 @@ static int rt2800_init_eeprom(struct rt2x00_dev *rt2x00dev)
|
|
||||||
case RF3322:
|
|
||||||
case RF5360:
|
|
||||||
case RF5370:
|
|
||||||
+ case RF3070:
|
|
||||||
case RF5372:
|
|
||||||
case RF5390:
|
|
||||||
case RF5392:
|
|
||||||
@@ -5969,6 +5973,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|
||||||
rt2x00_rf(rt2x00dev, RF3322) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5360) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5370) ||
|
|
||||||
+ rt2x00_rf(rt2x00dev, RF3070) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5372) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5390) ||
|
|
||||||
rt2x00_rf(rt2x00dev, RF5392)) {
|
|
||||||
@@ -6071,6 +6076,7 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|
||||||
case RF3290:
|
|
||||||
case RF5360:
|
|
||||||
case RF5370:
|
|
||||||
+ case RF3070:
|
|
||||||
case RF5372:
|
|
||||||
case RF5390:
|
|
||||||
case RF5392:
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- 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)},
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
From 62330f8f9b6105bfe201f52b7ed86ea6ce3d5901 Mon Sep 17 00:00:00 2001
|
|
||||||
From: popcornmix <popcornmix@gmail.com>
|
|
||||||
Date: Sun, 8 Sep 2013 10:33:51 +0100
|
|
||||||
Subject: [PATCH] Add Ubiquiti WifiStation USB id to ath9k wifi driver
|
|
||||||
|
|
||||||
---
|
|
||||||
drivers/net/wireless/ath/ath9k/hif_usb.c | 2 ++
|
|
||||||
1 file changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c
|
|
||||||
index 75a6376..8cb8d8d 100644
|
|
||||||
--- a/drivers/net/wireless/ath/ath9k/hif_usb.c
|
|
||||||
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
|
|
||||||
@@ -37,9 +37,11 @@
|
|
||||||
{ USB_DEVICE(0x13D3, 0x3350) }, /* Azurewave */
|
|
||||||
{ USB_DEVICE(0x04CA, 0x4605) }, /* Liteon */
|
|
||||||
{ USB_DEVICE(0x040D, 0x3801) }, /* VIA */
|
|
||||||
+ { USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
|
|
||||||
{ USB_DEVICE(0x0cf3, 0xb003) }, /* Ubiquiti WifiStation Ext */
|
|
||||||
{ USB_DEVICE(0x0cf3, 0xb002) }, /* Ubiquiti WifiStation */
|
|
||||||
{ USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
|
|
||||||
+ { USB_DEVICE(0x057c, 0x8403) }, /* AVM FRITZ!WLAN 11N v2 USB */
|
|
||||||
|
|
||||||
{ USB_DEVICE(0x0cf3, 0x7015),
|
|
||||||
.driver_info = AR9287_USB }, /* Atheros */
|
|
||||||
--
|
|
||||||
1.8.4
|
|
||||||
|
|
||||||
@ -1,10 +0,0 @@
|
|||||||
--- a/drivers/net/wireless/rt2x00/rt2800usb.c 2013-10-08 15:14:44.844047190 +0200
|
|
||||||
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c 2013-10-08 15:15:00.279904575 +0200
|
|
||||||
@@ -976,6 +976,7 @@
|
|
||||||
{ USB_DEVICE(0x0411, 0x015d) },
|
|
||||||
{ USB_DEVICE(0x0411, 0x016f) },
|
|
||||||
{ USB_DEVICE(0x0411, 0x01a2) },
|
|
||||||
+ { USB_DEVICE(0x0411, 0x01a8) },
|
|
||||||
{ USB_DEVICE(0x0411, 0x01ee) },
|
|
||||||
/* Corega */
|
|
||||||
{ USB_DEVICE(0x07aa, 0x002f) },
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
diff -Naur linux-3.10.16/drivers/staging/rtl8712/usb_intf.c linux-3.10.16.patch/drivers/staging/rtl8712/usb_intf.c
|
|
||||||
--- linux-3.10.16/drivers/staging/rtl8712/usb_intf.c 2013-10-14 01:08:56.000000000 +0200
|
|
||||||
+++ linux-3.10.16.patch/drivers/staging/rtl8712/usb_intf.c 2013-10-16 13:27:44.032951265 +0200
|
|
||||||
@@ -92,6 +92,7 @@
|
|
||||||
{USB_DEVICE(0x0DF6, 0x005B)},
|
|
||||||
{USB_DEVICE(0x0DF6, 0x005D)},
|
|
||||||
{USB_DEVICE(0x0DF6, 0x0063)},
|
|
||||||
+ {USB_DEVICE(0x0DF6, 0x006C)},
|
|
||||||
/* Sweex */
|
|
||||||
{USB_DEVICE(0x177F, 0x0154)},
|
|
||||||
/* Thinkware */
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
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:
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,78 +0,0 @@
|
|||||||
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;
|
|
||||||
@ -1,805 +0,0 @@
|
|||||||
Combined patch for ATI/AMD HDMI.
|
|
||||||
|
|
||||||
Actual patchset has been posted to ALSA-devel.
|
|
||||||
|
|
||||||
--
|
|
||||||
Anssi Hannula <anssi.hannula@iki.fi>
|
|
||||||
|
|
||||||
diff --git a/sound/pci/hda/hda_eld.c b/sound/pci/hda/hda_eld.c
|
|
||||||
index d0d7ac1e..750841e 100644
|
|
||||||
--- a/sound/pci/hda/hda_eld.c
|
|
||||||
+++ b/sound/pci/hda/hda_eld.c
|
|
||||||
@@ -2,6 +2,7 @@
|
|
||||||
* Generic routines and proc interface for ELD(EDID Like Data) information
|
|
||||||
*
|
|
||||||
* Copyright(c) 2008 Intel Corporation.
|
|
||||||
+ * Copyright (c) 2013 Anssi Hannula <anssi.hannula@iki.fi>
|
|
||||||
*
|
|
||||||
* Authors:
|
|
||||||
* Wu Fengguang <wfg@linux.intel.com>
|
|
||||||
@@ -316,6 +317,9 @@ int snd_hdmi_get_eld_size(struct hda_codec *codec, hda_nid_t nid)
|
|
||||||
AC_DIPSIZE_ELD_BUF);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int atihdmi_get_eld(struct hda_codec *codec, hda_nid_t nid,
|
|
||||||
+ unsigned char *buf, int *eld_size);
|
|
||||||
+
|
|
||||||
int snd_hdmi_get_eld(struct hda_codec *codec, hda_nid_t nid,
|
|
||||||
unsigned char *buf, int *eld_size)
|
|
||||||
{
|
|
||||||
@@ -323,6 +327,9 @@ int snd_hdmi_get_eld(struct hda_codec *codec, hda_nid_t nid,
|
|
||||||
int ret = 0;
|
|
||||||
int size;
|
|
||||||
|
|
||||||
+ if (is_atihdmi(codec))
|
|
||||||
+ return atihdmi_get_eld(codec, nid, buf, eld_size);
|
|
||||||
+
|
|
||||||
/*
|
|
||||||
* ELD size is initialized to zero in caller function. If no errors and
|
|
||||||
* ELD is valid, actual eld_size is assigned.
|
|
||||||
@@ -671,3 +678,153 @@ void snd_hdmi_eld_update_pcm_info(struct parsed_hdmi_eld *e,
|
|
||||||
hinfo->maxbps = min(hinfo->maxbps, maxbps);
|
|
||||||
hinfo->channels_max = min(hinfo->channels_max, channels_max);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
+/* ATI/AMD specific stuff (ELD emulation) */
|
|
||||||
+
|
|
||||||
+#define ATI_VERB_SET_AUDIO_DESCRIPTOR 0x776
|
|
||||||
+#define ATI_VERB_SET_SINK_INFO_INDEX 0x780
|
|
||||||
+#define ATI_VERB_GET_SPEAKER_ALLOCATION 0xf70
|
|
||||||
+#define ATI_VERB_GET_AUDIO_DESCRIPTOR 0xf76
|
|
||||||
+#define ATI_VERB_GET_AUDIO_VIDEO_DELAY 0xf7b
|
|
||||||
+#define ATI_VERB_GET_SINK_INFO_INDEX 0xf80
|
|
||||||
+#define ATI_VERB_GET_SINK_INFO_DATA 0xf81
|
|
||||||
+
|
|
||||||
+#define ATI_SPKALLOC_SPKALLOC 0x007f
|
|
||||||
+#define ATI_SPKALLOC_TYPE_HDMI 0x0100
|
|
||||||
+#define ATI_SPKALLOC_TYPE_DISPLAYPORT 0x0200
|
|
||||||
+
|
|
||||||
+/* first three bytes are just standard SAD */
|
|
||||||
+#define ATI_AUDIODESC_CHANNELS 0x00000007
|
|
||||||
+#define ATI_AUDIODESC_RATES 0x0000ff00
|
|
||||||
+#define ATI_AUDIODESC_LPCM_STEREO_RATES 0xff000000
|
|
||||||
+
|
|
||||||
+/* in standard HDMI VSDB format */
|
|
||||||
+#define ATI_DELAY_VIDEO_LATENCY 0x000000ff
|
|
||||||
+#define ATI_DELAY_AUDIO_LATENCY 0x0000ff00
|
|
||||||
+
|
|
||||||
+enum ati_sink_info_idx {
|
|
||||||
+ ATI_INFO_IDX_MANUFACTURER_ID = 0,
|
|
||||||
+ ATI_INFO_IDX_PRODUCT_ID = 1,
|
|
||||||
+ ATI_INFO_IDX_SINK_DESC_LEN = 2,
|
|
||||||
+ ATI_INFO_IDX_PORT_ID_LOW = 3,
|
|
||||||
+ ATI_INFO_IDX_PORT_ID_HIGH = 4,
|
|
||||||
+ ATI_INFO_IDX_SINK_DESC_FIRST = 5,
|
|
||||||
+ ATI_INFO_IDX_SINK_DESC_LAST = 22, /* max len 18 bytes */
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+static int atihdmi_get_eld(struct hda_codec *codec, hda_nid_t nid,
|
|
||||||
+ unsigned char *buf, int *eld_size)
|
|
||||||
+{
|
|
||||||
+ int spkalloc, ati_sad, aud_synch;
|
|
||||||
+ int sink_desc_len = 0;
|
|
||||||
+ int pos, i;
|
|
||||||
+
|
|
||||||
+ /* ATI/AMD does not have ELD, emulate it */
|
|
||||||
+
|
|
||||||
+ spkalloc = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SPEAKER_ALLOCATION, 0);
|
|
||||||
+
|
|
||||||
+ if (!spkalloc) {
|
|
||||||
+ snd_printd(KERN_INFO "HDMI ATI/AMD: no speaker allocation for ELD\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ memset(buf, 0, ELD_FIXED_BYTES + ELD_MAX_MNL + ELD_MAX_SAD * 3);
|
|
||||||
+
|
|
||||||
+ /* version */
|
|
||||||
+ buf[0] = ELD_VER_CEA_861D << 3;
|
|
||||||
+
|
|
||||||
+ /* speaker allocation from EDID */
|
|
||||||
+ buf[7] = spkalloc & ATI_SPKALLOC_SPKALLOC;
|
|
||||||
+
|
|
||||||
+ /* is DisplayPort? */
|
|
||||||
+ if (spkalloc & ATI_SPKALLOC_TYPE_DISPLAYPORT)
|
|
||||||
+ buf[5] |= 0x04;
|
|
||||||
+
|
|
||||||
+ pos = ELD_FIXED_BYTES;
|
|
||||||
+
|
|
||||||
+ if (is_amdhdmi_rev3(codec)) {
|
|
||||||
+ int sink_info;
|
|
||||||
+
|
|
||||||
+ snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_PORT_ID_LOW);
|
|
||||||
+ sink_info = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);
|
|
||||||
+ put_unaligned_le32(sink_info, buf + 8);
|
|
||||||
+
|
|
||||||
+ snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_PORT_ID_HIGH);
|
|
||||||
+ sink_info = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);
|
|
||||||
+ put_unaligned_le32(sink_info, buf + 12);
|
|
||||||
+
|
|
||||||
+ snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_MANUFACTURER_ID);
|
|
||||||
+ sink_info = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);
|
|
||||||
+ put_unaligned_le16(sink_info, buf + 16);
|
|
||||||
+
|
|
||||||
+ snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_PRODUCT_ID);
|
|
||||||
+ sink_info = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);
|
|
||||||
+ put_unaligned_le16(sink_info, buf + 18);
|
|
||||||
+
|
|
||||||
+ snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_SINK_DESC_LEN);
|
|
||||||
+ sink_desc_len = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);
|
|
||||||
+
|
|
||||||
+ if (sink_desc_len > ELD_MAX_MNL) {
|
|
||||||
+ snd_printd(KERN_INFO "HDMI ATI/AMD: Truncating HDMI sink description with length %d\n",
|
|
||||||
+ sink_desc_len);
|
|
||||||
+ sink_desc_len = ELD_MAX_MNL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ buf[4] |= sink_desc_len;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < sink_desc_len; i++) {
|
|
||||||
+ snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_SINK_INFO_INDEX, ATI_INFO_IDX_SINK_DESC_FIRST + i);
|
|
||||||
+ buf[pos++] = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_SINK_INFO_DATA, 0);
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ for (i = AUDIO_CODING_TYPE_LPCM; i <= AUDIO_CODING_TYPE_WMAPRO; i++) {
|
|
||||||
+ if (i == AUDIO_CODING_TYPE_SACD || i == AUDIO_CODING_TYPE_DST)
|
|
||||||
+ continue; /* not handled by ATI/AMD */
|
|
||||||
+
|
|
||||||
+ snd_hda_codec_write(codec, nid, 0, ATI_VERB_SET_AUDIO_DESCRIPTOR, i << 3);
|
|
||||||
+ ati_sad = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_AUDIO_DESCRIPTOR, 0);
|
|
||||||
+
|
|
||||||
+ if (ati_sad & ATI_AUDIODESC_RATES) {
|
|
||||||
+ /* format is supported, copy SAD as-is */
|
|
||||||
+ buf[pos++] = (ati_sad & 0x0000ff) >> 0;
|
|
||||||
+ buf[pos++] = (ati_sad & 0x00ff00) >> 8;
|
|
||||||
+ buf[pos++] = (ati_sad & 0xff0000) >> 16;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (i == AUDIO_CODING_TYPE_LPCM
|
|
||||||
+ && (ati_sad & ATI_AUDIODESC_LPCM_STEREO_RATES)
|
|
||||||
+ && (ati_sad & ATI_AUDIODESC_LPCM_STEREO_RATES) >> 16 != (ati_sad & ATI_AUDIODESC_RATES)) {
|
|
||||||
+ /* for PCM there is a separate stereo rate mask */
|
|
||||||
+ buf[pos++] = ((ati_sad & 0x000000ff) & ~ATI_AUDIODESC_CHANNELS) | 0x1;
|
|
||||||
+ /* rates from the extra byte */
|
|
||||||
+ buf[pos++] = (ati_sad & 0xff000000) >> 24;
|
|
||||||
+ buf[pos++] = (ati_sad & 0x00ff0000) >> 16;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (pos == ELD_FIXED_BYTES + sink_desc_len) {
|
|
||||||
+ snd_printd(KERN_INFO "HDMI ATI/AMD: no audio descriptors for ELD\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ aud_synch = snd_hda_codec_read(codec, nid, 0, ATI_VERB_GET_AUDIO_VIDEO_DELAY, 0);
|
|
||||||
+ if ((aud_synch & ATI_DELAY_VIDEO_LATENCY) && (aud_synch & ATI_DELAY_AUDIO_LATENCY)) {
|
|
||||||
+ int video_latency = (aud_synch & ATI_DELAY_VIDEO_LATENCY) - 1;
|
|
||||||
+ int audio_latency = ((aud_synch & ATI_DELAY_AUDIO_LATENCY) >> 8) - 1;
|
|
||||||
+
|
|
||||||
+ if (video_latency > audio_latency)
|
|
||||||
+ buf[6] = min(video_latency - audio_latency, 0xfa);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ /* Baseline length */
|
|
||||||
+ buf[2] = pos - 4;
|
|
||||||
+
|
|
||||||
+ /* SAD count */
|
|
||||||
+ buf[5] |= ((pos - ELD_FIXED_BYTES - sink_desc_len) / 3) << 4;
|
|
||||||
+
|
|
||||||
+ *eld_size = pos;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
|
|
||||||
index 2e7493e..7c0b89e 100644
|
|
||||||
--- a/sound/pci/hda/hda_local.h
|
|
||||||
+++ b/sound/pci/hda/hda_local.h
|
|
||||||
@@ -786,4 +786,9 @@ static inline void snd_hda_eld_proc_free(struct hda_codec *codec,
|
|
||||||
#define SND_PRINT_CHANNEL_ALLOCATION_ADVISED_BUFSIZE 80
|
|
||||||
void snd_print_channel_allocation(int spk_alloc, char *buf, int buflen);
|
|
||||||
|
|
||||||
+/* shared with patch_hdmi.c and hda_eld.c */
|
|
||||||
+#define is_atihdmi(codec) (((codec)->vendor_id & 0xffff0000) == 0x10020000)
|
|
||||||
+#define is_amdhdmi_rev3(codec) \
|
|
||||||
+ ((codec)->vendor_id == 0x1002aa01 && ((codec)->revision_id & 0xff00) >= 0x0300)
|
|
||||||
+
|
|
||||||
#endif /* __SOUND_HDA_LOCAL_H */
|
|
||||||
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
|
|
||||||
index 3d8cd044..22f30fe 100644
|
|
||||||
--- a/sound/pci/hda/patch_hdmi.c
|
|
||||||
+++ b/sound/pci/hda/patch_hdmi.c
|
|
||||||
@@ -6,6 +6,7 @@
|
|
||||||
* Copyright (c) 2006 ATI Technologies Inc.
|
|
||||||
* Copyright (c) 2008 NVIDIA Corp. All rights reserved.
|
|
||||||
* Copyright (c) 2008 Wei Ni <wni@nvidia.com>
|
|
||||||
+ * Copyright (c) 2013 Anssi Hannula <anssi.hannula@iki.fi>
|
|
||||||
*
|
|
||||||
* Authors:
|
|
||||||
* Wu Fengguang <wfg@linux.intel.com>
|
|
||||||
@@ -46,6 +47,9 @@ MODULE_PARM_DESC(static_hdmi_pcm, "Don't restrict PCM parameters per ELD info");
|
|
||||||
|
|
||||||
#define is_haswell(codec) ((codec)->vendor_id == 0x80862807)
|
|
||||||
|
|
||||||
+/* is_atihdmi() and is_amdhdmi_rev3() are in hda_local.h */
|
|
||||||
+#define has_amd_full_remap_support(codec) is_amdhdmi_rev3(codec)
|
|
||||||
+
|
|
||||||
struct hdmi_spec_per_cvt {
|
|
||||||
hda_nid_t cvt_nid;
|
|
||||||
int assigned;
|
|
||||||
@@ -89,7 +93,7 @@ struct hdmi_spec {
|
|
||||||
|
|
||||||
struct hdmi_eld temp_eld;
|
|
||||||
/*
|
|
||||||
- * Non-generic ATI/NVIDIA specific
|
|
||||||
+ * Non-generic VIA/NVIDIA specific
|
|
||||||
*/
|
|
||||||
struct hda_multi_out multiout;
|
|
||||||
struct hda_pcm_stream pcm_playback;
|
|
||||||
@@ -573,6 +577,20 @@ static int hdmi_channel_allocation(struct hdmi_eld *eld, int channels)
|
|
||||||
return ca;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef CONFIG_SND_DEBUG_VERBOSE
|
|
||||||
+static int atihdmi_get_chan_slot(struct hda_codec *codec, hda_nid_t pin_nid, int asp_slot);
|
|
||||||
+
|
|
||||||
+static int hdmi_get_chan_slot(struct hda_codec *codec, hda_nid_t pin_nid, int asp_slot)
|
|
||||||
+{
|
|
||||||
+ if (is_atihdmi(codec))
|
|
||||||
+ return atihdmi_get_chan_slot(codec, pin_nid, asp_slot);
|
|
||||||
+
|
|
||||||
+ return snd_hda_codec_read(codec, pin_nid, 0,
|
|
||||||
+ AC_VERB_GET_HDMI_CHAN_SLOT,
|
|
||||||
+ asp_slot);
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
static void hdmi_debug_channel_mapping(struct hda_codec *codec,
|
|
||||||
hda_nid_t pin_nid)
|
|
||||||
{
|
|
||||||
@@ -581,14 +599,26 @@ static void hdmi_debug_channel_mapping(struct hda_codec *codec,
|
|
||||||
int slot;
|
|
||||||
|
|
||||||
for (i = 0; i < 8; i++) {
|
|
||||||
- slot = snd_hda_codec_read(codec, pin_nid, 0,
|
|
||||||
- AC_VERB_GET_HDMI_CHAN_SLOT, i);
|
|
||||||
+ slot = hdmi_get_chan_slot(codec, pin_nid, i);
|
|
||||||
printk(KERN_DEBUG "HDMI: ASP channel %d => slot %d\n",
|
|
||||||
slot >> 4, slot & 0xf);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int atihdmi_set_chan_slot(struct hda_codec *codec, hda_nid_t pin_nid,
|
|
||||||
+ int chanslot_setup);
|
|
||||||
+
|
|
||||||
+static int hdmi_set_chan_slot(struct hda_codec *codec, hda_nid_t pin_nid,
|
|
||||||
+ int chanslot_setup)
|
|
||||||
+{
|
|
||||||
+ if (is_atihdmi(codec))
|
|
||||||
+ return atihdmi_set_chan_slot(codec, pin_nid, chanslot_setup);
|
|
||||||
+
|
|
||||||
+ return snd_hda_codec_write(codec, pin_nid, 0,
|
|
||||||
+ AC_VERB_SET_HDMI_CHAN_SLOT,
|
|
||||||
+ chanslot_setup);
|
|
||||||
+}
|
|
||||||
|
|
||||||
static void hdmi_std_setup_channel_mapping(struct hda_codec *codec,
|
|
||||||
hda_nid_t pin_nid,
|
|
||||||
@@ -617,9 +647,8 @@ static void hdmi_std_setup_channel_mapping(struct hda_codec *codec,
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < 8; i++) {
|
|
||||||
- err = snd_hda_codec_write(codec, pin_nid, 0,
|
|
||||||
- AC_VERB_SET_HDMI_CHAN_SLOT,
|
|
||||||
- non_pcm ? non_pcm_mapping[i] : hdmi_channel_mapping[ca][i]);
|
|
||||||
+ err = hdmi_set_chan_slot(codec, pin_nid,
|
|
||||||
+ non_pcm ? non_pcm_mapping[i] : hdmi_channel_mapping[ca][i]);
|
|
||||||
if (err) {
|
|
||||||
snd_printdd(KERN_NOTICE
|
|
||||||
"HDMI: channel mapping failed\n");
|
|
||||||
@@ -728,8 +757,7 @@ static int hdmi_manual_setup_channel_mapping(struct hda_codec *codec,
|
|
||||||
else
|
|
||||||
val = 0xf;
|
|
||||||
val |= (i << 4);
|
|
||||||
- err = snd_hda_codec_write(codec, pin_nid, 0,
|
|
||||||
- AC_VERB_SET_HDMI_CHAN_SLOT, val);
|
|
||||||
+ err = hdmi_set_chan_slot(codec, pin_nid, val);
|
|
||||||
if (err)
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
@@ -883,6 +911,8 @@ static bool hdmi_infoframe_uptodate(struct hda_codec *codec, hda_nid_t pin_nid,
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void atihdmi_set_ca(struct hda_codec *codec, hda_nid_t pin_nid, int ca);
|
|
||||||
+
|
|
||||||
static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
|
|
||||||
struct hdmi_spec_per_pin *per_pin,
|
|
||||||
bool non_pcm)
|
|
||||||
@@ -912,6 +942,16 @@ static void hdmi_setup_audio_infoframe(struct hda_codec *codec,
|
|
||||||
if (ca < 0)
|
|
||||||
ca = 0;
|
|
||||||
|
|
||||||
+ if (is_atihdmi(codec)) {
|
|
||||||
+ /* for ATI/AMD we just want to map channels and set ca */
|
|
||||||
+ hdmi_setup_channel_mapping(codec, pin_nid, non_pcm, ca,
|
|
||||||
+ channels, per_pin->chmap,
|
|
||||||
+ per_pin->chmap_set);
|
|
||||||
+ atihdmi_set_ca(codec, pin_nid, ca);
|
|
||||||
+ per_pin->non_pcm = non_pcm;
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
memset(&ai, 0, sizeof(ai));
|
|
||||||
if (eld->info.conn_type == 0) { /* HDMI */
|
|
||||||
struct hdmi_audio_infoframe *hdmi_ai = &ai.hdmi;
|
|
||||||
@@ -1100,7 +1140,7 @@ static int hdmi_setup_stream(struct hda_codec *codec, hda_nid_t cvt_nid,
|
|
||||||
new_pinctl);
|
|
||||||
|
|
||||||
}
|
|
||||||
- if (is_hbr_format(format) && !new_pinctl) {
|
|
||||||
+ if (is_hbr_format(format) && !new_pinctl && !is_atihdmi(codec)) {
|
|
||||||
snd_printdd("hdmi_setup_stream: HBR is not supported\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
@@ -1603,6 +1643,8 @@ static int hdmi_chmap_ctl_info(struct snd_kcontrol *kcontrol,
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int atihdmi_swap_fc_lfe(int pos);
|
|
||||||
+
|
|
||||||
static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
|
|
||||||
unsigned int size, unsigned int __user *tlv)
|
|
||||||
{
|
|
||||||
@@ -1613,6 +1655,10 @@ static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
|
|
||||||
FL | FR | RL | RR | LFE | FC | RLC | RRC;
|
|
||||||
unsigned int __user *dst;
|
|
||||||
int chs, count = 0;
|
|
||||||
+ int tlv_type = SNDRV_CTL_TLVT_CHMAP_VAR;
|
|
||||||
+
|
|
||||||
+ if (is_atihdmi(codec) && !has_amd_full_remap_support(codec))
|
|
||||||
+ tlv_type = SNDRV_CTL_TLVT_CHMAP_PAIRED;
|
|
||||||
|
|
||||||
if (size < 8)
|
|
||||||
return -ENOMEM;
|
|
||||||
@@ -1620,19 +1666,35 @@ static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
|
|
||||||
return -EFAULT;
|
|
||||||
size -= 8;
|
|
||||||
dst = tlv + 2;
|
|
||||||
- for (chs = 2; chs <= spec->channels_max; chs++) {
|
|
||||||
+ for (chs = 2; chs <= spec->channels_max;
|
|
||||||
+ chs += (tlv_type == SNDRV_CTL_TLVT_CHMAP_PAIRED) ? 2 : 1) {
|
|
||||||
int i, c;
|
|
||||||
struct cea_channel_speaker_allocation *cap;
|
|
||||||
cap = channel_allocations;
|
|
||||||
for (i = 0; i < ARRAY_SIZE(channel_allocations); i++, cap++) {
|
|
||||||
int chs_bytes = chs * 4;
|
|
||||||
- if (cap->channels != chs)
|
|
||||||
+
|
|
||||||
+ if (tlv_type == SNDRV_CTL_TLVT_CHMAP_PAIRED) {
|
|
||||||
+ int chanpairs = 0;
|
|
||||||
+ /* in paired mode we need to take into account
|
|
||||||
+ * the occupied channel pairs instead of just the
|
|
||||||
+ * channel count */
|
|
||||||
+ for (c = 0; c < 7; c += 2) {
|
|
||||||
+ if (cap->speakers[c] || cap->speakers[c+1])
|
|
||||||
+ chanpairs++;
|
|
||||||
+ }
|
|
||||||
+ if (chanpairs * 2 != chs)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ } else if (cap->channels != chs)
|
|
||||||
continue;
|
|
||||||
+
|
|
||||||
if (cap->spk_mask & ~valid_mask)
|
|
||||||
continue;
|
|
||||||
if (size < 8)
|
|
||||||
return -ENOMEM;
|
|
||||||
- if (put_user(SNDRV_CTL_TLVT_CHMAP_VAR, dst) ||
|
|
||||||
+
|
|
||||||
+ if (put_user(tlv_type, dst) ||
|
|
||||||
put_user(chs_bytes, dst + 1))
|
|
||||||
return -EFAULT;
|
|
||||||
dst += 2;
|
|
||||||
@@ -1643,10 +1705,27 @@ static int hdmi_chmap_ctl_tlv(struct snd_kcontrol *kcontrol, int op_flag,
|
|
||||||
size -= chs_bytes;
|
|
||||||
count += chs_bytes;
|
|
||||||
for (c = 7; c >= 0; c--) {
|
|
||||||
- int spk = cap->speakers[c];
|
|
||||||
- if (!spk)
|
|
||||||
- continue;
|
|
||||||
- if (put_user(spk_to_chmap(spk), dst))
|
|
||||||
+ int spk;
|
|
||||||
+ int chan = c;
|
|
||||||
+ int chpos;
|
|
||||||
+
|
|
||||||
+ if (tlv_type == SNDRV_CTL_TLVT_CHMAP_PAIRED)
|
|
||||||
+ chan = 7 - atihdmi_swap_fc_lfe(7 - chan);
|
|
||||||
+
|
|
||||||
+ spk = cap->speakers[chan];
|
|
||||||
+ if (spk)
|
|
||||||
+ chpos = spk_to_chmap(spk);
|
|
||||||
+ else {
|
|
||||||
+ /* We need to reserve an N/A channel in paired mode
|
|
||||||
+ * if the companion channel is occupied. */
|
|
||||||
+ if (tlv_type == SNDRV_CTL_TLVT_CHMAP_PAIRED
|
|
||||||
+ && cap->speakers[chan + (chan % 2 ? -1 : 1)])
|
|
||||||
+ chpos = SNDRV_CHMAP_NA;
|
|
||||||
+ else
|
|
||||||
+ continue;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (put_user(chpos, dst))
|
|
||||||
return -EFAULT;
|
|
||||||
dst++;
|
|
||||||
}
|
|
||||||
@@ -1672,6 +1751,18 @@ static int hdmi_chmap_ctl_get(struct snd_kcontrol *kcontrol,
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static int atihdmi_pairwise_chmap_check_order(struct hda_codec *codec, int ca,
|
|
||||||
+ int chs, unsigned char *map);
|
|
||||||
+
|
|
||||||
+static int hdmi_chmap_check_order(struct hda_codec *codec, int ca,
|
|
||||||
+ int chs, unsigned char *map)
|
|
||||||
+{
|
|
||||||
+ if (is_atihdmi(codec) && !has_amd_full_remap_support(codec))
|
|
||||||
+ return atihdmi_pairwise_chmap_check_order(codec, ca, chs, map);
|
|
||||||
+
|
|
||||||
+ return 0; /* anything can be remapped as needed */
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol,
|
|
||||||
struct snd_ctl_elem_value *ucontrol)
|
|
||||||
{
|
|
||||||
@@ -1683,7 +1774,7 @@ static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol,
|
|
||||||
unsigned int ctl_idx;
|
|
||||||
struct snd_pcm_substream *substream;
|
|
||||||
unsigned char chmap[8];
|
|
||||||
- int i, ca, prepared = 0;
|
|
||||||
+ int i, err, ca, prepared = 0;
|
|
||||||
|
|
||||||
ctl_idx = snd_ctl_get_ioffidx(kcontrol, &ucontrol->id);
|
|
||||||
substream = snd_pcm_chmap_substream(info, ctl_idx);
|
|
||||||
@@ -1707,6 +1798,9 @@ static int hdmi_chmap_ctl_put(struct snd_kcontrol *kcontrol,
|
|
||||||
ca = hdmi_manual_channel_allocation(ARRAY_SIZE(chmap), chmap);
|
|
||||||
if (ca < 0)
|
|
||||||
return -EINVAL;
|
|
||||||
+ err = hdmi_chmap_check_order(codec, ca, ARRAY_SIZE(chmap), chmap);
|
|
||||||
+ if (err < 0)
|
|
||||||
+ return -EINVAL;
|
|
||||||
per_pin->chmap_set = true;
|
|
||||||
memcpy(per_pin->chmap, chmap, sizeof(chmap));
|
|
||||||
if (prepared)
|
|
||||||
@@ -2551,13 +2645,182 @@ static int patch_nvhdmi_8ch_7x(struct hda_codec *codec)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ATI-specific implementations
|
|
||||||
- *
|
|
||||||
- * FIXME: we may omit the whole this and use the generic code once after
|
|
||||||
- * it's confirmed to work.
|
|
||||||
*/
|
|
||||||
|
|
||||||
-#define ATIHDMI_CVT_NID 0x02 /* audio converter */
|
|
||||||
-#define ATIHDMI_PIN_NID 0x03 /* HDMI output pin */
|
|
||||||
+/* ATI/AMD specific HDA pin verbs, see the AMD HDA Verbs specification */
|
|
||||||
+#define ATI_VERB_SET_CHANNEL_ALLOCATION 0x771
|
|
||||||
+#define ATI_VERB_SET_DOWNMIX_INFO 0x772
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_01 0x777
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_23 0x778
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_45 0x779
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_67 0x77a
|
|
||||||
+#define ATI_VERB_SET_HBR_CONTROL 0x77c
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_1 0x785
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_3 0x786
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_5 0x787
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_7 0x788
|
|
||||||
+#define ATI_VERB_SET_MULTICHANNEL_MODE 0x789
|
|
||||||
+#define ATI_VERB_GET_CHANNEL_ALLOCATION 0xf71
|
|
||||||
+#define ATI_VERB_GET_DOWNMIX_INFO 0xf72
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_01 0xf77
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_23 0xf78
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_45 0xf79
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_67 0xf7a
|
|
||||||
+#define ATI_VERB_GET_HBR_CONTROL 0xf7c
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_1 0xf85
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_3 0xf86
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_5 0xf87
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_7 0xf88
|
|
||||||
+#define ATI_VERB_GET_MULTICHANNEL_MODE 0xf89
|
|
||||||
+
|
|
||||||
+/* AMD specific HDA cvt verbs */
|
|
||||||
+#define ATI_VERB_SET_RAMP_RATE 0x770
|
|
||||||
+#define ATI_VERB_GET_RAMP_RATE 0xf70
|
|
||||||
+
|
|
||||||
+#define ATI_OUT_ENABLE 0x1
|
|
||||||
+
|
|
||||||
+#define ATI_HBR_CAPABLE 0x01
|
|
||||||
+#define ATI_HBR_ENABLE 0x10
|
|
||||||
+
|
|
||||||
+static void atihdmi_set_ca(struct hda_codec *codec, hda_nid_t pin_nid, int ca)
|
|
||||||
+{
|
|
||||||
+ printk("ATI: setting ca %d\n", ca);
|
|
||||||
+ snd_hda_codec_write(codec, pin_nid, 0, ATI_VERB_SET_CHANNEL_ALLOCATION, ca);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int atihdmi_swap_fc_lfe(int pos)
|
|
||||||
+{
|
|
||||||
+ /*
|
|
||||||
+ * Older ATI/AMD without channel-wise mapping
|
|
||||||
+ * have automatic FC/LFE swap built-in.
|
|
||||||
+ */
|
|
||||||
+
|
|
||||||
+ switch (pos) {
|
|
||||||
+ /* see channel_allocations[].speakers[] */
|
|
||||||
+ case 2: return 3;
|
|
||||||
+ case 3: return 2;
|
|
||||||
+ default: break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return pos;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int atihdmi_pairwise_chmap_check_order(struct hda_codec *codec, int ca,
|
|
||||||
+ int chs, unsigned char *map)
|
|
||||||
+{
|
|
||||||
+ struct cea_channel_speaker_allocation *cap;
|
|
||||||
+ int i, j;
|
|
||||||
+
|
|
||||||
+ /* check that only channel pairs need to be remapped on old ATI/AMD */
|
|
||||||
+
|
|
||||||
+ cap = &channel_allocations[get_channel_allocation_order(ca)];
|
|
||||||
+ for (i = 0; i < chs; ++i) {
|
|
||||||
+ int mask = to_spk_mask(map[i]);
|
|
||||||
+ bool ok = false;
|
|
||||||
+ bool companion_ok = false;
|
|
||||||
+
|
|
||||||
+ if (!mask)
|
|
||||||
+ continue;
|
|
||||||
+
|
|
||||||
+ for (j = 0 + i % 2; j < 8; j += 2) {
|
|
||||||
+ int chan_idx = 7 - atihdmi_swap_fc_lfe(j);
|
|
||||||
+ if (cap->speakers[chan_idx] == mask) {
|
|
||||||
+ /* channel is in a supported position */
|
|
||||||
+ ok = true;
|
|
||||||
+
|
|
||||||
+ if (i % 2 == 0 && i + 1 < chs) {
|
|
||||||
+ /* even channel, check the odd companion */
|
|
||||||
+ int comp_chan_idx = 7 - atihdmi_swap_fc_lfe(j + 1);
|
|
||||||
+ int comp_mask_req = to_spk_mask(map[i+1]);
|
|
||||||
+ int comp_mask_act = cap->speakers[comp_chan_idx];
|
|
||||||
+
|
|
||||||
+ if (comp_mask_req == comp_mask_act)
|
|
||||||
+ companion_ok = true;
|
|
||||||
+ else
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (!ok)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ if (companion_ok)
|
|
||||||
+ i++; /* companion channel already checked */
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int atihdmi_set_chan_slot(struct hda_codec *codec, hda_nid_t pin_nid,
|
|
||||||
+ int chanslot_setup)
|
|
||||||
+{
|
|
||||||
+ int hdmi_slot = chanslot_setup & 0xf;
|
|
||||||
+ int stream_channel = chanslot_setup >> 4;
|
|
||||||
+ int verb;
|
|
||||||
+ int ati_channel_setup = 0;
|
|
||||||
+
|
|
||||||
+ if (hdmi_slot > 7)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ if (!has_amd_full_remap_support(codec)) {
|
|
||||||
+ hdmi_slot = atihdmi_swap_fc_lfe(hdmi_slot);
|
|
||||||
+
|
|
||||||
+ /* In case this is an odd slot but without stream channel, do not
|
|
||||||
+ * disable the slot since the corresponding even slot could have a
|
|
||||||
+ * channel. In case neither have a channel, the slot pair will be
|
|
||||||
+ * disabled when this function is called for the even slot. */
|
|
||||||
+ if (hdmi_slot % 2 != 0 && stream_channel == 0xf)
|
|
||||||
+ return 0;
|
|
||||||
+
|
|
||||||
+ hdmi_slot -= hdmi_slot % 2;
|
|
||||||
+
|
|
||||||
+ if (stream_channel != 0xf)
|
|
||||||
+ stream_channel -= stream_channel % 2;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ verb = ATI_VERB_SET_MULTICHANNEL_01 + hdmi_slot/2 + (hdmi_slot % 2) * 0x00e;
|
|
||||||
+
|
|
||||||
+ /* ati_channel_setup format: [7..4] = stream_channel_id, [1] = mute, [0] = enable */
|
|
||||||
+
|
|
||||||
+ if (stream_channel != 0xf)
|
|
||||||
+ ati_channel_setup = (stream_channel << 4) | ATI_OUT_ENABLE;
|
|
||||||
+
|
|
||||||
+ return snd_hda_codec_write(codec, pin_nid, 0, verb, ati_channel_setup);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_SND_DEBUG_VERBOSE
|
|
||||||
+static int atihdmi_get_chan_slot(struct hda_codec *codec, hda_nid_t pin_nid, int asp_slot)
|
|
||||||
+{
|
|
||||||
+ bool was_odd = false;
|
|
||||||
+ int ati_asp_slot = asp_slot;
|
|
||||||
+ int verb;
|
|
||||||
+ int ati_channel_setup;
|
|
||||||
+
|
|
||||||
+ /* emulate AC_VERB_GET_HDMI_CHAN_SLOT */
|
|
||||||
+
|
|
||||||
+ if (asp_slot > 7)
|
|
||||||
+ return -EINVAL;
|
|
||||||
+
|
|
||||||
+ if (!has_amd_full_remap_support(codec)) {
|
|
||||||
+ ati_asp_slot = atihdmi_swap_fc_lfe(asp_slot);
|
|
||||||
+ if (ati_asp_slot % 2 != 0) {
|
|
||||||
+ ati_asp_slot -= 1;
|
|
||||||
+ was_odd = true;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ verb = ATI_VERB_GET_MULTICHANNEL_01 + ati_asp_slot/2 + (ati_asp_slot % 2) * 0x00e;
|
|
||||||
+
|
|
||||||
+ ati_channel_setup = snd_hda_codec_read(codec, pin_nid, 0, verb, 0);
|
|
||||||
+
|
|
||||||
+ if (!(ati_channel_setup & ATI_OUT_ENABLE))
|
|
||||||
+ return (0xf << 4) | asp_slot;
|
|
||||||
+
|
|
||||||
+ return ((ati_channel_setup & 0xf0) + ((!!was_odd) << 4)) | asp_slot;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
|
|
||||||
struct hda_codec *codec,
|
|
||||||
@@ -2565,34 +2828,117 @@ static int atihdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
|
|
||||||
unsigned int format,
|
|
||||||
struct snd_pcm_substream *substream)
|
|
||||||
{
|
|
||||||
+ hda_nid_t cvt_nid = hinfo->nid;
|
|
||||||
struct hdmi_spec *spec = codec->spec;
|
|
||||||
- struct hdmi_spec_per_cvt *per_cvt = get_cvt(spec, 0);
|
|
||||||
- int chans = substream->runtime->channels;
|
|
||||||
- int i, err;
|
|
||||||
+ int pin_idx = hinfo_to_pin_index(spec, hinfo);
|
|
||||||
+ struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
|
|
||||||
+ hda_nid_t pin_nid = per_pin->pin_nid;
|
|
||||||
+ int hbr_ctl, hbr_ctl_new;
|
|
||||||
|
|
||||||
- err = simple_playback_pcm_prepare(hinfo, codec, stream_tag, format,
|
|
||||||
- substream);
|
|
||||||
- if (err < 0)
|
|
||||||
+ hbr_ctl = snd_hda_codec_read(codec, pin_nid, 0, ATI_VERB_GET_HBR_CONTROL, 0);
|
|
||||||
+ if (hbr_ctl & ATI_HBR_CAPABLE) {
|
|
||||||
+ if (is_hbr_format(format))
|
|
||||||
+ hbr_ctl_new = hbr_ctl | ATI_HBR_ENABLE;
|
|
||||||
+ else
|
|
||||||
+ hbr_ctl_new = hbr_ctl & ~ATI_HBR_ENABLE;
|
|
||||||
+
|
|
||||||
+ snd_printdd("atihdmi_playback_pcm_prepare: "
|
|
||||||
+ "NID=0x%x, %shbr-ctl=0x%x\n",
|
|
||||||
+ pin_nid,
|
|
||||||
+ hbr_ctl == hbr_ctl_new ? "" : "new-",
|
|
||||||
+ hbr_ctl_new);
|
|
||||||
+
|
|
||||||
+ if (hbr_ctl != hbr_ctl_new)
|
|
||||||
+ snd_hda_codec_write(codec, pin_nid, 0,
|
|
||||||
+ ATI_VERB_SET_HBR_CONTROL,
|
|
||||||
+ hbr_ctl_new);
|
|
||||||
+
|
|
||||||
+ } else if (is_hbr_format(format)) {
|
|
||||||
+ snd_printdd("atihdmi_playback_pcm_prepare: HBR is not supported\n");
|
|
||||||
+ return -EINVAL;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (is_amdhdmi_rev3(codec)) {
|
|
||||||
+ int ramp_rate = 180; /* default as per spec */
|
|
||||||
+ /* disable ramp-up/down for non-pcm as per spec */
|
|
||||||
+ if (format & AC_FMT_TYPE_NON_PCM)
|
|
||||||
+ ramp_rate = 0;
|
|
||||||
+
|
|
||||||
+ snd_hda_codec_write(codec, cvt_nid, 0, ATI_VERB_SET_RAMP_RATE, ramp_rate);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ return generic_hdmi_playback_pcm_prepare(hinfo, codec, stream_tag, format, substream);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int atihdmi_build_pcms(struct hda_codec *codec)
|
|
||||||
+{
|
|
||||||
+ struct hdmi_spec *spec = codec->spec;
|
|
||||||
+ int err, pin_idx;
|
|
||||||
+
|
|
||||||
+ err = generic_hdmi_build_pcms(codec);
|
|
||||||
+
|
|
||||||
+ if (err)
|
|
||||||
return err;
|
|
||||||
- snd_hda_codec_write(codec, per_cvt->cvt_nid, 0,
|
|
||||||
- AC_VERB_SET_CVT_CHAN_COUNT, chans - 1);
|
|
||||||
- /* FIXME: XXX */
|
|
||||||
- for (i = 0; i < chans; i++) {
|
|
||||||
- snd_hda_codec_write(codec, per_cvt->cvt_nid, 0,
|
|
||||||
- AC_VERB_SET_HDMI_CHAN_SLOT,
|
|
||||||
- (i << 4) | i);
|
|
||||||
+
|
|
||||||
+ for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
|
|
||||||
+ struct hda_pcm *info = get_pcm_rec(spec, pin_idx);
|
|
||||||
+
|
|
||||||
+ info->stream[SNDRV_PCM_STREAM_PLAYBACK].ops.prepare = atihdmi_playback_pcm_prepare;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static int atihdmi_init(struct hda_codec *codec)
|
|
||||||
+{
|
|
||||||
+ struct hdmi_spec *spec = codec->spec;
|
|
||||||
+ int pin_idx, err;
|
|
||||||
+
|
|
||||||
+ err = generic_hdmi_init(codec);
|
|
||||||
+
|
|
||||||
+ if (err)
|
|
||||||
+ return err;
|
|
||||||
+
|
|
||||||
+ for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) {
|
|
||||||
+ struct hdmi_spec_per_pin *per_pin = get_pin(spec, pin_idx);
|
|
||||||
+
|
|
||||||
+ /* make sure downmix information in infoframe is zero */
|
|
||||||
+ snd_hda_codec_write(codec, per_pin->pin_nid, 0, ATI_VERB_SET_DOWNMIX_INFO, 0);
|
|
||||||
+
|
|
||||||
+ /* enable channel-wise remap mode if supported */
|
|
||||||
+ if (has_amd_full_remap_support(codec))
|
|
||||||
+ snd_hda_codec_write(codec, per_pin->pin_nid, 0, ATI_VERB_SET_MULTICHANNEL_MODE, 1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int patch_atihdmi(struct hda_codec *codec)
|
|
||||||
{
|
|
||||||
struct hdmi_spec *spec;
|
|
||||||
- int err = patch_simple_hdmi(codec, ATIHDMI_CVT_NID, ATIHDMI_PIN_NID);
|
|
||||||
- if (err < 0)
|
|
||||||
+ struct hdmi_spec_per_cvt *per_cvt;
|
|
||||||
+ int err, cvt_idx;
|
|
||||||
+
|
|
||||||
+ err = patch_generic_hdmi(codec);
|
|
||||||
+
|
|
||||||
+ if (err)
|
|
||||||
return err;
|
|
||||||
+
|
|
||||||
+ codec->patch_ops.init = atihdmi_init;
|
|
||||||
+ codec->patch_ops.build_pcms = atihdmi_build_pcms;
|
|
||||||
+
|
|
||||||
+ /* ATI/AMD converters do not advertise all of their capabilities */
|
|
||||||
spec = codec->spec;
|
|
||||||
- spec->pcm_playback.ops.prepare = atihdmi_playback_pcm_prepare;
|
|
||||||
+ for (cvt_idx = 0; cvt_idx < spec->num_cvts; cvt_idx++) {
|
|
||||||
+ per_cvt = get_cvt(spec, cvt_idx);
|
|
||||||
+ per_cvt->channels_max = max(per_cvt->channels_max, 8u);
|
|
||||||
+ per_cvt->rates |= SUPPORTED_RATES;
|
|
||||||
+ per_cvt->formats |= SUPPORTED_FORMATS;
|
|
||||||
+ per_cvt->maxbps = max(per_cvt->maxbps, 24u);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ spec->channels_max = max(spec->channels_max, 8u);
|
|
||||||
+
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -2612,7 +2958,7 @@ static const struct hda_codec_preset snd_hda_preset_hdmi[] = {
|
|
||||||
{ .id = 0x1002793c, .name = "RS600 HDMI", .patch = patch_atihdmi },
|
|
||||||
{ .id = 0x10027919, .name = "RS600 HDMI", .patch = patch_atihdmi },
|
|
||||||
{ .id = 0x1002791a, .name = "RS690/780 HDMI", .patch = patch_atihdmi },
|
|
||||||
-{ .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_generic_hdmi },
|
|
||||||
+{ .id = 0x1002aa01, .name = "R6xx HDMI", .patch = patch_atihdmi },
|
|
||||||
{ .id = 0x10951390, .name = "SiI1390 HDMI", .patch = patch_generic_hdmi },
|
|
||||||
{ .id = 0x10951392, .name = "SiI1392 HDMI", .patch = patch_generic_hdmi },
|
|
||||||
{ .id = 0x17e80047, .name = "Chrontel HDMI", .patch = patch_generic_hdmi },
|
|
||||||
@ -1,41 +0,0 @@
|
|||||||
From 6a4a51f43cc6635c7b731d9fb2e1e32333d594fe Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alex Deucher <alexander.deucher@amd.com>
|
|
||||||
Date: Fri, 27 Sep 2013 18:09:54 -0400
|
|
||||||
Subject: [PATCH 1/3] drm/radeon: use 64-bit math to calculate CTS values for
|
|
||||||
audio (v2)
|
|
||||||
|
|
||||||
Avoid losing precision. See bug:
|
|
||||||
https://bugs.freedesktop.org/show_bug.cgi?id=69675
|
|
||||||
|
|
||||||
v2: fix math as per Anssi's comments.
|
|
||||||
|
|
||||||
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/radeon/r600_hdmi.c | 11 +++++++++--
|
|
||||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
index b0fa600..49043a5 100644
|
|
||||||
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
@@ -75,8 +75,15 @@ static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = {
|
|
||||||
*/
|
|
||||||
static void r600_hdmi_calc_cts(uint32_t clock, int *CTS, int N, int freq)
|
|
||||||
{
|
|
||||||
- if (*CTS == 0)
|
|
||||||
- *CTS = clock * N / (128 * freq) * 1000;
|
|
||||||
+ u64 n;
|
|
||||||
+ u32 d;
|
|
||||||
+
|
|
||||||
+ if (*CTS == 0) {
|
|
||||||
+ n = (u64)clock * (u64)N * 1000ULL;
|
|
||||||
+ d = 128 * freq;
|
|
||||||
+ do_div(n, d);
|
|
||||||
+ *CTS = n;
|
|
||||||
+ }
|
|
||||||
DRM_DEBUG("Using ACR timing N=%d CTS=%d for frequency %d\n",
|
|
||||||
N, *CTS, freq);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
From c8908f579ae9aac33122cfdfffaef30bba0a7697 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alex Deucher <alexander.deucher@amd.com>
|
|
||||||
Date: Fri, 27 Sep 2013 18:19:42 -0400
|
|
||||||
Subject: [PATCH 2/3] drm/radeon: fix N/CTS clock matching for audio
|
|
||||||
|
|
||||||
The drm code that calculates the 1001 clocks rounds up
|
|
||||||
rather than truncating. This allows the table to match
|
|
||||||
properly on those modes.
|
|
||||||
|
|
||||||
See bug:
|
|
||||||
https://bugs.freedesktop.org/show_bug.cgi?id=69675
|
|
||||||
|
|
||||||
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/radeon/r600_hdmi.c | 6 +++---
|
|
||||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
index 2ce2793..a378081 100644
|
|
||||||
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
@@ -58,15 +58,15 @@ enum r600_hdmi_iec_status_bits {
|
|
||||||
static const struct radeon_hdmi_acr r600_hdmi_predefined_acr[] = {
|
|
||||||
/* 32kHz 44.1kHz 48kHz */
|
|
||||||
/* Clock N CTS N CTS N CTS */
|
|
||||||
- { 25174, 4576, 28125, 7007, 31250, 6864, 28125 }, /* 25,20/1.001 MHz */
|
|
||||||
+ { 25175, 4576, 28125, 7007, 31250, 6864, 28125 }, /* 25,20/1.001 MHz */
|
|
||||||
{ 25200, 4096, 25200, 6272, 28000, 6144, 25200 }, /* 25.20 MHz */
|
|
||||||
{ 27000, 4096, 27000, 6272, 30000, 6144, 27000 }, /* 27.00 MHz */
|
|
||||||
{ 27027, 4096, 27027, 6272, 30030, 6144, 27027 }, /* 27.00*1.001 MHz */
|
|
||||||
{ 54000, 4096, 54000, 6272, 60000, 6144, 54000 }, /* 54.00 MHz */
|
|
||||||
{ 54054, 4096, 54054, 6272, 60060, 6144, 54054 }, /* 54.00*1.001 MHz */
|
|
||||||
- { 74175, 11648, 210937, 17836, 234375, 11648, 140625 }, /* 74.25/1.001 MHz */
|
|
||||||
+ { 74176, 11648, 210937, 17836, 234375, 11648, 140625 }, /* 74.25/1.001 MHz */
|
|
||||||
{ 74250, 4096, 74250, 6272, 82500, 6144, 74250 }, /* 74.25 MHz */
|
|
||||||
- { 148351, 11648, 421875, 8918, 234375, 5824, 140625 }, /* 148.50/1.001 MHz */
|
|
||||||
+ { 148352, 11648, 421875, 8918, 234375, 5824, 140625 }, /* 148.50/1.001 MHz */
|
|
||||||
{ 148500, 4096, 148500, 6272, 165000, 6144, 148500 }, /* 148.50 MHz */
|
|
||||||
{ 0, 4096, 0, 6272, 0, 6144, 0 } /* Other */
|
|
||||||
};
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
From 37396f32fc8c8a4f68e0fd069e4e63ce19786ef4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alex Deucher <alexander.deucher@amd.com>
|
|
||||||
Date: Fri, 27 Sep 2013 18:22:15 -0400
|
|
||||||
Subject: [PATCH 3/3] drm/radeon: use hw generated CTS/N values for audio
|
|
||||||
|
|
||||||
Use the hw generated values rather than calculating
|
|
||||||
them in the driver. There may be some older r6xx
|
|
||||||
asics where this doesn't work correctly. This remains
|
|
||||||
to be seen.
|
|
||||||
|
|
||||||
See bug:
|
|
||||||
https://bugs.freedesktop.org/show_bug.cgi?id=69675
|
|
||||||
|
|
||||||
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/radeon/evergreen_hdmi.c | 3 +--
|
|
||||||
drivers/gpu/drm/radeon/r600_hdmi.c | 3 +--
|
|
||||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/radeon/evergreen_hdmi.c b/drivers/gpu/drm/radeon/evergreen_hdmi.c
|
|
||||||
index f71ce39..f815c20 100644
|
|
||||||
--- a/drivers/gpu/drm/radeon/evergreen_hdmi.c
|
|
||||||
+++ b/drivers/gpu/drm/radeon/evergreen_hdmi.c
|
|
||||||
@@ -288,8 +288,7 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode
|
|
||||||
/* fglrx clears sth in AFMT_AUDIO_PACKET_CONTROL2 here */
|
|
||||||
|
|
||||||
WREG32(HDMI_ACR_PACKET_CONTROL + offset,
|
|
||||||
- HDMI_ACR_AUTO_SEND | /* allow hw to sent ACR packets when required */
|
|
||||||
- HDMI_ACR_SOURCE); /* select SW CTS value */
|
|
||||||
+ HDMI_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */
|
|
||||||
|
|
||||||
evergreen_hdmi_update_ACR(encoder, mode->clock);
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
index a378081..2b5f9a7 100644
|
|
||||||
--- a/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
+++ b/drivers/gpu/drm/radeon/r600_hdmi.c
|
|
||||||
@@ -451,8 +451,7 @@ void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
|
|
||||||
}
|
|
||||||
|
|
||||||
WREG32(HDMI0_ACR_PACKET_CONTROL + offset,
|
|
||||||
- HDMI0_ACR_AUTO_SEND | /* allow hw to sent ACR packets when required */
|
|
||||||
- HDMI0_ACR_SOURCE); /* select SW CTS value */
|
|
||||||
+ HDMI0_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */
|
|
||||||
|
|
||||||
WREG32(HDMI0_VBI_PACKET_CONTROL + offset,
|
|
||||||
HDMI0_NULL_SEND | /* send null packets when required */
|
|
||||||
--
|
|
||||||
1.8.3.1
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
diff -Naur linux-3.10.10/include/uapi/linux/ptrace.h linux-3.10.10.patch/include/uapi/linux/ptrace.h
|
|
||||||
--- linux-3.10.10/include/uapi/linux/ptrace.h 2013-08-29 18:47:51.000000000 +0200
|
|
||||||
+++ linux-3.10.10.patch/include/uapi/linux/ptrace.h 2013-09-04 16:38:10.182685149 +0200
|
|
||||||
@@ -55,11 +55,13 @@
|
|
||||||
|
|
||||||
#define PTRACE_PEEKSIGINFO 0x4209
|
|
||||||
|
|
||||||
+#ifdef __KERNEL__
|
|
||||||
struct ptrace_peeksiginfo_args {
|
|
||||||
__u64 off; /* from which siginfo to start */
|
|
||||||
__u32 flags;
|
|
||||||
__s32 nr; /* how may siginfos to take */
|
|
||||||
};
|
|
||||||
+#endif /* __KERNEL__ */
|
|
||||||
|
|
||||||
/* Read signals from a shared (process wide) queue */
|
|
||||||
#define PTRACE_PEEKSIGINFO_SHARED (1 << 0)
|
|
||||||
@ -1,66 +0,0 @@
|
|||||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/i915/i915_drv.h | 3 ++-
|
|
||||||
drivers/gpu/drm/i915/intel_display.c | 11 +++++++----
|
|
||||||
2 files changed, 9 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
|
|
||||||
index 6106d3d..caee590 100644
|
|
||||||
--- a/drivers/gpu/drm/i915/i915_drv.h
|
|
||||||
+++ b/drivers/gpu/drm/i915/i915_drv.h
|
|
||||||
@@ -379,7 +379,8 @@ struct drm_i915_display_funcs {
|
|
||||||
void (*crtc_disable)(struct drm_crtc *crtc);
|
|
||||||
void (*off)(struct drm_crtc *crtc);
|
|
||||||
void (*write_eld)(struct drm_connector *connector,
|
|
||||||
- struct drm_crtc *crtc);
|
|
||||||
+ struct drm_crtc *crtc,
|
|
||||||
+ struct drm_display_mode *mode);
|
|
||||||
void (*fdi_link_train)(struct drm_crtc *crtc);
|
|
||||||
void (*init_clock_gating)(struct drm_device *dev);
|
|
||||||
int (*queue_flip)(struct drm_device *dev, struct drm_crtc *crtc,
|
|
||||||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
index 4f1b636..55740f2 100644
|
|
||||||
--- a/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
+++ b/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
@@ -6752,7 +6752,8 @@ static bool intel_eld_uptodate(struct drm_connector *connector,
|
|
||||||
}
|
|
||||||
|
|
||||||
static void g4x_write_eld(struct drm_connector *connector,
|
|
||||||
- struct drm_crtc *crtc)
|
|
||||||
+ struct drm_crtc *crtc,
|
|
||||||
+ struct drm_display_mode *mode)
|
|
||||||
{
|
|
||||||
struct drm_i915_private *dev_priv = connector->dev->dev_private;
|
|
||||||
uint8_t *eld = connector->eld;
|
|
||||||
@@ -6792,7 +6793,8 @@ static void g4x_write_eld(struct drm_connector *connector,
|
|
||||||
}
|
|
||||||
|
|
||||||
static void haswell_write_eld(struct drm_connector *connector,
|
|
||||||
- struct drm_crtc *crtc)
|
|
||||||
+ struct drm_crtc *crtc,
|
|
||||||
+ struct drm_display_mode *mode)
|
|
||||||
{
|
|
||||||
struct drm_i915_private *dev_priv = connector->dev->dev_private;
|
|
||||||
uint8_t *eld = connector->eld;
|
|
||||||
@@ -6879,7 +6881,8 @@ static void haswell_write_eld(struct drm_connector *connector,
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ironlake_write_eld(struct drm_connector *connector,
|
|
||||||
- struct drm_crtc *crtc)
|
|
||||||
+ struct drm_crtc *crtc,
|
|
||||||
+ struct drm_display_mode *mode)
|
|
||||||
{
|
|
||||||
struct drm_i915_private *dev_priv = connector->dev->dev_private;
|
|
||||||
uint8_t *eld = connector->eld;
|
|
||||||
@@ -6974,7 +6977,7 @@ void intel_write_eld(struct drm_encoder *encoder,
|
|
||||||
connector->eld[6] = drm_av_sync_delay(connector, mode) / 2;
|
|
||||||
|
|
||||||
if (dev_priv->display.write_eld)
|
|
||||||
- dev_priv->display.write_eld(connector, crtc);
|
|
||||||
+ dev_priv->display.write_eld(connector, crtc, mode);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void i845_update_cursor(struct drm_crtc *crtc, u32 base)
|
|
||||||
--
|
|
||||||
1.7.9.5
|
|
||||||
|
|
||||||
@ -1,110 +0,0 @@
|
|||||||
Reference: http://mid.gmane.org/CAGpEb3Ep1LRZETPxHGRfBDqr5Ts2tAc8gCukWwugUf1U5NYv1g@mail.gmail.com
|
|
||||||
Reference: http://mid.gmane.org/20130206213533.GA16367@hardeman.nu
|
|
||||||
Reported-by: David Härdeman <david@hardeman.nu>
|
|
||||||
Reported-by: Jasper Smet <josbeir@gmail.com>
|
|
||||||
Tested-by: Jasper Smet <josbeir@gmail.com>
|
|
||||||
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
|
|
||||||
---
|
|
||||||
drivers/gpu/drm/i915/i915_reg.h | 12 ++++++++-
|
|
||||||
drivers/gpu/drm/i915/intel_display.c | 48 +++++++++++++++++++++++++++++++---
|
|
||||||
2 files changed, 55 insertions(+), 5 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
|
|
||||||
index 13153c3..3266819 100644
|
|
||||||
--- a/drivers/gpu/drm/i915/i915_reg.h
|
|
||||||
+++ b/drivers/gpu/drm/i915/i915_reg.h
|
|
||||||
@@ -4875,7 +4875,17 @@
|
|
||||||
#define AUD_CONFIG_LOWER_N_SHIFT 4
|
|
||||||
#define AUD_CONFIG_LOWER_N_VALUE (0xfff << 4)
|
|
||||||
#define AUD_CONFIG_PIXEL_CLOCK_HDMI_SHIFT 16
|
|
||||||
-#define AUD_CONFIG_PIXEL_CLOCK_HDMI (0xf << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_MASK (0xf << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_25175 (0 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_25200 (1 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_27000 (2 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_27027 (3 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_54000 (4 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_54054 (5 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_74176 (6 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_74250 (7 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_148352 (8 << 16)
|
|
||||||
+#define AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 (9 << 16)
|
|
||||||
#define AUD_CONFIG_DISABLE_NCTS (1 << 3)
|
|
||||||
|
|
||||||
/* HSW Audio */
|
|
||||||
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
index 55740f2..a097f84 100644
|
|
||||||
--- a/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
+++ b/drivers/gpu/drm/i915/intel_display.c
|
|
||||||
@@ -6722,6 +6722,44 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static struct {
|
|
||||||
+ int clock;
|
|
||||||
+ u32 config;
|
|
||||||
+} hdmi_audio_clock[] = {
|
|
||||||
+ { DIV_ROUND_UP(25200 * 1000, 1001), AUD_CONFIG_PIXEL_CLOCK_HDMI_25175 },
|
|
||||||
+ { 25200, AUD_CONFIG_PIXEL_CLOCK_HDMI_25200 }, /* default per bspec */
|
|
||||||
+ { 27000, AUD_CONFIG_PIXEL_CLOCK_HDMI_27000 },
|
|
||||||
+ { 27000 * 1001 / 1000, AUD_CONFIG_PIXEL_CLOCK_HDMI_27027 },
|
|
||||||
+ { 54000, AUD_CONFIG_PIXEL_CLOCK_HDMI_54000 },
|
|
||||||
+ { 54000 * 1001 / 1000, AUD_CONFIG_PIXEL_CLOCK_HDMI_54054 },
|
|
||||||
+ { DIV_ROUND_UP(74250 * 1000, 1001), AUD_CONFIG_PIXEL_CLOCK_HDMI_74176 },
|
|
||||||
+ { 74250, AUD_CONFIG_PIXEL_CLOCK_HDMI_74250 },
|
|
||||||
+ { DIV_ROUND_UP(148500 * 1000, 1001), AUD_CONFIG_PIXEL_CLOCK_HDMI_148352 },
|
|
||||||
+ { 148500, AUD_CONFIG_PIXEL_CLOCK_HDMI_148500 },
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
+/* get AUD_CONFIG_PIXEL_CLOCK_HDMI_* value for mode */
|
|
||||||
+static u32 audio_config_hdmi_pixel_clock(struct drm_display_mode *mode)
|
|
||||||
+{
|
|
||||||
+ int i;
|
|
||||||
+
|
|
||||||
+ for (i = 0; i < ARRAY_SIZE(hdmi_audio_clock); i++) {
|
|
||||||
+ if (mode->clock == hdmi_audio_clock[i].clock)
|
|
||||||
+ break;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ if (i == ARRAY_SIZE(hdmi_audio_clock)) {
|
|
||||||
+ DRM_DEBUG_KMS("HDMI audio pixel clock setting for %d not found, falling back to defaults\n", mode->clock);
|
|
||||||
+ i = 1;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ DRM_DEBUG_KMS("Configuring HDMI audio for pixel clock %d (0x%08x)\n",
|
|
||||||
+ hdmi_audio_clock[i].clock,
|
|
||||||
+ hdmi_audio_clock[i].config);
|
|
||||||
+
|
|
||||||
+ return hdmi_audio_clock[i].config;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static bool intel_eld_uptodate(struct drm_connector *connector,
|
|
||||||
int reg_eldv, uint32_t bits_eldv,
|
|
||||||
int reg_elda, uint32_t bits_elda,
|
|
||||||
@@ -6847,8 +6885,9 @@ static void haswell_write_eld(struct drm_connector *connector,
|
|
||||||
DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
|
|
||||||
eld[5] |= (1 << 2); /* Conn_Type, 0x1 = DisplayPort */
|
|
||||||
I915_WRITE(aud_config, AUD_CONFIG_N_VALUE_INDEX); /* 0x1 = DP */
|
|
||||||
- } else
|
|
||||||
- I915_WRITE(aud_config, 0);
|
|
||||||
+ } else {
|
|
||||||
+ I915_WRITE(aud_config, audio_config_hdmi_pixel_clock(mode));
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (intel_eld_uptodate(connector,
|
|
||||||
aud_cntrl_st2, eldv,
|
|
||||||
@@ -6926,8 +6965,9 @@ static void ironlake_write_eld(struct drm_connector *connector,
|
|
||||||
DRM_DEBUG_DRIVER("ELD: DisplayPort detected\n");
|
|
||||||
eld[5] |= (1 << 2); /* Conn_Type, 0x1 = DisplayPort */
|
|
||||||
I915_WRITE(aud_config, AUD_CONFIG_N_VALUE_INDEX); /* 0x1 = DP */
|
|
||||||
- } else
|
|
||||||
- I915_WRITE(aud_config, 0);
|
|
||||||
+ } else {
|
|
||||||
+ I915_WRITE(aud_config, audio_config_hdmi_pixel_clock(mode));
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (intel_eld_uptodate(connector,
|
|
||||||
aud_cntrl_st2, eldv,
|
|
||||||
--
|
|
||||||
1.7.9.5
|
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
@ -1,84 +0,0 @@
|
|||||||
This reverts
|
|
||||||
https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/patch/?id=9d3ce4af3be0235d4cf41ea9fd774205a32e58a2
|
|
||||||
|
|
||||||
From 9d3ce4af3be0235d4cf41ea9fd774205a32e58a2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
|
|
||||||
Date: Thu, 11 Jul 2013 22:15:37 +0000
|
|
||||||
Subject: cpufreq: Revert commit a66b2e to fix suspend/resume regression
|
|
||||||
|
|
||||||
commit aae760ed21cd690fe8a6db9f3a177ad55d7e12ab upstream.
|
|
||||||
|
|
||||||
commit a66b2e (cpufreq: Preserve sysfs files across suspend/resume)
|
|
||||||
has unfortunately caused several things in the cpufreq subsystem to
|
|
||||||
break subtly after a suspend/resume cycle.
|
|
||||||
|
|
||||||
The intention of that patch was to retain the file permissions of the
|
|
||||||
cpufreq related sysfs files across suspend/resume. To achieve that,
|
|
||||||
the commit completely removed the calls to cpufreq_add_dev() and
|
|
||||||
__cpufreq_remove_dev() during suspend/resume transitions. But the
|
|
||||||
problem is that those functions do 2 kinds of things:
|
|
||||||
1. Low-level initialization/tear-down that are critical to the
|
|
||||||
correct functioning of cpufreq-core.
|
|
||||||
2. Kobject and sysfs related initialization/teardown.
|
|
||||||
|
|
||||||
Ideally we should have reorganized the code to cleanly separate these
|
|
||||||
two responsibilities, and skipped only the sysfs related parts during
|
|
||||||
suspend/resume. Since we skipped the entire callbacks instead (which
|
|
||||||
also included some CPU and cpufreq-specific critical components),
|
|
||||||
cpufreq subsystem started behaving erratically after suspend/resume.
|
|
||||||
|
|
||||||
So revert the commit to fix the regression. We'll revisit and address
|
|
||||||
the original goal of that commit separately, since it involves quite a
|
|
||||||
bit of careful code reorganization and appears to be non-trivial.
|
|
||||||
|
|
||||||
(While reverting the commit, note that another commit f51e1eb
|
|
||||||
(cpufreq: Fix cpufreq regression after suspend/resume) already
|
|
||||||
reverted part of the original set of changes. So revert only the
|
|
||||||
remaining ones).
|
|
||||||
|
|
||||||
Signed-off-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
|
|
||||||
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
|
|
||||||
Tested-by: Paul Bolle <pebolle@tiscali.nl>
|
|
||||||
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
|
|
||||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
||||||
|
|
||||||
---
|
|
||||||
diff -Naur linux-3.10.4/drivers/cpufreq/cpufreq.c linux-3.10.4.patch/drivers/cpufreq/cpufreq.c
|
|
||||||
--- linux-3.10.4/drivers/cpufreq/cpufreq.c 2013-07-29 01:30:49.000000000 +0200
|
|
||||||
+++ linux-3.10.4.patch/drivers/cpufreq/cpufreq.c 2013-07-30 08:08:08.016815021 +0200
|
|
||||||
@@ -1837,15 +1837,13 @@
|
|
||||||
if (dev) {
|
|
||||||
switch (action) {
|
|
||||||
case CPU_ONLINE:
|
|
||||||
- case CPU_ONLINE_FROZEN:
|
|
||||||
cpufreq_add_dev(dev, NULL);
|
|
||||||
break;
|
|
||||||
case CPU_DOWN_PREPARE:
|
|
||||||
- case CPU_DOWN_PREPARE_FROZEN:
|
|
||||||
+ case CPU_UP_CANCELED_FROZEN:
|
|
||||||
__cpufreq_remove_dev(dev, NULL);
|
|
||||||
break;
|
|
||||||
case CPU_DOWN_FAILED:
|
|
||||||
- case CPU_DOWN_FAILED_FROZEN:
|
|
||||||
cpufreq_add_dev(dev, NULL);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
diff -Naur linux-3.10.4/drivers/cpufreq/cpufreq_stats.c linux-3.10.4.patch/drivers/cpufreq/cpufreq_stats.c
|
|
||||||
--- linux-3.10.4/drivers/cpufreq/cpufreq_stats.c 2013-07-29 01:30:49.000000000 +0200
|
|
||||||
+++ linux-3.10.4.patch/drivers/cpufreq/cpufreq_stats.c 2013-07-30 08:08:08.016815021 +0200
|
|
||||||
@@ -353,11 +353,13 @@
|
|
||||||
cpufreq_update_policy(cpu);
|
|
||||||
break;
|
|
||||||
case CPU_DOWN_PREPARE:
|
|
||||||
- case CPU_DOWN_PREPARE_FROZEN:
|
|
||||||
cpufreq_stats_free_sysfs(cpu);
|
|
||||||
break;
|
|
||||||
case CPU_DEAD:
|
|
||||||
- case CPU_DEAD_FROZEN:
|
|
||||||
+ cpufreq_stats_free_table(cpu);
|
|
||||||
+ break;
|
|
||||||
+ case CPU_UP_CANCELED_FROZEN:
|
|
||||||
+ cpufreq_stats_free_sysfs(cpu);
|
|
||||||
cpufreq_stats_free_table(cpu);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
From edab54fcfb1eb4b56868d2e364cf49dc3c6bad25 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Stefan Saraev <stefan@saraev.ca>
|
|
||||||
Date: Wed, 18 Sep 2013 14:52:05 +0300
|
|
||||||
Subject: [PATCH] A split for ds3000/ts2020 code forgot to change the TEVII_S471 code.
|
|
||||||
Change the TEVII_S471 according the changes to TEVII_S470.
|
|
||||||
|
|
||||||
BP: https://linuxtv.org/patch/19731/
|
|
||||||
---
|
|
||||||
drivers/media/pci/cx23885/cx23885-dvb.c | 5 +++++
|
|
||||||
1 files changed, 5 insertions(+), 0 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
|
|
||||||
index 5db14f8..4cbf20a 100644
|
|
||||||
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
|
|
||||||
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
|
|
||||||
@@ -1339,6 +1339,11 @@ static int dvb_register(struct cx23885_tsport *port)
|
|
||||||
fe0->dvb.frontend = dvb_attach(ds3000_attach,
|
|
||||||
&tevii_ds3000_config,
|
|
||||||
&i2c_bus->i2c_adap);
|
|
||||||
+ if (fe0->dvb.frontend != NULL) {
|
|
||||||
+ dvb_attach(ts2020_attach, fe0->dvb.frontend,
|
|
||||||
+ &tevii_ts2020_config, &i2c_bus->i2c_adap);
|
|
||||||
+ fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
|
|
||||||
+ }
|
|
||||||
break;
|
|
||||||
case CX23885_BOARD_BST_PS8512:
|
|
||||||
case CX23885_BOARD_DVBSKY_S950:
|
|
||||||
--
|
|
||||||
1.7.2.5
|
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
#
|
#
|
||||||
# Automatically generated file; DO NOT EDIT.
|
# Automatically generated file; DO NOT EDIT.
|
||||||
# Linux/arm 3.11.0 Kernel Configuration
|
# Linux/arm 3.12.0 Kernel Configuration
|
||||||
#
|
#
|
||||||
CONFIG_ARM=y
|
CONFIG_ARM=y
|
||||||
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
|
||||||
@ -51,15 +51,14 @@ CONFIG_POSIX_MQUEUE=y
|
|||||||
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
CONFIG_POSIX_MQUEUE_SYSCTL=y
|
||||||
CONFIG_FHANDLE=y
|
CONFIG_FHANDLE=y
|
||||||
# CONFIG_AUDIT is not set
|
# CONFIG_AUDIT is not set
|
||||||
CONFIG_HAVE_GENERIC_HARDIRQS=y
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# IRQ subsystem
|
# IRQ subsystem
|
||||||
#
|
#
|
||||||
CONFIG_GENERIC_HARDIRQS=y
|
|
||||||
CONFIG_GENERIC_IRQ_PROBE=y
|
CONFIG_GENERIC_IRQ_PROBE=y
|
||||||
CONFIG_GENERIC_IRQ_SHOW=y
|
CONFIG_GENERIC_IRQ_SHOW=y
|
||||||
CONFIG_HARDIRQS_SW_RESEND=y
|
CONFIG_HARDIRQS_SW_RESEND=y
|
||||||
|
CONFIG_IRQ_FORCED_THREADING=y
|
||||||
CONFIG_KTIME_SCALAR=y
|
CONFIG_KTIME_SCALAR=y
|
||||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||||
@ -114,6 +113,7 @@ CONFIG_CGROUPS=y
|
|||||||
# CONFIG_BLK_CGROUP is not set
|
# CONFIG_BLK_CGROUP is not set
|
||||||
# CONFIG_CHECKPOINT_RESTORE is not set
|
# CONFIG_CHECKPOINT_RESTORE is not set
|
||||||
# CONFIG_NAMESPACES is not set
|
# CONFIG_NAMESPACES is not set
|
||||||
|
# CONFIG_UIDGID_STRICT_TYPE_CHECKS is not set
|
||||||
# CONFIG_SCHED_AUTOGROUP is not set
|
# CONFIG_SCHED_AUTOGROUP is not set
|
||||||
# CONFIG_SYSFS_DEPRECATED is not set
|
# CONFIG_SYSFS_DEPRECATED is not set
|
||||||
# CONFIG_RELAY is not set
|
# CONFIG_RELAY is not set
|
||||||
@ -162,7 +162,6 @@ CONFIG_SLUB_DEBUG=y
|
|||||||
# CONFIG_SLAB is not set
|
# CONFIG_SLAB is not set
|
||||||
CONFIG_SLUB=y
|
CONFIG_SLUB=y
|
||||||
# CONFIG_SLOB is not set
|
# CONFIG_SLOB is not set
|
||||||
CONFIG_SLUB_CPU_PARTIAL=y
|
|
||||||
# CONFIG_PROFILING is not set
|
# CONFIG_PROFILING is not set
|
||||||
CONFIG_HAVE_OPROFILE=y
|
CONFIG_HAVE_OPROFILE=y
|
||||||
# CONFIG_KPROBES is not set
|
# CONFIG_KPROBES is not set
|
||||||
@ -208,6 +207,7 @@ CONFIG_LBDAF=y
|
|||||||
CONFIG_BLK_DEV_BSG=y
|
CONFIG_BLK_DEV_BSG=y
|
||||||
CONFIG_BLK_DEV_BSGLIB=y
|
CONFIG_BLK_DEV_BSGLIB=y
|
||||||
# CONFIG_BLK_DEV_INTEGRITY is not set
|
# CONFIG_BLK_DEV_INTEGRITY is not set
|
||||||
|
# CONFIG_BLK_CMDLINE_PARSER is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Partition Types
|
# Partition Types
|
||||||
@ -232,6 +232,7 @@ CONFIG_LDM_PARTITION=y
|
|||||||
# CONFIG_KARMA_PARTITION is not set
|
# CONFIG_KARMA_PARTITION is not set
|
||||||
CONFIG_EFI_PARTITION=y
|
CONFIG_EFI_PARTITION=y
|
||||||
# CONFIG_SYSV68_PARTITION is not set
|
# CONFIG_SYSV68_PARTITION is not set
|
||||||
|
# CONFIG_CMDLINE_PARTITION is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# IO Schedulers
|
# IO Schedulers
|
||||||
@ -291,18 +292,6 @@ CONFIG_ARCH_BCM2708=y
|
|||||||
# CONFIG_GPIO_PCA953X is not set
|
# CONFIG_GPIO_PCA953X is not set
|
||||||
# CONFIG_PLAT_SPEAR is not set
|
# CONFIG_PLAT_SPEAR is not set
|
||||||
|
|
||||||
#
|
|
||||||
# ST-Ericsson AB U300/U335 Platform
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# ST-Ericsson Mobile Platform Products
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
|
||||||
# ST-Ericsson U300/U335 Feature Selections
|
|
||||||
#
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Broadcom BCM2708 Implementations
|
# Broadcom BCM2708 Implementations
|
||||||
#
|
#
|
||||||
@ -310,8 +299,8 @@ CONFIG_MACH_BCM2708=y
|
|||||||
CONFIG_BCM2708_GPIO=y
|
CONFIG_BCM2708_GPIO=y
|
||||||
CONFIG_BCM2708_VCMEM=y
|
CONFIG_BCM2708_VCMEM=y
|
||||||
# CONFIG_BCM2708_NOL2CACHE is not set
|
# CONFIG_BCM2708_NOL2CACHE is not set
|
||||||
CONFIG_BCM2708_DMAER=y
|
|
||||||
CONFIG_BCM2708_SPIDEV=y
|
CONFIG_BCM2708_SPIDEV=y
|
||||||
|
CONFIG_BCM2708_DMAER=y
|
||||||
|
|
||||||
#
|
#
|
||||||
# Processor Type
|
# Processor Type
|
||||||
@ -365,7 +354,14 @@ CONFIG_ARCH_NR_GPIO=0
|
|||||||
# CONFIG_PREEMPT_VOLUNTARY is not set
|
# CONFIG_PREEMPT_VOLUNTARY is not set
|
||||||
CONFIG_PREEMPT=y
|
CONFIG_PREEMPT=y
|
||||||
CONFIG_PREEMPT_COUNT=y
|
CONFIG_PREEMPT_COUNT=y
|
||||||
CONFIG_HZ=100
|
CONFIG_HZ_FIXED=0
|
||||||
|
# CONFIG_HZ_100 is not set
|
||||||
|
# CONFIG_HZ_200 is not set
|
||||||
|
# CONFIG_HZ_250 is not set
|
||||||
|
CONFIG_HZ_300=y
|
||||||
|
# CONFIG_HZ_500 is not set
|
||||||
|
# CONFIG_HZ_1000 is not set
|
||||||
|
CONFIG_HZ=300
|
||||||
CONFIG_SCHED_HRTICK=y
|
CONFIG_SCHED_HRTICK=y
|
||||||
CONFIG_AEABI=y
|
CONFIG_AEABI=y
|
||||||
# CONFIG_OABI_COMPAT is not set
|
# CONFIG_OABI_COMPAT is not set
|
||||||
@ -373,6 +369,7 @@ CONFIG_AEABI=y
|
|||||||
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
|
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
|
||||||
CONFIG_HAVE_ARCH_PFN_VALID=y
|
CONFIG_HAVE_ARCH_PFN_VALID=y
|
||||||
# CONFIG_HIGHMEM is not set
|
# CONFIG_HIGHMEM is not set
|
||||||
|
CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
|
||||||
CONFIG_FLATMEM=y
|
CONFIG_FLATMEM=y
|
||||||
CONFIG_FLAT_NODE_MEM_MAP=y
|
CONFIG_FLAT_NODE_MEM_MAP=y
|
||||||
CONFIG_HAVE_MEMBLOCK=y
|
CONFIG_HAVE_MEMBLOCK=y
|
||||||
@ -389,6 +386,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y
|
|||||||
CONFIG_NEED_PER_CPU_KM=y
|
CONFIG_NEED_PER_CPU_KM=y
|
||||||
CONFIG_CLEANCACHE=y
|
CONFIG_CLEANCACHE=y
|
||||||
CONFIG_FRONTSWAP=y
|
CONFIG_FRONTSWAP=y
|
||||||
|
# CONFIG_CMA is not set
|
||||||
# CONFIG_ZBUD is not set
|
# CONFIG_ZBUD is not set
|
||||||
# CONFIG_ZSWAP is not set
|
# CONFIG_ZSWAP is not set
|
||||||
CONFIG_FORCE_MAX_ZONEORDER=11
|
CONFIG_FORCE_MAX_ZONEORDER=11
|
||||||
@ -439,15 +437,20 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
|
|||||||
#
|
#
|
||||||
# ARM CPU frequency scaling drivers
|
# ARM CPU frequency scaling drivers
|
||||||
#
|
#
|
||||||
# CONFIG_ARM_EXYNOS4210_CPUFREQ is not set
|
|
||||||
# CONFIG_ARM_EXYNOS4X12_CPUFREQ is not set
|
|
||||||
# CONFIG_ARM_EXYNOS5250_CPUFREQ is not set
|
|
||||||
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
|
# CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
|
||||||
CONFIG_ARM_BCM2835_CPUFREQ=y
|
CONFIG_ARM_BCM2835_CPUFREQ=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# CPU Idle
|
||||||
|
#
|
||||||
CONFIG_CPU_IDLE=y
|
CONFIG_CPU_IDLE=y
|
||||||
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
|
# CONFIG_CPU_IDLE_MULTIPLE_DRIVERS is not set
|
||||||
CONFIG_CPU_IDLE_GOV_LADDER=y
|
CONFIG_CPU_IDLE_GOV_LADDER=y
|
||||||
CONFIG_CPU_IDLE_GOV_MENU=y
|
CONFIG_CPU_IDLE_GOV_MENU=y
|
||||||
|
|
||||||
|
#
|
||||||
|
# ARM CPU Idle Drivers
|
||||||
|
#
|
||||||
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
|
# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -501,7 +504,6 @@ CONFIG_NET_IP_TUNNEL=m
|
|||||||
CONFIG_IP_MROUTE=y
|
CONFIG_IP_MROUTE=y
|
||||||
CONFIG_IP_PIMSM_V1=y
|
CONFIG_IP_PIMSM_V1=y
|
||||||
CONFIG_IP_PIMSM_V2=y
|
CONFIG_IP_PIMSM_V2=y
|
||||||
# CONFIG_ARPD is not set
|
|
||||||
# CONFIG_SYN_COOKIES is not set
|
# CONFIG_SYN_COOKIES is not set
|
||||||
# CONFIG_INET_AH is not set
|
# CONFIG_INET_AH is not set
|
||||||
# CONFIG_INET_ESP is not set
|
# CONFIG_INET_ESP is not set
|
||||||
@ -737,7 +739,6 @@ CONFIG_FW_LOADER_USER_HELPER=y
|
|||||||
# CONFIG_SYS_HYPERVISOR is not set
|
# CONFIG_SYS_HYPERVISOR is not set
|
||||||
# CONFIG_GENERIC_CPU_DEVICES is not set
|
# CONFIG_GENERIC_CPU_DEVICES is not set
|
||||||
CONFIG_DMA_SHARED_BUFFER=y
|
CONFIG_DMA_SHARED_BUFFER=y
|
||||||
# CONFIG_CMA is not set
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Bus devices
|
# Bus devices
|
||||||
@ -941,6 +942,7 @@ CONFIG_USB_NET_CDCETHER=m
|
|||||||
# CONFIG_USB_NET_CDC_NCM is not set
|
# CONFIG_USB_NET_CDC_NCM is not set
|
||||||
# CONFIG_USB_NET_CDC_MBIM is not set
|
# CONFIG_USB_NET_CDC_MBIM is not set
|
||||||
CONFIG_USB_NET_DM9601=m
|
CONFIG_USB_NET_DM9601=m
|
||||||
|
# CONFIG_USB_NET_SR9700 is not set
|
||||||
CONFIG_USB_NET_SMSC75XX=m
|
CONFIG_USB_NET_SMSC75XX=m
|
||||||
CONFIG_USB_NET_SMSC95XX=y
|
CONFIG_USB_NET_SMSC95XX=y
|
||||||
# CONFIG_USB_NET_GL620A is not set
|
# CONFIG_USB_NET_GL620A is not set
|
||||||
@ -1015,6 +1017,7 @@ CONFIG_RT73USB=m
|
|||||||
CONFIG_RT2800USB=m
|
CONFIG_RT2800USB=m
|
||||||
CONFIG_RT2800USB_RT33XX=y
|
CONFIG_RT2800USB_RT33XX=y
|
||||||
CONFIG_RT2800USB_RT35XX=y
|
CONFIG_RT2800USB_RT35XX=y
|
||||||
|
CONFIG_RT2800USB_RT3573=y
|
||||||
CONFIG_RT2800USB_RT53XX=y
|
CONFIG_RT2800USB_RT53XX=y
|
||||||
CONFIG_RT2800USB_RT55XX=y
|
CONFIG_RT2800USB_RT55XX=y
|
||||||
CONFIG_RT2800USB_UNKNOWN=y
|
CONFIG_RT2800USB_UNKNOWN=y
|
||||||
@ -1156,6 +1159,7 @@ CONFIG_SERIAL_CORE_CONSOLE=y
|
|||||||
# CONFIG_SERIAL_IFX6X60 is not set
|
# CONFIG_SERIAL_IFX6X60 is not set
|
||||||
# CONFIG_SERIAL_ARC is not set
|
# CONFIG_SERIAL_ARC is not set
|
||||||
# CONFIG_SERIAL_FSL_LPUART is not set
|
# CONFIG_SERIAL_FSL_LPUART is not set
|
||||||
|
# CONFIG_SERIAL_ST_ASC is not set
|
||||||
# CONFIG_TTY_PRINTK is not set
|
# CONFIG_TTY_PRINTK is not set
|
||||||
# CONFIG_HVC_DCC is not set
|
# CONFIG_HVC_DCC is not set
|
||||||
# CONFIG_IPMI_HANDLER is not set
|
# CONFIG_IPMI_HANDLER is not set
|
||||||
@ -1221,6 +1225,7 @@ CONFIG_SPI_MASTER=y
|
|||||||
CONFIG_SPI_BCM2708=y
|
CONFIG_SPI_BCM2708=y
|
||||||
# CONFIG_SPI_BITBANG is not set
|
# CONFIG_SPI_BITBANG is not set
|
||||||
# CONFIG_SPI_GPIO is not set
|
# CONFIG_SPI_GPIO is not set
|
||||||
|
# CONFIG_SPI_FSL_DSPI is not set
|
||||||
# CONFIG_SPI_OC_TINY is not set
|
# CONFIG_SPI_OC_TINY is not set
|
||||||
# CONFIG_SPI_PL022 is not set
|
# CONFIG_SPI_PL022 is not set
|
||||||
# CONFIG_SPI_PXA2XX_PCI is not set
|
# CONFIG_SPI_PXA2XX_PCI is not set
|
||||||
@ -1294,6 +1299,10 @@ CONFIG_GPIO_SYSFS=y
|
|||||||
# AC97 GPIO expanders:
|
# AC97 GPIO expanders:
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# LPC GPIO expanders:
|
||||||
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# MODULbus GPIO expanders:
|
# MODULbus GPIO expanders:
|
||||||
#
|
#
|
||||||
@ -1317,8 +1326,8 @@ CONFIG_POWER_SUPPLY=y
|
|||||||
# CONFIG_CHARGER_LP8727 is not set
|
# CONFIG_CHARGER_LP8727 is not set
|
||||||
# CONFIG_CHARGER_GPIO is not set
|
# CONFIG_CHARGER_GPIO is not set
|
||||||
# CONFIG_CHARGER_BQ2415X is not set
|
# CONFIG_CHARGER_BQ2415X is not set
|
||||||
|
# CONFIG_CHARGER_BQ24190 is not set
|
||||||
# CONFIG_CHARGER_SMB347 is not set
|
# CONFIG_CHARGER_SMB347 is not set
|
||||||
# CONFIG_BATTERY_GOLDFISH is not set
|
|
||||||
# CONFIG_POWER_RESET is not set
|
# CONFIG_POWER_RESET is not set
|
||||||
CONFIG_POWER_RESET_RESTART=y
|
CONFIG_POWER_RESET_RESTART=y
|
||||||
# CONFIG_POWER_AVS is not set
|
# CONFIG_POWER_AVS is not set
|
||||||
@ -1358,6 +1367,7 @@ CONFIG_HWMON=y
|
|||||||
# CONFIG_SENSORS_GL520SM is not set
|
# CONFIG_SENSORS_GL520SM is not set
|
||||||
# CONFIG_SENSORS_GPIO_FAN is not set
|
# CONFIG_SENSORS_GPIO_FAN is not set
|
||||||
# CONFIG_SENSORS_HIH6130 is not set
|
# CONFIG_SENSORS_HIH6130 is not set
|
||||||
|
# CONFIG_SENSORS_HTU21 is not set
|
||||||
# CONFIG_SENSORS_IT87 is not set
|
# CONFIG_SENSORS_IT87 is not set
|
||||||
# CONFIG_SENSORS_JC42 is not set
|
# CONFIG_SENSORS_JC42 is not set
|
||||||
# CONFIG_SENSORS_LINEAGE is not set
|
# CONFIG_SENSORS_LINEAGE is not set
|
||||||
@ -1476,6 +1486,7 @@ CONFIG_BCMA_POSSIBLE=y
|
|||||||
# CONFIG_MFD_DA9052_SPI is not set
|
# CONFIG_MFD_DA9052_SPI is not set
|
||||||
# CONFIG_MFD_DA9052_I2C is not set
|
# CONFIG_MFD_DA9052_I2C is not set
|
||||||
# CONFIG_MFD_DA9055 is not set
|
# CONFIG_MFD_DA9055 is not set
|
||||||
|
# CONFIG_MFD_DA9063 is not set
|
||||||
# CONFIG_MFD_MC13XXX_SPI is not set
|
# CONFIG_MFD_MC13XXX_SPI is not set
|
||||||
# CONFIG_MFD_MC13XXX_I2C is not set
|
# CONFIG_MFD_MC13XXX_I2C is not set
|
||||||
# CONFIG_HTC_EGPIO is not set
|
# CONFIG_HTC_EGPIO is not set
|
||||||
@ -1599,7 +1610,7 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
|
|||||||
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
|
# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
|
||||||
# CONFIG_VIDEO_HDPVR is not set
|
# CONFIG_VIDEO_HDPVR is not set
|
||||||
# CONFIG_VIDEO_USBVISION is not set
|
# CONFIG_VIDEO_USBVISION is not set
|
||||||
# CONFIG_VIDEO_STK1160 is not set
|
# CONFIG_VIDEO_STK1160_COMMON is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# Analog/digital TV USB devices
|
# Analog/digital TV USB devices
|
||||||
@ -1681,7 +1692,6 @@ CONFIG_CYPRESS_FIRMWARE=m
|
|||||||
CONFIG_DVB_B2C2_FLEXCOP=m
|
CONFIG_DVB_B2C2_FLEXCOP=m
|
||||||
CONFIG_SMS_SIANO_MDTV=m
|
CONFIG_SMS_SIANO_MDTV=m
|
||||||
CONFIG_SMS_SIANO_RC=y
|
CONFIG_SMS_SIANO_RC=y
|
||||||
# CONFIG_SMS_SIANO_DEBUGFS is not set
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Media ancillary drivers (tuners, sensors, i2c, frontends)
|
# Media ancillary drivers (tuners, sensors, i2c, frontends)
|
||||||
@ -1914,6 +1924,7 @@ CONFIG_FB_BCM2708=y
|
|||||||
# CONFIG_FB_METRONOME is not set
|
# CONFIG_FB_METRONOME is not set
|
||||||
# CONFIG_FB_BROADSHEET is not set
|
# CONFIG_FB_BROADSHEET is not set
|
||||||
# CONFIG_FB_AUO_K190X is not set
|
# CONFIG_FB_AUO_K190X is not set
|
||||||
|
# CONFIG_FB_SIMPLE is not set
|
||||||
# CONFIG_EXYNOS_VIDEO is not set
|
# CONFIG_EXYNOS_VIDEO is not set
|
||||||
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
|
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
|
||||||
|
|
||||||
@ -1997,6 +2008,7 @@ CONFIG_HID_TOPSEED=y
|
|||||||
# CONFIG_HID_THRUSTMASTER is not set
|
# CONFIG_HID_THRUSTMASTER is not set
|
||||||
# CONFIG_HID_WACOM is not set
|
# CONFIG_HID_WACOM is not set
|
||||||
CONFIG_HID_WIIMOTE=m
|
CONFIG_HID_WIIMOTE=m
|
||||||
|
# CONFIG_HID_XINMO is not set
|
||||||
# CONFIG_HID_ZEROPLUS is not set
|
# CONFIG_HID_ZEROPLUS is not set
|
||||||
CONFIG_HID_ZYDACRON=y
|
CONFIG_HID_ZYDACRON=y
|
||||||
# CONFIG_HID_SENSOR_HUB is not set
|
# CONFIG_HID_SENSOR_HUB is not set
|
||||||
@ -2012,6 +2024,7 @@ CONFIG_USB_HIDDEV=y
|
|||||||
# I2C HID support
|
# I2C HID support
|
||||||
#
|
#
|
||||||
# CONFIG_I2C_HID is not set
|
# CONFIG_I2C_HID is not set
|
||||||
|
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
|
||||||
CONFIG_USB_SUPPORT=y
|
CONFIG_USB_SUPPORT=y
|
||||||
CONFIG_USB_COMMON=y
|
CONFIG_USB_COMMON=y
|
||||||
CONFIG_USB_ARCH_HAS_HCD=y
|
CONFIG_USB_ARCH_HAS_HCD=y
|
||||||
@ -2040,11 +2053,13 @@ CONFIG_USB_MON=m
|
|||||||
# CONFIG_USB_ISP1760_HCD is not set
|
# CONFIG_USB_ISP1760_HCD is not set
|
||||||
# CONFIG_USB_ISP1362_HCD is not set
|
# CONFIG_USB_ISP1362_HCD is not set
|
||||||
# CONFIG_USB_FUSBH200_HCD is not set
|
# CONFIG_USB_FUSBH200_HCD is not set
|
||||||
|
# CONFIG_USB_FOTG210_HCD is not set
|
||||||
# CONFIG_USB_OHCI_HCD is not set
|
# CONFIG_USB_OHCI_HCD is not set
|
||||||
# CONFIG_USB_SL811_HCD is not set
|
# CONFIG_USB_SL811_HCD is not set
|
||||||
# CONFIG_USB_R8A66597_HCD is not set
|
# CONFIG_USB_R8A66597_HCD is not set
|
||||||
CONFIG_USB_DWCOTG=y
|
CONFIG_USB_DWCOTG=y
|
||||||
# CONFIG_USB_HCD_SSB is not set
|
# CONFIG_USB_HCD_SSB is not set
|
||||||
|
# CONFIG_USB_HCD_TEST_MODE is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# USB Device Class drivers
|
# USB Device Class drivers
|
||||||
@ -2083,13 +2098,13 @@ CONFIG_USB_STORAGE=y
|
|||||||
# CONFIG_USB_MDC800 is not set
|
# CONFIG_USB_MDC800 is not set
|
||||||
# CONFIG_USB_MICROTEK is not set
|
# CONFIG_USB_MICROTEK is not set
|
||||||
# CONFIG_USB_DWC3 is not set
|
# CONFIG_USB_DWC3 is not set
|
||||||
# CONFIG_USB_CHIPIDEA is not set
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# USB port drivers
|
# USB port drivers
|
||||||
#
|
#
|
||||||
CONFIG_USB_SERIAL=m
|
CONFIG_USB_SERIAL=m
|
||||||
CONFIG_USB_SERIAL_GENERIC=y
|
CONFIG_USB_SERIAL_GENERIC=y
|
||||||
|
# CONFIG_USB_SERIAL_SIMPLE is not set
|
||||||
# CONFIG_USB_SERIAL_AIRCABLE is not set
|
# CONFIG_USB_SERIAL_AIRCABLE is not set
|
||||||
# CONFIG_USB_SERIAL_ARK3116 is not set
|
# CONFIG_USB_SERIAL_ARK3116 is not set
|
||||||
# CONFIG_USB_SERIAL_BELKIN is not set
|
# CONFIG_USB_SERIAL_BELKIN is not set
|
||||||
@ -2100,7 +2115,6 @@ CONFIG_USB_SERIAL_CP210X=m
|
|||||||
# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
|
# CONFIG_USB_SERIAL_CYPRESS_M8 is not set
|
||||||
# CONFIG_USB_SERIAL_EMPEG is not set
|
# CONFIG_USB_SERIAL_EMPEG is not set
|
||||||
CONFIG_USB_SERIAL_FTDI_SIO=m
|
CONFIG_USB_SERIAL_FTDI_SIO=m
|
||||||
# CONFIG_USB_SERIAL_FUNSOFT is not set
|
|
||||||
# CONFIG_USB_SERIAL_VISOR is not set
|
# CONFIG_USB_SERIAL_VISOR is not set
|
||||||
# CONFIG_USB_SERIAL_IPAQ is not set
|
# CONFIG_USB_SERIAL_IPAQ is not set
|
||||||
# CONFIG_USB_SERIAL_IR is not set
|
# CONFIG_USB_SERIAL_IR is not set
|
||||||
@ -2118,16 +2132,13 @@ CONFIG_USB_SERIAL_IUU=m
|
|||||||
# CONFIG_USB_SERIAL_METRO is not set
|
# CONFIG_USB_SERIAL_METRO is not set
|
||||||
# CONFIG_USB_SERIAL_MOS7720 is not set
|
# CONFIG_USB_SERIAL_MOS7720 is not set
|
||||||
# CONFIG_USB_SERIAL_MOS7840 is not set
|
# CONFIG_USB_SERIAL_MOS7840 is not set
|
||||||
# CONFIG_USB_SERIAL_MOTOROLA is not set
|
|
||||||
# CONFIG_USB_SERIAL_NAVMAN is not set
|
# CONFIG_USB_SERIAL_NAVMAN is not set
|
||||||
CONFIG_USB_SERIAL_PL2303=m
|
CONFIG_USB_SERIAL_PL2303=m
|
||||||
# CONFIG_USB_SERIAL_OTI6858 is not set
|
# CONFIG_USB_SERIAL_OTI6858 is not set
|
||||||
# CONFIG_USB_SERIAL_QCAUX is not set
|
# CONFIG_USB_SERIAL_QCAUX is not set
|
||||||
# CONFIG_USB_SERIAL_QUALCOMM is not set
|
# CONFIG_USB_SERIAL_QUALCOMM is not set
|
||||||
# CONFIG_USB_SERIAL_SPCP8X5 is not set
|
# CONFIG_USB_SERIAL_SPCP8X5 is not set
|
||||||
# CONFIG_USB_SERIAL_HP4X is not set
|
|
||||||
# CONFIG_USB_SERIAL_SAFE is not set
|
# CONFIG_USB_SERIAL_SAFE is not set
|
||||||
# CONFIG_USB_SERIAL_SIEMENS_MPI is not set
|
|
||||||
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
|
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set
|
||||||
# CONFIG_USB_SERIAL_SYMBOL is not set
|
# CONFIG_USB_SERIAL_SYMBOL is not set
|
||||||
# CONFIG_USB_SERIAL_TI is not set
|
# CONFIG_USB_SERIAL_TI is not set
|
||||||
@ -2136,15 +2147,11 @@ CONFIG_USB_SERIAL_PL2303=m
|
|||||||
# CONFIG_USB_SERIAL_OPTION is not set
|
# CONFIG_USB_SERIAL_OPTION is not set
|
||||||
# CONFIG_USB_SERIAL_OMNINET is not set
|
# CONFIG_USB_SERIAL_OMNINET is not set
|
||||||
# CONFIG_USB_SERIAL_OPTICON is not set
|
# CONFIG_USB_SERIAL_OPTICON is not set
|
||||||
# CONFIG_USB_SERIAL_VIVOPAY_SERIAL is not set
|
|
||||||
# CONFIG_USB_SERIAL_XSENS_MT is not set
|
# CONFIG_USB_SERIAL_XSENS_MT is not set
|
||||||
# CONFIG_USB_SERIAL_ZIO is not set
|
|
||||||
# CONFIG_USB_SERIAL_WISHBONE is not set
|
# CONFIG_USB_SERIAL_WISHBONE is not set
|
||||||
# CONFIG_USB_SERIAL_ZTE is not set
|
# CONFIG_USB_SERIAL_ZTE is not set
|
||||||
# CONFIG_USB_SERIAL_SSU100 is not set
|
# CONFIG_USB_SERIAL_SSU100 is not set
|
||||||
# CONFIG_USB_SERIAL_QT2 is not set
|
# CONFIG_USB_SERIAL_QT2 is not set
|
||||||
# CONFIG_USB_SERIAL_FLASHLOADER is not set
|
|
||||||
# CONFIG_USB_SERIAL_SUUNTO is not set
|
|
||||||
# CONFIG_USB_SERIAL_DEBUG is not set
|
# CONFIG_USB_SERIAL_DEBUG is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -2167,11 +2174,24 @@ CONFIG_USB_SERIAL_PL2303=m
|
|||||||
# CONFIG_USB_TRANCEVIBRATOR is not set
|
# CONFIG_USB_TRANCEVIBRATOR is not set
|
||||||
# CONFIG_USB_IOWARRIOR is not set
|
# CONFIG_USB_IOWARRIOR is not set
|
||||||
# CONFIG_USB_TEST is not set
|
# CONFIG_USB_TEST is not set
|
||||||
|
# CONFIG_USB_EHSET_TEST_FIXTURE is not set
|
||||||
# CONFIG_USB_ISIGHTFW is not set
|
# CONFIG_USB_ISIGHTFW is not set
|
||||||
# CONFIG_USB_YUREX is not set
|
# CONFIG_USB_YUREX is not set
|
||||||
# CONFIG_USB_EZUSB_FX2 is not set
|
# CONFIG_USB_EZUSB_FX2 is not set
|
||||||
# CONFIG_USB_HSIC_USB3503 is not set
|
# CONFIG_USB_HSIC_USB3503 is not set
|
||||||
|
|
||||||
|
#
|
||||||
|
# USB Physical Layer drivers
|
||||||
|
#
|
||||||
# CONFIG_USB_PHY is not set
|
# CONFIG_USB_PHY is not set
|
||||||
|
# CONFIG_NOP_USB_XCEIV is not set
|
||||||
|
# CONFIG_AM335X_PHY_USB is not set
|
||||||
|
# CONFIG_SAMSUNG_USB2PHY is not set
|
||||||
|
# CONFIG_SAMSUNG_USB3PHY is not set
|
||||||
|
# CONFIG_USB_GPIO_VBUS is not set
|
||||||
|
# CONFIG_USB_ISP1301 is not set
|
||||||
|
# CONFIG_USB_RCAR_PHY is not set
|
||||||
|
# CONFIG_USB_ULPI is not set
|
||||||
# CONFIG_USB_GADGET is not set
|
# CONFIG_USB_GADGET is not set
|
||||||
CONFIG_MMC=y
|
CONFIG_MMC=y
|
||||||
# CONFIG_MMC_DEBUG is not set
|
# CONFIG_MMC_DEBUG is not set
|
||||||
@ -2217,12 +2237,12 @@ CONFIG_LEDS_GPIO=y
|
|||||||
# CONFIG_LEDS_LP5521 is not set
|
# CONFIG_LEDS_LP5521 is not set
|
||||||
# CONFIG_LEDS_LP5523 is not set
|
# CONFIG_LEDS_LP5523 is not set
|
||||||
# CONFIG_LEDS_LP5562 is not set
|
# CONFIG_LEDS_LP5562 is not set
|
||||||
|
# CONFIG_LEDS_LP8501 is not set
|
||||||
# CONFIG_LEDS_PCA955X is not set
|
# CONFIG_LEDS_PCA955X is not set
|
||||||
# CONFIG_LEDS_PCA9633 is not set
|
# CONFIG_LEDS_PCA963X is not set
|
||||||
# CONFIG_LEDS_DAC124S085 is not set
|
# CONFIG_LEDS_DAC124S085 is not set
|
||||||
# CONFIG_LEDS_BD2802 is not set
|
# CONFIG_LEDS_BD2802 is not set
|
||||||
# CONFIG_LEDS_LT3593 is not set
|
# CONFIG_LEDS_LT3593 is not set
|
||||||
# CONFIG_LEDS_RENESAS_TPU is not set
|
|
||||||
# CONFIG_LEDS_TCA6507 is not set
|
# CONFIG_LEDS_TCA6507 is not set
|
||||||
# CONFIG_LEDS_LM355x is not set
|
# CONFIG_LEDS_LM355x is not set
|
||||||
# CONFIG_LEDS_OT200 is not set
|
# CONFIG_LEDS_OT200 is not set
|
||||||
@ -2325,6 +2345,7 @@ CONFIG_RTC_DRV_DS1307=y
|
|||||||
#
|
#
|
||||||
# CONFIG_RTC_DRV_PL030 is not set
|
# CONFIG_RTC_DRV_PL030 is not set
|
||||||
# CONFIG_RTC_DRV_PL031 is not set
|
# CONFIG_RTC_DRV_PL031 is not set
|
||||||
|
# CONFIG_RTC_DRV_MOXART is not set
|
||||||
|
|
||||||
#
|
#
|
||||||
# HID Sensor RTC drivers
|
# HID Sensor RTC drivers
|
||||||
@ -2349,9 +2370,9 @@ CONFIG_STAGING=y
|
|||||||
# CONFIG_PRISM2_USB is not set
|
# CONFIG_PRISM2_USB is not set
|
||||||
# CONFIG_ECHO is not set
|
# CONFIG_ECHO is not set
|
||||||
# CONFIG_COMEDI is not set
|
# CONFIG_COMEDI is not set
|
||||||
# CONFIG_ASUS_OLED is not set
|
|
||||||
# CONFIG_RTLLIB is not set
|
# CONFIG_RTLLIB is not set
|
||||||
CONFIG_R8712U=m
|
CONFIG_R8712U=m
|
||||||
|
# CONFIG_R8188EU is not set
|
||||||
CONFIG_RTS5139=m
|
CONFIG_RTS5139=m
|
||||||
# CONFIG_RTS5139_DEBUG is not set
|
# CONFIG_RTS5139_DEBUG is not set
|
||||||
# CONFIG_TRANZPORT is not set
|
# CONFIG_TRANZPORT is not set
|
||||||
@ -2372,6 +2393,7 @@ CONFIG_ZRAM=y
|
|||||||
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
|
# CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4 is not set
|
||||||
CONFIG_STAGING_MEDIA=y
|
CONFIG_STAGING_MEDIA=y
|
||||||
CONFIG_DVB_AS102=m
|
CONFIG_DVB_AS102=m
|
||||||
|
# CONFIG_USB_MSI3101 is not set
|
||||||
CONFIG_LIRC_STAGING=y
|
CONFIG_LIRC_STAGING=y
|
||||||
CONFIG_LIRC_IGORPLUGUSB=m
|
CONFIG_LIRC_IGORPLUGUSB=m
|
||||||
# CONFIG_LIRC_IMON is not set
|
# CONFIG_LIRC_IMON is not set
|
||||||
@ -2388,11 +2410,13 @@ CONFIG_LIRC_XBOX=m
|
|||||||
# CONFIG_ANDROID is not set
|
# CONFIG_ANDROID is not set
|
||||||
# CONFIG_USB_WPAN_HCD is not set
|
# CONFIG_USB_WPAN_HCD is not set
|
||||||
# CONFIG_WIMAX_GDM72XX is not set
|
# CONFIG_WIMAX_GDM72XX is not set
|
||||||
|
# CONFIG_LTE_GDM724X is not set
|
||||||
# CONFIG_CED1401 is not set
|
# CONFIG_CED1401 is not set
|
||||||
# CONFIG_DGRP is not set
|
# CONFIG_DGRP is not set
|
||||||
CONFIG_ZCACHE=y
|
# CONFIG_USB_DWC2 is not set
|
||||||
# CONFIG_ZCACHE_DEBUG is not set
|
# CONFIG_LUSTRE_FS is not set
|
||||||
# CONFIG_USB_BTMTK is not set
|
# CONFIG_USB_BTMTK is not set
|
||||||
|
# CONFIG_DGAP is not set
|
||||||
CONFIG_CLKDEV_LOOKUP=y
|
CONFIG_CLKDEV_LOOKUP=y
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -2453,6 +2477,7 @@ CONFIG_BTRFS_FS=y
|
|||||||
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
|
||||||
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
|
# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
|
||||||
# CONFIG_BTRFS_DEBUG is not set
|
# CONFIG_BTRFS_DEBUG is not set
|
||||||
|
# CONFIG_BTRFS_ASSERT is not set
|
||||||
# CONFIG_NILFS2_FS is not set
|
# CONFIG_NILFS2_FS is not set
|
||||||
CONFIG_FS_POSIX_ACL=y
|
CONFIG_FS_POSIX_ACL=y
|
||||||
CONFIG_EXPORTFS=y
|
CONFIG_EXPORTFS=y
|
||||||
@ -2510,6 +2535,7 @@ CONFIG_MISC_FILESYSTEMS=y
|
|||||||
# CONFIG_ECRYPT_FS is not set
|
# CONFIG_ECRYPT_FS is not set
|
||||||
CONFIG_HFS_FS=y
|
CONFIG_HFS_FS=y
|
||||||
CONFIG_HFSPLUS_FS=y
|
CONFIG_HFSPLUS_FS=y
|
||||||
|
# CONFIG_HFSPLUS_FS_POSIX_ACL is not set
|
||||||
# CONFIG_BEFS_FS is not set
|
# CONFIG_BEFS_FS is not set
|
||||||
# CONFIG_BFS_FS is not set
|
# CONFIG_BFS_FS is not set
|
||||||
# CONFIG_EFS_FS is not set
|
# CONFIG_EFS_FS is not set
|
||||||
@ -2746,6 +2772,8 @@ CONFIG_HAVE_ARCH_KGDB=y
|
|||||||
# CONFIG_DEBUG_USER is not set
|
# CONFIG_DEBUG_USER is not set
|
||||||
# CONFIG_DEBUG_LL is not set
|
# CONFIG_DEBUG_LL is not set
|
||||||
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
|
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
|
||||||
|
# CONFIG_DEBUG_UART_PL01X is not set
|
||||||
|
# CONFIG_DEBUG_UART_8250 is not set
|
||||||
CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
|
CONFIG_UNCOMPRESS_INCLUDE="mach/uncompress.h"
|
||||||
# CONFIG_OC_ETM is not set
|
# CONFIG_OC_ETM is not set
|
||||||
# CONFIG_PID_IN_CONTEXTIDR is not set
|
# CONFIG_PID_IN_CONTEXTIDR is not set
|
||||||
@ -2818,6 +2846,7 @@ CONFIG_CRYPTO_HMAC=y
|
|||||||
#
|
#
|
||||||
CONFIG_CRYPTO_CRC32C=y
|
CONFIG_CRYPTO_CRC32C=y
|
||||||
# CONFIG_CRYPTO_CRC32 is not set
|
# CONFIG_CRYPTO_CRC32 is not set
|
||||||
|
# CONFIG_CRYPTO_CRCT10DIF is not set
|
||||||
# CONFIG_CRYPTO_GHASH is not set
|
# CONFIG_CRYPTO_GHASH is not set
|
||||||
CONFIG_CRYPTO_MD4=y
|
CONFIG_CRYPTO_MD4=y
|
||||||
CONFIG_CRYPTO_MD5=y
|
CONFIG_CRYPTO_MD5=y
|
||||||
|
|||||||
@ -111,7 +111,7 @@
|
|||||||
|
|
||||||
# Kernel to use. values can be:
|
# Kernel to use. values can be:
|
||||||
# default: default mainline kernel
|
# default: default mainline kernel
|
||||||
LINUX="3.11"
|
LINUX="default"
|
||||||
|
|
||||||
# use linux-next (latest rc) instead latest released version
|
# use linux-next (latest rc) instead latest released version
|
||||||
LINUX_NEXT="no"
|
LINUX_NEXT="no"
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user