summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-11-12 05:33:03 -0800
committerSimon Glass <sjg@chromium.org>2015-11-19 20:13:42 -0700
commit377a06964370bd887ec15f77f3e4e179c27fe8b9 (patch)
tree67ebd8fa33bb8dbf37324fdf94c3fce3130e87ab
parentcd810918fd638df4e91f232ec889896c6155440a (diff)
downloadblackbird-obmc-uboot-377a06964370bd887ec15f77f3e4e179c27fe8b9.tar.gz
blackbird-obmc-uboot-377a06964370bd887ec15f77f3e4e179c27fe8b9.zip
input: Change LED state bits to conform i8042 compatible keyboard
When sending LED update command to an i8042 compatible keyboard, bit1 is 'Num Lock' and bit2 is 'Caps Lock' in the data byte. But input library defines bit1 as 'Caps Lock' and bit2 as 'Num Lock'. This causes a wrong LED to be set on an i8042 compatible keyboard. Change the LED state bits to be i8042 compatible, and change the keyboard flags as well. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--drivers/input/input.c6
-rw-r--r--include/input.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c
index e02e2643c9..526769692b 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -19,9 +19,9 @@
enum {
/* These correspond to the lights on the keyboard */
- FLAG_NUM_LOCK = 1 << 0,
- FLAG_CAPS_LOCK = 1 << 1,
- FLAG_SCROLL_LOCK = 1 << 2,
+ FLAG_SCROLL_LOCK = 1 << 0,
+ FLAG_NUM_LOCK = 1 << 1,
+ FLAG_CAPS_LOCK = 1 << 2,
/* Special flag ORed with key code to indicate release */
KEY_RELEASE = 1 << 15,
diff --git a/include/input.h b/include/input.h
index ad120e47f5..2902b079b2 100644
--- a/include/input.h
+++ b/include/input.h
@@ -17,8 +17,8 @@ enum {
enum {
/* Keyboard LEDs */
INPUT_LED_SCROLL = 1 << 0,
- INPUT_LED_CAPS = 1 << 1,
- INPUT_LED_NUM = 1 << 2,
+ INPUT_LED_NUM = 1 << 1,
+ INPUT_LED_CAPS = 1 << 2,
};
/*
OpenPOWER on IntegriCloud