99 lines
4.3 KiB
Diff
99 lines
4.3 KiB
Diff
|
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
|
||
|
|
|