HID: uclogic: Add battery quirk

[ Upstream commit f60c377f52de37f8705c5fc6d57737fdaf309ff9 ]

Some UGEE v2 tablets have a wireless version with an internal battery
and their firmware is able to report their battery level.

However, there was not found a field on their descriptor indicating
whether the tablet has battery or not, making it mandatory to classify
such devices through the UCLOGIC_BATTERY_QUIRK quirk.

Tested-by: Mia Kanashi <chad@redpilled.dev>
Tested-by: Andreas Grosse <andig.mail@t-online.de>
Signed-off-by: José Expósito <jose.exposito89@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/hid/hid-uclogic-params.c b/drivers/hid/hid-uclogic-params.c
index e052538a62fb3d2eb1b2e924edf3d3da11dd304e..23624d5b07b5a821816ccd52225703ee770c18a4 100644 (file)
--- a/drivers/hid/hid-uclogic-params.c
+++ b/drivers/hid/hid-uclogic-params.c
@@ -1222,6 +1222,11 @@ static int uclogic_params_ugee_v2_init_frame_mouse(struct uclogic_params *p)
  */
 static bool uclogic_params_ugee_v2_has_battery(struct hid_device *hdev)
 {
+       struct uclogic_drvdata *drvdata = hid_get_drvdata(hdev);
+
+       if (drvdata->quirks & UCLOGIC_BATTERY_QUIRK)
+               return true;
+
        /* The XP-PEN Deco LW vendor, product and version are identical to the
         * Deco L. The only difference reported by their firmware is the product
         * name. Add a quirk to support battery reporting on the wireless

diff --git a/drivers/hid/hid-uclogic-params.h b/drivers/hid/hid-uclogic-params.h
index 10a05c7fd9398f57e6c9f8519dcdb318f68d86df..b0e7f3807939b52cbc554d88a97c08163dcfa743 100644 (file)
--- a/drivers/hid/hid-uclogic-params.h
+++ b/drivers/hid/hid-uclogic-params.h
@@ -20,6 +20,7 @@
 #include <linux/hid.h>
 
 #define UCLOGIC_MOUSE_FRAME_QUIRK      BIT(0)
+#define UCLOGIC_BATTERY_QUIRK          BIT(1)
 
 /* Types of pen in-range reporting */
 enum uclogic_params_pen_inrange {