Re: [PATCH 3/3] ARM: dts: cros-ec-keyboard: Add keyboard matrix v3.0

Rob Herring
2024-06-06T00:24:09Z

On Tue, Jun 04, 2024 at 04:09:07PM -0700, Daisuke Nojiri wrote:
> Add support for keyboard matrix version 3.0.

What's that?

Subject is wrong. This is not an ARM dts. 'dt-bindings: ' is the prefix.

>
> Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
> Change-Id: I18957556bcd01c74ded84571638de2583dccb93f

Drop Change-Id for upstream.

> ---
> include/dt-bindings/input/cros-ec-keyboard.h | 104 +++++++++++++++++++
> 1 file changed, 104 insertions(+)
>
> diff --git a/include/dt-bindings/input/cros-ec-keyboard.h b/include/dt-bindings/input/cros-ec-keyboard.h
> index f0ae03634a96..afc12f6aa642 100644
> --- a/include/dt-bindings/input/cros-ec-keyboard.h
> +++ b/include/dt-bindings/input/cros-ec-keyboard.h
> @@ -100,4 +100,108 @@
> MATRIX_KEY(0x07, 0x0b, KEY_UP) \
> MATRIX_KEY(0x07, 0x0c, KEY_LEFT)
>
> +/* No numpad */
> +#define CROS_TOP_ROW_KEYMAP_V30 \
> + MATRIX_KEY(0x00, 0x01, KEY_F11) /* T11 */ \
> + MATRIX_KEY(0x00, 0x02, KEY_F1) /* T1 */ \
> + MATRIX_KEY(0x00, 0x04, KEY_F10) /* T10 */ \
> + MATRIX_KEY(0x00, 0x0b, KEY_F14) /* T14 */ \
> + MATRIX_KEY(0x00, 0x0c, KEY_F15) /* T15 */ \
> + MATRIX_KEY(0x01, 0x02, KEY_F4) /* T4 */ \
> + MATRIX_KEY(0x01, 0x04, KEY_F7) /* T7 */ \
> + MATRIX_KEY(0x01, 0x05, KEY_F12) /* T12 */ \
> + MATRIX_KEY(0x01, 0x09, KEY_F9) /* T9 */ \
> + MATRIX_KEY(0x02, 0x02, KEY_F3) /* T3 */ \
> + MATRIX_KEY(0x02, 0x04, KEY_F6) /* T6 */ \
> + MATRIX_KEY(0x02, 0x0b, KEY_F8) /* T8 */ \
> + MATRIX_KEY(0x03, 0x02, KEY_F2) /* T2 */ \
> + MATRIX_KEY(0x03, 0x05, KEY_F13) /* T13 */ \
> + MATRIX_KEY(0x04, 0x04, KEY_F5) /* T5 */
> +
> +#define CROS_MAIN_KEYMAP_V30 /* Keycode */ \
> + MATRIX_KEY(0x00, 0x03, KEY_B) /* 50 */ \
> + MATRIX_KEY(0x00, 0x05, KEY_N) /* 51 */ \
> + MATRIX_KEY(0x00, 0x06, KEY_RO) /* 56 (JIS) */ \
> + MATRIX_KEY(0x00, 0x08, KEY_EQUAL) /* 13 */ \
> + MATRIX_KEY(0x00, 0x09, KEY_HOME) /* 80 (Numpad) */ \
> + MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT) /* 62 */ \
> + MATRIX_KEY(0x00, 0x10, KEY_FN) /* 127 */ \
> + \
> + MATRIX_KEY(0x01, 0x01, KEY_ESC) /* 110 */ \
> + MATRIX_KEY(0x01, 0x03, KEY_G) /* 35 */ \
> + MATRIX_KEY(0x01, 0x06, KEY_H) /* 36 */ \
> + MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE) /* 41 */ \
> + MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE) /* 15 */ \
> + MATRIX_KEY(0x01, 0x0c, KEY_HENKAN) /* 65 (JIS) */ \
> + MATRIX_KEY(0x01, 0x0e, KEY_LEFTCTRL) /* 58 */ \
> + \
> + MATRIX_KEY(0x02, 0x01, KEY_TAB) /* 16 */ \
> + MATRIX_KEY(0x02, 0x03, KEY_T) /* 21 */ \
> + MATRIX_KEY(0x02, 0x05, KEY_RIGHTBRACE) /* 28 */ \
> + MATRIX_KEY(0x02, 0x06, KEY_Y) /* 22 */ \
> + MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE) /* 27 */ \
> + MATRIX_KEY(0x02, 0x09, KEY_DELETE) /* 76 (Numpad) */ \
> + MATRIX_KEY(0x02, 0x0c, KEY_PAGEUP) /* 85 (Numpad) */ \
> + MATRIX_KEY(0x02, 0x011, KEY_YEN) /* 14 (JIS) */ \
> + \
> + MATRIX_KEY(0x03, 0x00, KEY_LEFTMETA) /* Launcher */ \
> + MATRIX_KEY(0x03, 0x01, KEY_GRAVE) /* 1 */ \
> + MATRIX_KEY(0x03, 0x03, KEY_5) /* 6 */ \
> + MATRIX_KEY(0x03, 0x04, KEY_S) /* 32 */ \
> + MATRIX_KEY(0x03, 0x06, KEY_MINUS) /* 12 */ \
> + MATRIX_KEY(0x03, 0x08, KEY_6) /* 7 */ \
> + MATRIX_KEY(0x03, 0x09, KEY_SLEEP) /* Lock */ \
> + MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH) /* 29 */ \
> + MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN) /* 63 (JIS) */ \
> + MATRIX_KEY(0x03, 0x0e, KEY_RIGHTCTRL) /* 64 */ \
> + \
> + MATRIX_KEY(0x04, 0x01, KEY_A) /* 31 */ \
> + MATRIX_KEY(0x04, 0x02, KEY_D) /* 33 */ \
> + MATRIX_KEY(0x04, 0x03, KEY_F) /* 34 */ \
> + MATRIX_KEY(0x04, 0x05, KEY_K) /* 38 */ \
> + MATRIX_KEY(0x04, 0x06, KEY_J) /* 37 */ \
> + MATRIX_KEY(0x04, 0x08, KEY_SEMICOLON) /* 40 */ \
> + MATRIX_KEY(0x04, 0x09, KEY_L) /* 39 */ \
> + MATRIX_KEY(0x04, 0x0b, KEY_ENTER) /* 43 */ \
> + MATRIX_KEY(0x04, 0x0c, KEY_END) /* 81 (Numpad) */ \
> + \
> + MATRIX_KEY(0x05, 0x01, KEY_1) /* 2 */ \
> + MATRIX_KEY(0x05, 0x02, KEY_COMMA) /* 53 */ \
> + MATRIX_KEY(0x05, 0x03, KEY_DOT) /* 54 */ \
> + MATRIX_KEY(0x05, 0x04, KEY_SLASH) /* 55 */ \
> + MATRIX_KEY(0x05, 0x05, KEY_C) /* 48 */ \
> + MATRIX_KEY(0x05, 0x06, KEY_SPACE) /* 61 */ \
> + MATRIX_KEY(0x05, 0x07, KEY_LEFTSHIFT) /* 44 */ \
> + MATRIX_KEY(0x05, 0x08, KEY_X) /* 47 */ \
> + MATRIX_KEY(0x05, 0x09, KEY_V) /* 49 */ \
> + MATRIX_KEY(0x05, 0x0b, KEY_M) /* 52 */ \
> + MATRIX_KEY(0x05, 0x0c, KEY_PAGEDOWN) /* 86 (Numpad) */ \
> + \
> + MATRIX_KEY(0x06, 0x01, KEY_Z) /* 46 */ \
> + MATRIX_KEY(0x06, 0x02, KEY_3) /* 4 */ \
> + MATRIX_KEY(0x06, 0x03, KEY_4) /* 5 */ \
> + MATRIX_KEY(0x06, 0x04, KEY_2) /* 3 */ \
> + MATRIX_KEY(0x06, 0x05, KEY_8) /* 9 */ \
> + MATRIX_KEY(0x06, 0x06, KEY_0) /* 11 */ \
> + MATRIX_KEY(0x06, 0x08, KEY_7) /* 8 */ \
> + MATRIX_KEY(0x06, 0x09, KEY_9) /* 10 */ \
> + MATRIX_KEY(0x06, 0x0b, KEY_DOWN) /* 84 */ \
> + MATRIX_KEY(0x06, 0x0c, KEY_RIGHT) /* 89 */ \
> + MATRIX_KEY(0x06, 0x0d, KEY_LEFTALT) /* 60 */ \
> + MATRIX_KEY(0x06, 0x0f, KEY_ASSISTANT) /* 128 */ \
> + MATRIX_KEY(0x06, 0x11, KEY_BACKSLASH) /* 42 (JIS, ISO) */ \
> + \
> + MATRIX_KEY(0x07, 0x01, KEY_U) /* 23 */ \
> + MATRIX_KEY(0x07, 0x02, KEY_I) /* 24 */ \
> + MATRIX_KEY(0x07, 0x03, KEY_O) /* 25 */ \
> + MATRIX_KEY(0x07, 0x04, KEY_P) /* 26 */ \
> + MATRIX_KEY(0x07, 0x05, KEY_Q) /* 17 */ \
> + MATRIX_KEY(0x07, 0x06, KEY_W) /* 18 */ \
> + MATRIX_KEY(0x07, 0x07, KEY_RIGHTSHIFT) /* 57 */ \
> + MATRIX_KEY(0x07, 0x08, KEY_E) /* 19 */ \
> + MATRIX_KEY(0x07, 0x09, KEY_R) /* 20 */ \
> + MATRIX_KEY(0x07, 0x0b, KEY_UP) /* 83 */ \
> + MATRIX_KEY(0x07, 0x0c, KEY_LEFT) /* 79 */ \
> + MATRIX_KEY(0x07, 0x11, KEY_102ND) /* 45 (ISO) */
> +
> #endif /* _CROS_EC_KEYBOARD_H */
> --
> 2.45.1.288.g0e0cd299f1-goog
>