summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPing Cheng <pinglinux@gmail.com>2011-10-04 23:50:42 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-10-05 00:26:17 -0700
commit77e82516a69ad7dd10ada425930ba35e933abcfb (patch)
tree61113d84614f9c7ae7ba508fda7193384efd49f2
parentf4fa9a6d80a61e5ae01e41262ff8b913deb92378 (diff)
downloadblackbird-op-linux-77e82516a69ad7dd10ada425930ba35e933abcfb.tar.gz
blackbird-op-linux-77e82516a69ad7dd10ada425930ba35e933abcfb.zip
Input: wacom - don't expose LED inactive option
The LED also indicates the status of the tablet. Don't turn it off. Reviewed-by: Eduard Hasenleithner <eduard@hasenleithner.at> Tested-by: Eduard Hasenleithner <eduard@hasenleithner.at> Signed-off-by: Ping Cheng <pingc@wacom.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
-rw-r--r--Documentation/ABI/testing/sysfs-driver-wacom8
-rw-r--r--drivers/input/tablet/wacom.h6
2 files changed, 6 insertions, 8 deletions
diff --git a/Documentation/ABI/testing/sysfs-driver-wacom b/Documentation/ABI/testing/sysfs-driver-wacom
index b1d5c17dd67f..b5601859de5a 100644
--- a/Documentation/ABI/testing/sysfs-driver-wacom
+++ b/Documentation/ABI/testing/sysfs-driver-wacom
@@ -23,7 +23,7 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status0_lum
Date: August 2011
Contact: linux-input@vger.kernel.org
Description:
- Writing to this file sets the status LED luminance (0..127)
+ Writing to this file sets the status LED luminance (1..127)
when the stylus does not touch the tablet surface, and no
button is pressed on the stylus. This luminance level is
normally lower than the level when a button is pressed.
@@ -32,7 +32,7 @@ What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/status1_lum
Date: August 2011
Contact: linux-input@vger.kernel.org
Description:
- Writing to this file sets the status LED luminance (0..127)
+ Writing to this file sets the status LED luminance (1..127)
when the stylus touches the tablet surface, or any button is
pressed on the stylus.
@@ -41,9 +41,7 @@ Date: August 2011
Contact: linux-input@vger.kernel.org
Description:
Writing to this file sets which one of the four status LEDs is
- active (0..3). The other three LEDs are always inactive. By
- means of specifying "-1" it is possible to set all status LEDs
- to inactive.
+ active (0..3). The other three LEDs are always inactive.
What: /sys/bus/usb/devices/<busnum>-<devnum>:<cfg>.<intf>/wacom_led/buttons_luminance
Date: August 2011
diff --git a/drivers/input/tablet/wacom.h b/drivers/input/tablet/wacom.h
index 00332d66bc4b..561f1072343b 100644
--- a/drivers/input/tablet/wacom.h
+++ b/drivers/input/tablet/wacom.h
@@ -115,9 +115,9 @@ struct wacom {
bool open;
char phys[32];
struct wacom_led {
- u8 select; /* status led selector (0..3, -1=none) */
- u8 llv; /* status led brightness no button */
- u8 hlv; /* status led brightness button pressed */
+ u8 select; /* status led selector (0..3) */
+ u8 llv; /* status led brightness no button (1..127) */
+ u8 hlv; /* status led brightness button pressed (1..127) */
u8 img_lum; /* OLED matrix display brightness */
} led;
};
OpenPOWER on IntegriCloud