jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-28 13:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #902 from vpeter4/imx6-3.14-bump

Browse Source 
imx6: bump linux to 3.14.79
This commit is contained in:
Christian Hewitt 2016-11-02 16:06:18 +04:00 committed by GitHub
commit 4b529fc0e8
2 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/linux/package.mk
View File

@ -41,7 +41,7 @@ case "$LINUX" in
;; ;;
imx6) imx6)
PKG_VERSION="3.14-mx6-sr" PKG_VERSION="3.14-mx6-sr"
PKG_COMMIT="4386797" PKG_COMMIT="27e61f6"
PKG_SOURCE_DIR="$PKG_NAME-$PKG_VERSION-$PKG_COMMIT" PKG_SOURCE_DIR="$PKG_NAME-$PKG_VERSION-$PKG_COMMIT"
PKG_SOURCE_NAME="$PKG_SOURCE_DIR.tar.xz" PKG_SOURCE_NAME="$PKG_SOURCE_DIR.tar.xz"
PKG_URL="$DISTRO_SRC/$PKG_SOURCE_NAME" PKG_URL="$DISTRO_SRC/$PKG_SOURCE_NAME"

51
projects/imx6/patches/linux/3.14-mx6-sr/linux-061-valve-xpad-rework.patch
View File

@ -1,7 +1,6 @@
diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/input/joystick/xpad.c --- a/drivers/input/joystick/xpad.c 2016-11-02 11:32:23.105562200 +0100
--- linux-3.15.6.orig/drivers/input/joystick/xpad.c 2014-08-01 20:37:09.039708016 -0700 +++ b/drivers/input/joystick/xpad.c 2016-11-02 11:33:00.065676100 +0100
+++ linux-3.15.6/drivers/input/joystick/xpad.c 2014-08-01 19:44:20.521111000 -0700 @@ -281,17 +281,21 @@ struct usb_xpad {
@@ -281,17 +281,21 @@
struct urb *irq_out; /* urb for interrupt out report */ struct urb *irq_out; /* urb for interrupt out report */
unsigned char *odata; /* output data */ unsigned char *odata; /* output data */
dma_addr_t odata_dma; dma_addr_t odata_dma;
@ -24,7 +23,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
}; };
/* /*
@@ -435,6 +439,109 @@ @@ -435,6 +439,109 @@ static void xpad360_process_packet(struc
input_sync(dev); input_sync(dev);
} }
@ -134,7 +133,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
/* /*
* xpad360w_process_packet * xpad360w_process_packet
@@ -456,11 +563,35 @@ @@ -456,11 +563,35 @@ static void xpad360w_process_packet(stru
/* Presence change */ /* Presence change */
if (data[0] & 0x08) { if (data[0] & 0x08) {
if (data[1] & 0x80) { if (data[1] & 0x80) {
@ -174,7 +173,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
/* Valid pad data */ /* Valid pad data */
if (!(data[1] & 0x1)) if (!(data[1] & 0x1))
@@ -476,6 +607,8 @@ @@ -476,6 +607,8 @@ static void xpad_irq_in(struct urb *urb)
int retval, status; int retval, status;
status = urb->status; status = urb->status;
@ -183,7 +182,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
switch (status) { switch (status) {
case 0: case 0:
@@ -584,8 +717,6 @@ @@ -584,8 +717,6 @@ static int xpad_init_output(struct usb_i
goto fail1; goto fail1;
} }
@ -192,7 +191,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
xpad->irq_out = usb_alloc_urb(0, GFP_KERNEL); xpad->irq_out = usb_alloc_urb(0, GFP_KERNEL);
if (!xpad->irq_out) { if (!xpad->irq_out) {
error = -ENOMEM; error = -ENOMEM;
@@ -714,15 +845,38 @@ @@ -714,15 +845,38 @@ struct xpad_led {
static void xpad_send_led_command(struct usb_xpad *xpad, int command) static void xpad_send_led_command(struct usb_xpad *xpad, int command)
{ {
@ -239,7 +238,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
} }
static void xpad_led_set(struct led_classdev *led_cdev, static void xpad_led_set(struct led_classdev *led_cdev,
@@ -741,8 +895,10 @@ @@ -741,8 +895,10 @@ static int xpad_led_probe(struct usb_xpa
struct xpad_led *led; struct xpad_led *led;
struct led_classdev *led_cdev; struct led_classdev *led_cdev;
int error; int error;
@ -251,7 +250,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
return 0; return 0;
xpad->led = led = kzalloc(sizeof(struct xpad_led), GFP_KERNEL); xpad->led = led = kzalloc(sizeof(struct xpad_led), GFP_KERNEL);
@@ -765,11 +921,6 @@ @@ -765,11 +921,6 @@ static int xpad_led_probe(struct usb_xpa
return error; return error;
} }
@ -263,7 +262,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
return 0; return 0;
} }
@@ -791,6 +942,7 @@ @@ -791,6 +942,7 @@ static void xpad_led_disconnect(struct u
static int xpad_open(struct input_dev *dev) static int xpad_open(struct input_dev *dev)
{ {
struct usb_xpad *xpad = input_get_drvdata(dev); struct usb_xpad *xpad = input_get_drvdata(dev);
@ -271,26 +270,20 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
/* URB was submitted in probe */ /* URB was submitted in probe */
if (xpad->xtype == XTYPE_XBOX360W) if (xpad->xtype == XTYPE_XBOX360W)
@@ -839,23 +991,24 @@ @@ -846,19 +998,20 @@ static int xpad_probe(struct usb_interfa
{ if (intf->cur_altsetting->desc.bNumEndpoints != 2)
struct usb_device *udev = interface_to_usbdev(intf); return -ENODEV;
struct usb_xpad *xpad;
- struct input_dev *input_dev;
struct usb_endpoint_descriptor *ep_irq_in;
int i, error;
+ struct input_dev *input_dev;
+
+ if (!my_wq) { + if (!my_wq) {
+ my_wq = create_workqueue("xpad_queue"); + my_wq = create_workqueue("xpad_queue");
+ } + }
+
for (i = 0; xpad_device[i].idVendor; i++) { for (i = 0; xpad_device[i].idVendor; i++) {
if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) && if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) &&
(le16_to_cpu(udev->descriptor.idProduct) == xpad_device[i].idProduct)) (le16_to_cpu(udev->descriptor.idProduct) == xpad_device[i].idProduct))
break; break;
} }
-
+
xpad = kzalloc(sizeof(struct usb_xpad), GFP_KERNEL); xpad = kzalloc(sizeof(struct usb_xpad), GFP_KERNEL);
- input_dev = input_allocate_device(); - input_dev = input_allocate_device();
- if (!xpad || !input_dev) { - if (!xpad || !input_dev) {
@ -303,7 +296,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
xpad->idata = usb_alloc_coherent(udev, XPAD_PKT_LEN, xpad->idata = usb_alloc_coherent(udev, XPAD_PKT_LEN,
GFP_KERNEL, &xpad->idata_dma); GFP_KERNEL, &xpad->idata_dma);
if (!xpad->idata) { if (!xpad->idata) {
@@ -891,65 +1044,12 @@ @@ -894,65 +1047,12 @@ static int xpad_probe(struct usb_interfa
xpad->mapping |= MAP_STICKS_TO_NULL; xpad->mapping |= MAP_STICKS_TO_NULL;
} }
@ -371,7 +364,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
error = xpad_led_probe(xpad); error = xpad_led_probe(xpad);
if (error) if (error)
@@ -963,10 +1063,6 @@ @@ -966,10 +1066,6 @@ static int xpad_probe(struct usb_interfa
xpad->irq_in->transfer_dma = xpad->idata_dma; xpad->irq_in->transfer_dma = xpad->idata_dma;
xpad->irq_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; xpad->irq_in->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
@ -382,7 +375,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
usb_set_intfdata(intf, xpad); usb_set_intfdata(intf, xpad);
if (xpad->xtype == XTYPE_XBOX360W) { if (xpad->xtype == XTYPE_XBOX360W) {
@@ -974,6 +1070,7 @@ @@ -977,6 +1073,7 @@ static int xpad_probe(struct usb_interfa
* Setup the message to set the LEDs on the * Setup the message to set the LEDs on the
* controller when it shows up * controller when it shows up
*/ */
@ -390,7 +383,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
xpad->bulk_out = usb_alloc_urb(0, GFP_KERNEL); xpad->bulk_out = usb_alloc_urb(0, GFP_KERNEL);
if (!xpad->bulk_out) { if (!xpad->bulk_out) {
error = -ENOMEM; error = -ENOMEM;
@@ -1015,23 +1112,55 @@ @@ -1028,23 +1125,55 @@ static int xpad_probe(struct usb_interfa
*/ */
xpad->irq_in->dev = xpad->udev; xpad->irq_in->dev = xpad->udev;
error = usb_submit_urb(xpad->irq_in, GFP_KERNEL); error = usb_submit_urb(xpad->irq_in, GFP_KERNEL);
@ -451,7 +444,7 @@ diff -Naur linux-3.15.6.orig/drivers/input/joystick/xpad.c linux-3.15.6/drivers/
kfree(xpad); kfree(xpad);
return error; return error;
@@ -1041,8 +1170,14 @@ @@ -1054,8 +1183,14 @@ static void xpad_disconnect(struct usb_i
{ {
struct usb_xpad *xpad = usb_get_intfdata (intf); struct usb_xpad *xpad = usb_get_intfdata (intf);