diff options
| author | Wealian Liao <whliao@nuvoton.corp-partner.google.com> | 2021-08-12 09:54:07 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-08-12 19:47:40 +0000 |
| commit | 938e1dd6d8e90c45dbc1d656e026440a50a5c4e9 (patch) | |
| tree | 2a50bfc74f6b91464fa112f3978ca6b18cb40c04 | |
| parent | d2f5f74b0e1ba55de0c76ab5304e34e8c90202ec (diff) | |
| download | chrome-ec-938e1dd6d8e90c45dbc1d656e026440a50a5c4e9.tar.gz | |
zephyr: Fix keyscan_config
DT_DRV_COMPAT doesn't have the compatible node. Fix it to use
cros_keyscan.
BRANCH=none
BUG=none
TEST=zmake testall
TEST=check volteer & lazor key by "ksstate on"
Signed-off-by: Wealian Liao <whliao@nuvoton.corp-partner.google.com>
Change-Id: Ib1280f64ac2fa42539fb93d24922626c9adf2278
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3088960
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/projects/trogdor/lazor/keyboard.dts | 2 | ||||
| -rw-r--r-- | zephyr/shim/src/keyscan.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/zephyr/projects/trogdor/lazor/keyboard.dts b/zephyr/projects/trogdor/lazor/keyboard.dts index e9b5cdf0a1..1b683d0eba 100644 --- a/zephyr/projects/trogdor/lazor/keyboard.dts +++ b/zephyr/projects/trogdor/lazor/keyboard.dts @@ -21,8 +21,6 @@ 0x55 /* C10 */ 0xfa /* C11 */ 0xca /* C12 */ - 0 /* C13 - for keypad */ - 0 /* C14 - for keypad */ >; }; }; diff --git a/zephyr/shim/src/keyscan.c b/zephyr/shim/src/keyscan.c index 514d9ffaed..fa8fb11dd2 100644 --- a/zephyr/shim/src/keyscan.c +++ b/zephyr/shim/src/keyscan.c @@ -3,7 +3,7 @@ * found in the LICENSE file. */ -#define DT_DRV_COMPAT cros_kb_raw_keyscan +#define DT_DRV_COMPAT cros_keyscan #include <assert.h> #include <kernel.h> @@ -11,7 +11,7 @@ #include "keyboard_scan.h" -#if DT_NODE_EXISTS(DT_INST(0, cros_kb_raw_keyscan)) +#if DT_NODE_EXISTS(DT_INST(0, cros_keyscan)) /* The keyboard matrix should have at least enough columns for the * standard keyboard with no keypad. |