]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Input: wacom - register an ac power supply for wireless devices
authorBenjamin Tissoires <benjamin.tissoires@redhat.com>
Sat, 26 Jul 2014 00:32:41 +0000 (17:32 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Sat, 26 Jul 2014 01:55:54 +0000 (18:55 -0700)
This is used by HID Bluetooth devices but also add some more information
to the USB Wireless Receiver.
We are just porting the bits from hid-wacom.c to the common driver here.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Przemo Firszt <przemo@firszt.eu>
Acked-by: Ping Cheng <pingc@wacom.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/hid/wacom.h
drivers/hid/wacom_sys.c
drivers/hid/wacom_wac.h

index 98cb93f16ba47c88ad2b38995c51526f380ca36c..0b89ee77d7d10ee63428298cb80f9b5f577f5a77 100644 (file)
@@ -120,6 +120,7 @@ struct wacom {
        } led;
        bool led_initialized;
        struct power_supply battery;
+       struct power_supply ac;
 };
 
 static inline void wacom_schedule_work(struct wacom_wac *wacom_wac)
index a27404d6e98d5c07218197f61f05d0a5292720c9..37888c3f39bae200a68553c0e87985b3a0fd3f59 100644 (file)
@@ -774,6 +774,12 @@ static enum power_supply_property wacom_battery_props[] = {
        POWER_SUPPLY_PROP_CAPACITY
 };
 
+static enum power_supply_property wacom_ac_props[] = {
+       POWER_SUPPLY_PROP_PRESENT,
+       POWER_SUPPLY_PROP_ONLINE,
+       POWER_SUPPLY_PROP_SCOPE,
+};
+
 static int wacom_battery_get_property(struct power_supply *psy,
                                      enum power_supply_property psp,
                                      union power_supply_propval *val)
@@ -806,14 +812,38 @@ static int wacom_battery_get_property(struct power_supply *psy,
        return ret;
 }
 
+static int wacom_ac_get_property(struct power_supply *psy,
+                               enum power_supply_property psp,
+                               union power_supply_propval *val)
+{
+       struct wacom *wacom = container_of(psy, struct wacom, ac);
+       int ret = 0;
+
+       switch (psp) {
+       case POWER_SUPPLY_PROP_PRESENT:
+               /* fall through */
+       case POWER_SUPPLY_PROP_ONLINE:
+               val->intval = wacom->wacom_wac.ps_connected;
+               break;
+       case POWER_SUPPLY_PROP_SCOPE:
+               val->intval = POWER_SUPPLY_SCOPE_DEVICE;
+               break;
+       default:
+               ret = -EINVAL;
+               break;
+       }
+       return ret;
+}
+
 static int wacom_initialize_battery(struct wacom *wacom)
 {
-       int error = 0;
        static atomic_t battery_no = ATOMIC_INIT(0);
+       int error;
        unsigned long n;
 
        if (wacom->wacom_wac.features.quirks & WACOM_QUIRK_BATTERY) {
                n = atomic_inc_return(&battery_no) - 1;
+
                wacom->battery.properties = wacom_battery_props;
                wacom->battery.num_properties = ARRAY_SIZE(wacom_battery_props);
                wacom->battery.get_property = wacom_battery_get_property;
@@ -822,15 +852,31 @@ static int wacom_initialize_battery(struct wacom *wacom)
                wacom->battery.type = POWER_SUPPLY_TYPE_BATTERY;
                wacom->battery.use_for_apm = 0;
 
+               wacom->ac.properties = wacom_ac_props;
+               wacom->ac.num_properties = ARRAY_SIZE(wacom_ac_props);
+               wacom->ac.get_property = wacom_ac_get_property;
+               sprintf(wacom->wacom_wac.ac_name, "wacom_ac_%ld", n);
+               wacom->ac.name = wacom->wacom_wac.ac_name;
+               wacom->ac.type = POWER_SUPPLY_TYPE_MAINS;
+               wacom->ac.use_for_apm = 0;
+
                error = power_supply_register(&wacom->hdev->dev,
                                              &wacom->battery);
+               if (error)
+                       return error;
+
+               power_supply_powers(&wacom->battery, &wacom->hdev->dev);
+
+               error = power_supply_register(&wacom->hdev->dev, &wacom->ac);
+               if (error) {
+                       power_supply_unregister(&wacom->battery);
+                       return error;
+               }
 
-               if (!error)
-                       power_supply_powers(&wacom->battery,
-                                           &wacom->hdev->dev);
+               power_supply_powers(&wacom->ac, &wacom->hdev->dev);
        }
 
-       return error;
+       return 0;
 }
 
 static void wacom_destroy_battery(struct wacom *wacom)
@@ -839,6 +885,8 @@ static void wacom_destroy_battery(struct wacom *wacom)
             wacom->battery.dev) {
                power_supply_unregister(&wacom->battery);
                wacom->battery.dev = NULL;
+               power_supply_unregister(&wacom->ac);
+               wacom->ac.dev = NULL;
        }
 }
 
index 6cdf707821cde4e0f3be893c338a34cfd8016058..3433a0e28bb476549c4e7f4b06b63b9f84c3bfa2 100644 (file)
@@ -155,6 +155,7 @@ struct wacom_wac {
        char name[WACOM_NAME_MAX];
        char pad_name[WACOM_NAME_MAX];
        char bat_name[WACOM_NAME_MAX];
+       char ac_name[WACOM_NAME_MAX];
        unsigned char data[WACOM_PKGLEN_MAX];
        int tool[2];
        int id[2];