Commit 0ce91cf9 authored by Stelian Pop's avatar Stelian Pop Committed by Jiri Kosina
Browse files

HID: enable hiddev for the SantaRosa MacBookPro IR receiver 



The infrared remote receiver found in the SantaRosa MacBookPro
laptops (MacBookPro3,1) need to be forced to expose a HIDDEV
interface (instead of HIDINPUT) so that lirc can access it using
the 'macmini' driver.

The patch below adds the required quirk for forcing the HIDDEV
interface to be activated (HID_QUIRK_HIDDEV) and introduces a new
quirk which forces the HIDINPUT interface to be ignored
(HID_QUIRK_IGNORE_HIDINPUT).

Note that Apple calls this receiver 'IRController4' (info taken
from Apple's driver Info.plist). Older Mac{Book,Mini,Pro}s seem
to all use the 'IRController1' device (USB id 05ac:8240) which
doesn't need those quirks.

Signed-off-by: default avatarStelian Pop <stelian@popies.net>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent c4025ade

drivers/hid/hid-input.c

+3 −0
Original line number Diff line number Diff line
@@ -1112,6 +1112,9 @@ int hidinput_connect(struct hid_device *hid) 
	int i, j, k;

	int max_report_type = HID_OUTPUT_REPORT;



	if (hid->quirks & HID_QUIRK_IGNORE_HIDINPUT)

		return -1;



	INIT_LIST_HEAD(&hid->inputs);



	for (i = 0; i < hid->maxcollection; i++)

drivers/hid/usbhid/hid-quirks.c

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#define USB_DEVICE_ID_APPLE_GEYSER4_JIS	0x021c

#define USB_DEVICE_ID_APPLE_FOUNTAIN_TP_ONLY	0x030a

#define USB_DEVICE_ID_APPLE_GEYSER1_TP_ONLY	0x030b

#define USB_DEVICE_ID_APPLE_IRCONTROL4	0x8242



#define USB_VENDOR_ID_ASUS		0x0b05

#define USB_DEVICE_ID_ASUS_LCM		0x1726
@@ -376,6 +377,7 @@ static const struct hid_blacklist { 
	{ USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_DINOVO_EDGE, HID_QUIRK_DUPLICATE_USAGES },



	{ USB_VENDOR_ID_BELKIN, USB_DEVICE_ID_FLIP_KVM, HID_QUIRK_HIDDEV },

	{ USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4, HID_QUIRK_HIDDEV | HID_QUIRK_IGNORE_HIDINPUT },

	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_SIDEWINDER_GV, HID_QUIRK_HIDINPUT },



	{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_01, HID_QUIRK_IGNORE },

include/linux/hid.h

+1 −0
Original line number Diff line number Diff line
@@ -276,6 +276,7 @@ struct hid_item { 
#define HID_QUIRK_HIDINPUT			0x00200000

#define HID_QUIRK_LOGITECH_IGNORE_DOUBLED_WHEEL	0x00400000

#define HID_QUIRK_LOGITECH_EXPANDED_KEYMAP	0x00800000

#define HID_QUIRK_IGNORE_HIDINPUT		0x01000000



/*

 * Separate quirks for runtime report descriptor fixup

CRA Git | Maintained and supported by SUSTech CRA and CCSE