aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorJason Gerecke <killertofu@gmail.com>2011-12-12 03:12:04 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-12-12 03:14:21 -0500
commit246835fccdc0dadeda20cd51f7ec868031fa8142 (patch)
treeafbea621863f7ac5b6f79569a3daf411583d35e1 /drivers/input
parent803296b678a43005e3bc0aaa1951d211bd76a054 (diff)
Input: wacom - add LED support for Cintiq 24HD
The Cintiq 24HD has three LEDs on the left side of the tablet and three LEDs on the right side of the tablet. Switching to LED 0, 1, or 2 will enable the top, middle, or bottom LED for the respective side. Switching to LED 3 turns off the LEDs on the respective side. Signed-off-by: Jason Gerecke <killertofu@gmail.com> Reviewed-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/tablet/wacom_sys.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/input/tablet/wacom_sys.c b/drivers/input/tablet/wacom_sys.c
index 2fe21d1a18b7..7e63183a6c68 100644
--- a/drivers/input/tablet/wacom_sys.c
+++ b/drivers/input/tablet/wacom_sys.c
@@ -563,7 +563,8 @@ static int wacom_led_control(struct wacom *wacom)
563 if (!buf) 563 if (!buf)
564 return -ENOMEM; 564 return -ENOMEM;
565 565
566 if (wacom->wacom_wac.features.type == WACOM_21UX2) 566 if (wacom->wacom_wac.features.type == WACOM_21UX2 ||
567 wacom->wacom_wac.features.type == WACOM_24HD)
567 led = (wacom->led.select[1] << 4) | 0x40; 568 led = (wacom->led.select[1] << 4) | 0x40;
568 569
569 led |= wacom->led.select[0] | 0x4; 570 led |= wacom->led.select[0] | 0x4;
@@ -782,6 +783,7 @@ static int wacom_initialize_leds(struct wacom *wacom)
782 &intuos4_led_attr_group); 783 &intuos4_led_attr_group);
783 break; 784 break;
784 785
786 case WACOM_24HD:
785 case WACOM_21UX2: 787 case WACOM_21UX2:
786 wacom->led.select[0] = 0; 788 wacom->led.select[0] = 0;
787 wacom->led.select[1] = 0; 789 wacom->led.select[1] = 0;
@@ -816,6 +818,7 @@ static void wacom_destroy_leds(struct wacom *wacom)
816 &intuos4_led_attr_group); 818 &intuos4_led_attr_group);
817 break; 819 break;
818 820
821 case WACOM_24HD:
819 case WACOM_21UX2: 822 case WACOM_21UX2:
820 sysfs_remove_group(&wacom->intf->dev.kobj, 823 sysfs_remove_group(&wacom->intf->dev.kobj,
821 &cintiq_led_attr_group); 824 &cintiq_led_attr_group);