[kernel] restore appleir driver which was lost since f-13
Kyle McMartin
kyle at fedoraproject.org
Fri Sep 3 17:33:43 UTC 2010
commit 0ca56266239777bb24e46f5d146050c0b3bb7db0
Author: Kyle McMartin <kyle at dreadnought.i.jkkm.org>
Date: Fri Sep 3 13:30:57 2010 -0400
restore appleir driver which was lost since f-13
add-appleir-usb-driver.patch | 98 ++++++++++++++++++++++++++++++++++++++++++
kernel.spec | 7 +++
2 files changed, 105 insertions(+), 0 deletions(-)
---
diff --git a/add-appleir-usb-driver.patch b/add-appleir-usb-driver.patch
new file mode 100644
index 0000000..f04b204
--- /dev/null
+++ b/add-appleir-usb-driver.patch
@@ -0,0 +1,98 @@
+appleir usb driver from hadess
+---
+ drivers/hid/hid-apple.c | 4 ----
+ drivers/hid/hid-core.c | 5 +++--
+ drivers/hid/hid-ids.h | 1 +
+ drivers/input/misc/Kconfig | 13 +++++++++++++
+ drivers/input/misc/Makefile | 1 +
+ 5 files changed, 18 insertions(+), 6 deletions(-)
+
+diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
+index bba05d0..0059d5a 100644
+--- a/drivers/hid/hid-apple.c
++++ b/drivers/hid/hid-apple.c
+@@ -361,10 +361,6 @@ static void apple_remove(struct hid_device *hdev)
+ }
+
+ static const struct hid_device_id apple_devices[] = {
+- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL),
+- .driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4),
+- .driver_data = APPLE_HIDDEV | APPLE_IGNORE_HIDINPUT },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE),
+ .driver_data = APPLE_MIGHTYMOUSE | APPLE_INVERT_HWHEEL },
+
+diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
+index 0c52899..712501e 100644
+--- a/drivers/hid/hid-core.c
++++ b/drivers/hid/hid-core.c
+@@ -1244,8 +1244,6 @@ static const struct hid_device_id hid_blacklist[] = {
+ #if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE)
+ { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
+ #endif
+- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
+- { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },
+ { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MAGICMOUSE) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_FOUNTAIN_ANSI) },
+@@ -1581,6 +1579,9 @@ static const struct hid_device_id hid_ignore_list[] = {
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUS, USB_DEVICE_ID_ASUS_T91MT)},
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM)},
+ { HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_LCM2)},
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
++ { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_AVERMEDIA, USB_DEVICE_ID_AVER_FM_MR800) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD) },
+ { HID_USB_DEVICE(USB_VENDOR_ID_CIDC, 0x0103) },
+diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
+index 85c6d13..4dc4c18 100644
+--- a/drivers/hid/hid-ids.h
++++ b/drivers/hid/hid-ids.h
+@@ -100,6 +100,7 @@
+ #define USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_JIS 0x023b
+ #define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY 0x030a
+ #define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY 0x030b
++#define USB_DEVICE_ID_APPLE_IRCONTROL 0x8240
+ #define USB_DEVICE_ID_APPLE_ATV_IRCONTROL 0x8241
+ #define USB_DEVICE_ID_APPLE_IRCONTROL4 0x8242
+
+diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
+index b49e233..211adac 100644
+--- a/drivers/input/misc/Kconfig
++++ b/drivers/input/misc/Kconfig
+@@ -199,6 +199,19 @@ config INPUT_KEYSPAN_REMOTE
+ To compile this driver as a module, choose M here: the module will
+ be called keyspan_remote.
+
++config INPUT_APPLEIR
++ tristate "Apple infrared receiver (built in)"
++ depends on USB_ARCH_HAS_HCD
++ select USB
++ help
++ Say Y here if you want to use a Apple infrared remote control. All
++ the Apple computers from 2005 onwards include such a port, except
++ the unibody Macbook (2009), and Mac Pros. This receiver is also
++ used in the Apple TV set-top box.
++
++ To compile this driver as a module, choose M here: the module will
++ be called appleir.
++
+ config INPUT_POWERMATE
+ tristate "Griffin PowerMate and Contour Jog support"
+ depends on USB_ARCH_HAS_HCD
+diff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile
+index 19ccca7..b26e6ca 100644
+--- a/drivers/input/misc/Makefile
++++ b/drivers/input/misc/Makefile
+@@ -12,6 +12,7 @@ obj-$(CONFIG_INPUT_ADXL34X) += adxl34x.o
+ obj-$(CONFIG_INPUT_ADXL34X_I2C) += adxl34x-i2c.o
+ obj-$(CONFIG_INPUT_ADXL34X_SPI) += adxl34x-spi.o
+ obj-$(CONFIG_INPUT_APANEL) += apanel.o
++obj-$(CONFIG_INPUT_APPLEIR) += appleir.o
+ obj-$(CONFIG_INPUT_ATI_REMOTE) += ati_remote.o
+ obj-$(CONFIG_INPUT_ATI_REMOTE2) += ati_remote2.o
+ obj-$(CONFIG_INPUT_ATLAS_BTNS) += atlas_btns.o
+--
+1.7.2.2
+
diff --git a/kernel.spec b/kernel.spec
index b6a38fa..31ae912 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -685,6 +685,8 @@ Patch2917: hdpvr-ir-enable.patch
# patches headed upstream
+Patch12010: add-appleir-usb-driver.patch
+
Patch12016: disable-i8042-check-on-apple-mac.patch
Patch12017: prevent-runtime-conntrack-changes.patch
@@ -1264,6 +1266,8 @@ ApplyPatch hdpvr-ir-enable.patch
# Patches headed upstream
ApplyPatch disable-i8042-check-on-apple-mac.patch
+ApplyPatch add-appleir-usb-driver.patch
+
ApplyPatch neuter_intel_microcode_load.patch
# try to fix stalls during boot (#530393)
@@ -1876,6 +1880,9 @@ fi
# || ||
%changelog
+* Fri Sep 03 2010 Kyle McMartin <kyle at redhat.com>
+- Restore AppleIR USB driver which got lost between F-13 and now.
+
* Fri Sep 03 2010 Dave Jones <davej at redhat.com> 2.6.36-0.16.rc3.git0
- exec-randomization: brk away from exec rand area (Kees Cook)
More information about the scm-commits
mailing list