From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 23 Feb 2021 22:52:22 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid
X-Git-Tag: v5.12-rc1~61
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/69aea9d2843669387d100e353b5113d1adc9502f

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid

Pull HID updates from Jiri Kosina:

 - support for "Unified Battery" feature on Logitech devices from Filipe
   Laíns

 - power management improvements for intel-ish driver from Zhang Lixu

 - support for Goodix devices from Douglas Anderson

 - improved handling of generic HID keyboard in order to make it easier
   for userspace to figure out the details of the device, from Dmitry
   Torokhov

 - Playstation DualSense support from Roderick Colenbrander

 - other assorted small fixes and device ID additions.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid: (49 commits)
  HID: playstation: add DualSense player LED support.
  HID: playstation: add microphone mute support for DualSense.
  HID: playstation: add initial DualSense lightbar support.
  HID: wacom: Ignore attempts to overwrite the touch_max value from HID
  HID: playstation: fix array size comparison (off-by-one)
  HID: playstation: fix unused variable in ps_battery_get_property.
  HID: playstation: report DualSense hardware and firmware version.
  HID: playstation: add DualSense classic rumble support.
  HID: playstation: add DualSense Bluetooth support.
  HID: playstation: track devices in list.
  HID: playstation: add DualSense accelerometer and gyroscope support.
  HID: playstation: add DualSense touchpad support.
  HID: playstation: add DualSense battery support.
  HID: playstation: use DualSense MAC address as unique identifier.
  HID: playstation: initial DualSense USB support.
  HID: ite: Enable QUIRK_TOUCHPAD_ON_OFF_REPORT on Acer Aspire Switch 10E
  HID: Ignore battery for Elan touchscreen on HP Spectre X360 15-df0xxx
  HID: logitech-dj: add support for the new lightspeed connection iteration
  HID: intel-ish-hid: ipc: Add Tiger Lake H PCI device ID
  HID: logitech-dj: add support for keyboard events in eQUAD step 4 Gaming
  ...
---

69aea9d2843669387d100e353b5113d1adc9502f
diff --cc arch/arm64/configs/defconfig
index 43c4280bfc4f,326198305beb..d612f633b771
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -763,14 -746,11 +763,15 @@@ CONFIG_SND_SOC_SIMPLE_AMPLIFIER=
  CONFIG_SND_SOC_TAS571X=m
  CONFIG_SND_SOC_WCD934X=m
  CONFIG_SND_SOC_WM8904=m
 +CONFIG_SND_SOC_WM8962=m
  CONFIG_SND_SOC_WSA881X=m
 +CONFIG_SND_SOC_LPASS_WSA_MACRO=m
 +CONFIG_SND_SOC_LPASS_VA_MACRO=m
  CONFIG_SND_SIMPLE_CARD=m
  CONFIG_SND_AUDIO_GRAPH_CARD=m
 +CONFIG_HID_MULTITOUCH=m
- CONFIG_I2C_HID=m
+ CONFIG_I2C_HID_ACPI=m
+ CONFIG_I2C_HID_OF=m
  CONFIG_USB_CONN_GPIO=m
  CONFIG_USB=y
  CONFIG_USB_OTG=y