Merge branch 'for-5.1/i2c-hid' into for-next

Trivial conflicts:
	drivers/hid/i2c-hid/i2c-hid-core.c

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>

diff --cc drivers/hid/i2c-hid/i2c-hid-core.c
index c5edfa9,2f940c1..90164fe
--- 1/drivers/hid/i2c-hid/i2c-hid-core.c
--- 2/drivers/hid/i2c-hid/i2c-hid-core.c
+++ b/drivers/hid/i2c-hid/i2c-hid-core.c
@@@ -179,8 -180,8 +180,10 @@@ static const struct i2c_hid_quirks 
                I2C_HID_QUIRK_DELAY_AFTER_SLEEP },
        { USB_VENDOR_ID_LG, I2C_DEVICE_ID_LG_8001,
                I2C_HID_QUIRK_NO_RUNTIME_PM },
 +      { I2C_VENDOR_ID_GOODIX, I2C_DEVICE_ID_GOODIX_01F0,
 +              I2C_HID_QUIRK_NO_RUNTIME_PM },
+       { USB_VENDOR_ID_ELAN, HID_ANY_ID,
+                I2C_HID_QUIRK_BOGUS_IRQ },
        { 0, 0 }
  };