diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-12-16 05:04:49 -0500 |
commit | 348324c5b10bcba8d9daabdfb85a6927311be34f (patch) | |
tree | d06ca3a264407a14a1f36c1b798d6dc0dc1582d8 /drivers/input/tablet | |
parent | 1e63bd9cc43db5400a1423a7ec8266b4e7c54bd0 (diff) | |
parent | 319e2e3f63c348a9b66db4667efa73178e18b17d (diff) |
Merge tag 'v3.13-rc4' into next
Synchronize with mainline to bring in the new keycode definitions and
new hwmon API.
Diffstat (limited to 'drivers/input/tablet')
-rw-r--r-- | drivers/input/tablet/wacom_sys.c | 4 | ||||
-rw-r--r-- | drivers/input/tablet/wacom_wac.c | 8 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c index 3a7d99c720cd..8318826d976e 100644 --- a/drivers/input/tablet/wacom_sys.c +++ b/drivers/input/tablet/wacom_sys.c | |||
@@ -1041,6 +1041,7 @@ static void wacom_destroy_leds(struct wacom *wacom) | |||
1041 | } | 1041 | } |
1042 | 1042 | ||
1043 | static enum power_supply_property wacom_battery_props[] = { | 1043 | static enum power_supply_property wacom_battery_props[] = { |
1044 | POWER_SUPPLY_PROP_SCOPE, | ||
1044 | POWER_SUPPLY_PROP_CAPACITY | 1045 | POWER_SUPPLY_PROP_CAPACITY |
1045 | }; | 1046 | }; |
1046 | 1047 | ||
@@ -1052,6 +1053,9 @@ static int wacom_battery_get_property(struct power_supply *psy, | |||
1052 | int ret = 0; | 1053 | int ret = 0; |
1053 | 1054 | ||
1054 | switch (psp) { | 1055 | switch (psp) { |
1056 | case POWER_SUPPLY_PROP_SCOPE: | ||
1057 | val->intval = POWER_SUPPLY_SCOPE_DEVICE; | ||
1058 | break; | ||
1055 | case POWER_SUPPLY_PROP_CAPACITY: | 1059 | case POWER_SUPPLY_PROP_CAPACITY: |
1056 | val->intval = | 1060 | val->intval = |
1057 | wacom->wacom_wac.battery_capacity * 100 / 31; | 1061 | wacom->wacom_wac.battery_capacity * 100 / 31; |
diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index eb60a284be05..7655088f78e0 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c | |||
@@ -2143,6 +2143,12 @@ static const struct wacom_features wacom_features_0x101 = | |||
2143 | static const struct wacom_features wacom_features_0x10D = | 2143 | static const struct wacom_features wacom_features_0x10D = |
2144 | { "Wacom ISDv4 10D", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, | 2144 | { "Wacom ISDv4 10D", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, |
2145 | 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | 2145 | 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; |
2146 | static const struct wacom_features wacom_features_0x10E = | ||
2147 | { "Wacom ISDv4 10E", WACOM_PKGLEN_MTTPC, 27760, 15694, 255, | ||
2148 | 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | ||
2149 | static const struct wacom_features wacom_features_0x10F = | ||
2150 | { "Wacom ISDv4 10F", WACOM_PKGLEN_MTTPC, 27760, 15694, 255, | ||
2151 | 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | ||
2146 | static const struct wacom_features wacom_features_0x4001 = | 2152 | static const struct wacom_features wacom_features_0x4001 = |
2147 | { "Wacom ISDv4 4001", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, | 2153 | { "Wacom ISDv4 4001", WACOM_PKGLEN_MTTPC, 26202, 16325, 255, |
2148 | 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; | 2154 | 0, MTTPC, WACOM_INTUOS_RES, WACOM_INTUOS_RES }; |
@@ -2355,6 +2361,8 @@ const struct usb_device_id wacom_ids[] = { | |||
2355 | { USB_DEVICE_WACOM(0x100) }, | 2361 | { USB_DEVICE_WACOM(0x100) }, |
2356 | { USB_DEVICE_WACOM(0x101) }, | 2362 | { USB_DEVICE_WACOM(0x101) }, |
2357 | { USB_DEVICE_WACOM(0x10D) }, | 2363 | { USB_DEVICE_WACOM(0x10D) }, |
2364 | { USB_DEVICE_WACOM(0x10E) }, | ||
2365 | { USB_DEVICE_WACOM(0x10F) }, | ||
2358 | { USB_DEVICE_WACOM(0x300) }, | 2366 | { USB_DEVICE_WACOM(0x300) }, |
2359 | { USB_DEVICE_WACOM(0x301) }, | 2367 | { USB_DEVICE_WACOM(0x301) }, |
2360 | { USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) }, | 2368 | { USB_DEVICE_DETAILED(0x302, USB_CLASS_HID, 0, 0) }, |