diff --git a/kernel.spec b/kernel.spec index d94c7e4..8302778 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1962,6 +1962,11 @@ fi # and build. %changelog +* Mon Apr 25 2011 Jarod Wilson +- ite-cir: fix modular build on powerpc (#698378) +- mceusb: add Dell-branded transceiver device ID +- nuvoton-cir: improve compatibility with lirc raw IR mode + * Mon Apr 25 2011 Neil Horman - netconsole: fix deadlock in netdev notifier handler diff --git a/linux-2.6-v4l-dvb-experimental.patch b/linux-2.6-v4l-dvb-experimental.patch index a5cc591..308ca63 100644 --- a/linux-2.6-v4l-dvb-experimental.patch +++ b/linux-2.6-v4l-dvb-experimental.patch @@ -1,3 +1,37 @@ +commit 9069f7f1ce7309cba021ac9c3527526d8524bd04 +Author: Jarod Wilson +Date: Mon Apr 25 13:50:50 2011 -0400 + + [media] ite-cir: modular build on ppc requires delay.h include + + Signed-off-by: Jarod Wilson + +commit 50f19c24801caaa6d846c62cef93ee54f6e6914f +Author: Jarod Wilson +Date: Mon Apr 25 13:48:18 2011 -0400 + + [media] mceusb: add Dell transceiver ID + + Add device ID for a Dell-branded, Philips device ID transceiver reported + by an OpenELEC user on their forums. + + http://openelec.tv/forum/27-hardware-support/5622-adding-support-for-an-ir-receiver--dell-branded--#5622 + + Signed-off-by: Jarod Wilson + +commit d9193f3784352638b355c9a24c16f1a2e14b0548 +Author: Jarod Wilson +Date: Thu Apr 21 14:21:47 2011 -0400 + + [media] nuvoton-cir: minor tweaks to rc dev init + + - Set a default timeout (matching mceusb.c) and use + ir_raw_event_store_with_filter, which leads to better behavior when + using lirc userspace decoding with this hardware + - Fill in rx_resolution with the value we're using here (50us) + + Signed-off-by: Jarod Wilson + commit 02210203eb4df7fdf1156b24fcf2b7e2a20bf29c Author: Jarod Wilson Date: Tue Apr 19 15:47:34 2011 -0400 @@ -1005,7 +1039,16 @@ index 044fb7a..47a1c5d 100644 }; static struct usb_device_id mceusb_dev_table[] = { -@@ -277,7 +287,8 @@ static struct usb_device_id mceusb_dev_table[] = { +@@ -230,6 +230,8 @@ static struct usb_device_id mceusb_dev_table[] = { + { USB_DEVICE(VENDOR_PHILIPS, 0x206c) }, + /* Philips/Spinel plus IR transceiver for ASUS */ + { USB_DEVICE(VENDOR_PHILIPS, 0x2088) }, ++ /* Philips IR transceiver (Dell branded) */ ++ { USB_DEVICE(VENDOR_PHILIPS, 0x2093) }, + /* Realtek MCE IR Receiver and card reader */ + { USB_DEVICE(VENDOR_REALTEK, 0x0161), + .driver_info = MULTIFUNCTION }, +@@ -279,7 +289,8 @@ static struct usb_device_id mceusb_dev_table[] = { /* Formosa21 / eHome Infrared Receiver */ { USB_DEVICE(VENDOR_FORMOSA, 0xe016) }, /* Formosa aim / Trust MCE Infrared Receiver */ @@ -1015,7 +1058,7 @@ index 044fb7a..47a1c5d 100644 /* Formosa Industrial Computing / Beanbag Emulation Device */ { USB_DEVICE(VENDOR_FORMOSA, 0xe018) }, /* Formosa21 / eHome Infrared Receiver */ -@@ -306,7 +317,8 @@ static struct usb_device_id mceusb_dev_table[] = { +@@ -308,7 +319,8 @@ static struct usb_device_id mceusb_dev_table[] = { /* Northstar Systems, Inc. eHome Infrared Transceiver */ { USB_DEVICE(VENDOR_NORTHSTAR, 0xe004) }, /* TiVo PC IR Receiver */ @@ -1123,6 +1166,31 @@ index d4d6449..5d93384 100644 /* Select CIR logical device and enable */ nvt_select_logical_dev(nvt, LOGICAL_DEV_CIR); +@@ -674,7 +674,7 @@ static void nvt_process_rx_ir_data(struct nvt_dev *nvt) + rawir.pulse ? "pulse" : "space", + rawir.duration); + +- ir_raw_event_store(nvt->rdev, &rawir); ++ ir_raw_event_store_with_filter(nvt->rdev, &rawir); + } + + /* +@@ -1110,12 +1110,12 @@ static int nvt_probe(struct pnp_dev *pdev, const struct pnp_device_id *dev_id) + rdev->input_id.version = nvt->chip_minor; + rdev->driver_name = NVT_DRIVER_NAME; + rdev->map_name = RC_MAP_RC6_MCE; ++ 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 + rdev->min_timeout = XYZ; + rdev->max_timeout = XYZ; +- rdev->timeout = XYZ; +- /* rx resolution is hardwired to 50us atm, 1, 25, 100 also possible */ +- rdev->rx_resolution = XYZ; + /* tx bits */ + rdev->tx_resolution = XYZ; + #endif diff --git a/drivers/media/rc/nuvoton-cir.h b/drivers/media/rc/nuvoton-cir.h index 048135e..379795d 100644 --- a/drivers/media/rc/nuvoton-cir.h @@ -1243,3 +1311,16 @@ index 9184751..b2bd405 100644 #define RC_MAP_TOTAL_MEDIA_IN_HAND "rc-total-media-in-hand" #define RC_MAP_TREKSTOR "rc-trekstor" #define RC_MAP_TT_1500 "rc-tt-1500" +diff --git a/drivers/media/rc/ite-cir.c b/drivers/media/rc/ite-cir.c +index accaf6c..43908a7 100644 +--- a/drivers/media/rc/ite-cir.c ++++ b/drivers/media/rc/ite-cir.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + #include + #include + #include +