Commit 9fe5167a authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.5/upstream-fixes' into for-linus 

Apple devices fixes by Nimish Gåtam and Nils Tonnaett
parents 2544f877 c4444d87

drivers/hid/hid-apple.c

+2 −1
Original line number Diff line number Diff line
@@ -343,7 +343,8 @@ static const struct apple_non_apple_keyboard non_apple_keyboards[] = { 
	{ "SONiX USB DEVICE" },

	{ "Keychron" },

	{ "AONE" },

	{ "GANSS" }

	{ "GANSS" },

	{ "Hailuck" },

};



static bool apple_is_non_apple_keyboard(struct hid_device *hdev)

drivers/hid/hid-input.c

+3 −0
Original line number Diff line number Diff line
@@ -358,6 +358,9 @@ static const struct hid_device_id hid_battery_quirks[] = { 
	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,

		USB_DEVICE_ID_APPLE_ALU_WIRELESS_ANSI),

	  HID_BATTERY_QUIRK_PERCENT | HID_BATTERY_QUIRK_FEATURE },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE,

		USB_DEVICE_ID_APPLE_MAGICTRACKPAD),

	  HID_BATTERY_QUIRK_IGNORE },

	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ELECOM,

		USB_DEVICE_ID_ELECOM_BM084),

	  HID_BATTERY_QUIRK_IGNORE },