Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47dd6b01 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-4.15/asus' into for-linus 

- Asus laptop fixes (fn keys, backlight), from Mustafa Kuscu and
  Maxime Bellengé
parents 5cc619db 339ee3fc

drivers/hid/hid-asus.c

+30 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); 
#define QUIRK_USE_KBD_BACKLIGHT		BIT(5)

#define QUIRK_T100_KEYBOARD		BIT(6)

#define QUIRK_T100CHI			BIT(7)

#define QUIRK_G752_KEYBOARD		BIT(8)



#define I2C_KEYBOARD_QUIRKS			(QUIRK_FIX_NOTEBOOK_REPORT | \

						 QUIRK_NO_INIT_REPORTS | \
@@ -670,6 +671,11 @@ static void asus_remove(struct hid_device *hdev) 
	hid_hw_stop(hdev);

}



static const __u8 asus_g752_fixed_rdesc[] = {

        0x19, 0x00,			/*   Usage Minimum (0x00)       */

        0x2A, 0xFF, 0x00,		/*   Usage Maximum (0xFF)       */

};



static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc,

		unsigned int *rsize)

{
@@ -708,6 +714,27 @@ static __u8 *asus_report_fixup(struct hid_device *hdev, __u8 *rdesc, 
		rdesc[391] = 0xff;

		rdesc[402] = 0x00;

	}

	if (drvdata->quirks & QUIRK_G752_KEYBOARD &&

		 *rsize == 75 && rdesc[61] == 0x15 && rdesc[62] == 0x00) {

		/* report is missing usage mninum and maximum */

		__u8 *new_rdesc;

		size_t new_size = *rsize + sizeof(asus_g752_fixed_rdesc);



		new_rdesc = devm_kzalloc(&hdev->dev, new_size, GFP_KERNEL);

		if (new_rdesc == NULL)

			return rdesc;



		hid_info(hdev, "Fixing up Asus G752 keyb report descriptor\n");

		/* copy the valid part */

		memcpy(new_rdesc, rdesc, 61);

		/* insert missing part */

		memcpy(new_rdesc + 61, asus_g752_fixed_rdesc, sizeof(asus_g752_fixed_rdesc));

		/* copy remaining data */

		memcpy(new_rdesc + 61 + sizeof(asus_g752_fixed_rdesc), rdesc + 61, *rsize - 61);



		*rsize = new_size;

		rdesc = new_rdesc;

	}



	return rdesc;

}
@@ -718,9 +745,11 @@ static const struct hid_device_id asus_devices[] = { 
	{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD), I2C_TOUCHPAD_QUIRKS },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1), QUIRK_USE_KBD_BACKLIGHT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2), QUIRK_USE_KBD_BACKLIGHT },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3), QUIRK_G752_KEYBOARD },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK,

		USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD),

	  QUIRK_T100_KEYBOARD | QUIRK_NO_CONSUMER_USAGES },

drivers/hid/hid-core.c

+1 −1
Original line number Diff line number Diff line
@@ -1982,6 +1982,7 @@ static const struct hid_device_id hid_have_special_driver[] = { 
	{ HID_I2C_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100_KEYBOARD) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) },

	{ HID_USB_DEVICE(USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_ASUS_MD_5110) },
@@ -3125,4 +3126,3 @@ MODULE_AUTHOR("Andreas Gal"); 
MODULE_AUTHOR("Vojtech Pavlik");

MODULE_AUTHOR("Jiri Kosina");

MODULE_LICENSE("GPL");

drivers/hid/hid-ids.h

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ 
#define USB_DEVICE_ID_ASUSTEK_I2C_TOUCHPAD	0x0101

#define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD1 0x1854

#define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD2 0x1837

#define USB_DEVICE_ID_ASUSTEK_ROG_KEYBOARD3 0x1822



#define USB_VENDOR_ID_ATEN		0x0557

#define USB_DEVICE_ID_ATEN_UC100KM	0x2004