Skip to content

Commit 46f4680

Browse files
committed
riscv: spacemit: enable FML13V05 EC keyboard
Add the K3 eSPI controller and pin group, leaving the common controller node disabled. Enable it on FML13V05 with the EC shared-memory window, GPIO43 rising-edge interrupt and the vendor 8x16 keyboard matrix map. Enable the bool eSPI controller and Chrome platform menu in defconfig. Build the EC core, eSPI transport and existing EC keyboard driver as modules; select the protocol layer through the existing dependency. Keep the shared EC core and keyboard input driver unchanged. Build all three K3 DTBs and boot the complete module configuration on FML13V05. Verify udev autoload of the four keyboard-path modules, IRQ registration and 93 read-only EC queries. The user confirmed physical keyboard input; Fn combinations were not fully recaptured in this run. DT/config adaptation and verification were performed with Codex assistance using the vendor 6.18.3 board configuration as the reference. Signed-off-by: Wang Yang <yang.wang@deepcomputing.io>
1 parent f3fb586 commit 46f4680

4 files changed

Lines changed: 202 additions & 0 deletions

File tree

‎arch/riscv/boot/dts/spacemit/k3-deepcomputing-fml13v05.dts‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright (C) 2026 DeepComputing (HK) Limited
44
*/
55
#include <dt-bindings/gpio/gpio.h>
6+
#include <dt-bindings/input/input.h>
67

78
#include "k3.dtsi"
89
#include "k3-display.dtsi"
@@ -334,3 +335,139 @@
334335
pinctrl-0 = <&dp1_1_cfg>;
335336
status = "okay";
336337
};
338+
339+
&espi0 {
340+
pinctrl-names = "default";
341+
pinctrl-0 = <&espi0_2_cfg>;
342+
status = "okay";
343+
};
344+
345+
&ec {
346+
interrupt-parent = <&gpio>;
347+
interrupts = <1 11 IRQ_TYPE_EDGE_RISING>;
348+
status = "okay";
349+
350+
keyboard-controller {
351+
compatible = "google,cros-ec-keyb";
352+
keypad,num-rows = <8>;
353+
keypad,num-columns = <16>;
354+
linux,keymap = <
355+
/* Row 0 */
356+
MATRIX_KEY(0x00, 0x00, KEY_C) /* ID: 48 */
357+
MATRIX_KEY(0x00, 0x01, KEY_DELETE) /* ID: 76 */
358+
MATRIX_KEY(0x00, 0x02, KEY_Q) /* ID: 17 */
359+
MATRIX_KEY(0x00, 0x03, KEY_RIGHTALT) /* ID: 62 */
360+
MATRIX_KEY(0x00, 0x05, KEY_X) /* ID: 47 */
361+
MATRIX_KEY(0x00, 0x06, KEY_V) /* ID: 49 */
362+
MATRIX_KEY(0x00, 0x07, KEY_M) /* ID: 52 */
363+
MATRIX_KEY(0x00, 0x08, KEY_DOT) /* ID: 54 */
364+
MATRIX_KEY(0x00, 0x09, KEY_RIGHTSHIFT) /* ID: 57 */
365+
MATRIX_KEY(0x00, 0x0a, KEY_COMMA) /* ID: 53 */
366+
MATRIX_KEY(0x00, 0x0c, KEY_RIGHTCTRL) /* ID: 64 */
367+
MATRIX_KEY(0x00, 0x0d, KEY_SLASH) /* ID: 55 */
368+
MATRIX_KEY(0x00, 0x0e, KEY_APOSTROPHE) /* ID: 41 (' ) */
369+
370+
/* Row 1 */
371+
MATRIX_KEY(0x01, 0x03, KEY_LEFTALT) /* ID: 60 */
372+
MATRIX_KEY(0x01, 0x04, KEY_SPACE) /* ID: 61 */
373+
MATRIX_KEY(0x01, 0x05, KEY_Z) /* ID: 46 */
374+
MATRIX_KEY(0x01, 0x06, KEY_B) /* ID: 50 */
375+
MATRIX_KEY(0x01, 0x07, KEY_N) /* ID: 51 */
376+
MATRIX_KEY(0x01, 0x08, KEY_DOWN) /* ID: 84-1 */
377+
MATRIX_KEY(0x01, 0x09, KEY_LEFTSHIFT) /* ID: 44 */
378+
MATRIX_KEY(0x01, 0x0c, KEY_LEFTCTRL) /* ID: 58 */
379+
MATRIX_KEY(0x01, 0x0d, KEY_UP) /* ID: 83-1 */
380+
MATRIX_KEY(0x01, 0x0e, KEY_ENTER) /* ID: 43 */
381+
MATRIX_KEY(0x01, 0x0f, KEY_F8) /* ID: 119 */
382+
383+
/* Row 2 */
384+
MATRIX_KEY(0x02, 0x02, KEY_FN) /* ID: 59 */
385+
MATRIX_KEY(0x02, 0x04, KEY_E) /* ID: 19 */
386+
MATRIX_KEY(0x02, 0x05, KEY_F2) /* ID: 113 */
387+
MATRIX_KEY(0x02, 0x06, KEY_G) /* ID: 35 */
388+
MATRIX_KEY(0x02, 0x07, KEY_H) /* ID: 36 */
389+
MATRIX_KEY(0x02, 0x08, KEY_BACKSLASH) /* ID: 29/42 */
390+
MATRIX_KEY(0x02, 0x0a, KEY_F7) /* ID: 118 */
391+
MATRIX_KEY(0x02, 0x0d, KEY_MINUS) /* ID: 12 */
392+
MATRIX_KEY(0x02, 0x0f, KEY_RIGHT) /* ID: 89-1 */
393+
394+
/* Row 3 */
395+
MATRIX_KEY(0x03, 0x01, KEY_LEFTMETA) /* ID: 127 (Win) */
396+
MATRIX_KEY(0x03, 0x02, KEY_TAB) /* ID: 16 */
397+
MATRIX_KEY(0x03, 0x04, KEY_F4) /* ID: 115 */
398+
MATRIX_KEY(0x03, 0x05, KEY_F1) /* ID: 112 */
399+
MATRIX_KEY(0x03, 0x06, KEY_T) /* ID: 21 */
400+
MATRIX_KEY(0x03, 0x07, KEY_Y) /* ID: 22 */
401+
MATRIX_KEY(0x03, 0x08, KEY_O) /* ID: 25 */
402+
MATRIX_KEY(0x03, 0x0a, KEY_F6) /* ID: 117 */
403+
MATRIX_KEY(0x03, 0x0b, KEY_F9) /* ID: 120 */
404+
MATRIX_KEY(0x03, 0x0d, KEY_F12) /* ID: 123 */
405+
406+
/* Row 4 */
407+
MATRIX_KEY(0x04, 0x02, KEY_GRAVE) /* ID: 1 (~) */
408+
MATRIX_KEY(0x04, 0x04, KEY_CAPSLOCK) /* ID: 30 */
409+
MATRIX_KEY(0x04, 0x05, KEY_S) /* ID: 32 */
410+
MATRIX_KEY(0x04, 0x06, KEY_5) /* ID: 6 */
411+
MATRIX_KEY(0x04, 0x07, KEY_6) /* ID: 7 */
412+
MATRIX_KEY(0x04, 0x08, KEY_F10) /* ID: 121 */
413+
MATRIX_KEY(0x04, 0x0a, KEY_F5) /* ID: 116 */
414+
MATRIX_KEY(0x04, 0x0d, KEY_0) /* ID: 11 */
415+
MATRIX_KEY(0x04, 0x0e, KEY_EQUAL) /* ID: 13 */
416+
417+
/* Row 5 */
418+
MATRIX_KEY(0x05, 0x02, KEY_1) /* ID: 2 */
419+
MATRIX_KEY(0x05, 0x04, KEY_3) /* ID: 4 */
420+
MATRIX_KEY(0x05, 0x05, KEY_2) /* ID: 3 */
421+
MATRIX_KEY(0x05, 0x06, KEY_4) /* ID: 5 */
422+
MATRIX_KEY(0x05, 0x07, KEY_7) /* ID: 8 */
423+
MATRIX_KEY(0x05, 0x08, KEY_9) /* ID: 10 */
424+
MATRIX_KEY(0x05, 0x0a, KEY_8) /* ID: 9 */
425+
MATRIX_KEY(0x05, 0x0b, KEY_102ND) /* ID: 45 */
426+
MATRIX_KEY(0x05, 0x0d, KEY_P) /* ID: 26 */
427+
MATRIX_KEY(0x05, 0x0e, KEY_BACKSPACE) /* ID: 15 */
428+
429+
/* Row 6 */
430+
MATRIX_KEY(0x06, 0x04, KEY_F3) /* ID: 114 */
431+
MATRIX_KEY(0x06, 0x05, KEY_W) /* ID: 18 */
432+
MATRIX_KEY(0x06, 0x06, KEY_R) /* ID: 20 */
433+
MATRIX_KEY(0x06, 0x07, KEY_U) /* ID: 23 */
434+
MATRIX_KEY(0x06, 0x08, KEY_F11) /* ID: 122 */
435+
MATRIX_KEY(0x06, 0x0a, KEY_I) /* ID: 24 */
436+
MATRIX_KEY(0x06, 0x0b, KEY_LEFT) /* ID: 79-1 */
437+
MATRIX_KEY(0x06, 0x0d, KEY_LEFTBRACE) /* ID: 27 ([) */
438+
MATRIX_KEY(0x06, 0x0e, KEY_RIGHTBRACE) /* ID: 28 (]) */
439+
440+
/* Row 7 */
441+
MATRIX_KEY(0x07, 0x02, KEY_A) /* ID: 31 */
442+
MATRIX_KEY(0x07, 0x05, KEY_ESC) /* ID: 110 */
443+
MATRIX_KEY(0x07, 0x06, KEY_F) /* ID: 34 */
444+
MATRIX_KEY(0x07, 0x07, KEY_J) /* ID: 37 */
445+
MATRIX_KEY(0x07, 0x08, KEY_L) /* ID: 39 */
446+
MATRIX_KEY(0x07, 0x0a, KEY_K) /* ID: 38 */
447+
MATRIX_KEY(0x07, 0x0d, KEY_SEMICOLON) /* ID: 40 */
448+
MATRIX_KEY(0x07, 0x0e, KEY_D) /* ID: 33 */
449+
450+
/*
451+
* Fn layer (row + 8):
452+
* F1..F12 -> media/system keys when Fn is held.
453+
*/
454+
MATRIX_KEY(0x08, 0x01, KEY_INSERT) /* Fn+Delete = Insert */
455+
MATRIX_KEY(0x09, 0x08, KEY_PAGEDOWN) /* Fn+Down */
456+
MATRIX_KEY(0x09, 0x0d, KEY_PAGEUP) /* Fn+Up */
457+
MATRIX_KEY(0x09, 0x0f, KEY_BRIGHTNESSUP) /* Fn+F8 */
458+
MATRIX_KEY(0x0a, 0x05, KEY_VOLUMEDOWN) /* Fn+F2 */
459+
MATRIX_KEY(0x0a, 0x0a, KEY_BRIGHTNESSDOWN) /* Fn+F7 */
460+
MATRIX_KEY(0x0a, 0x0f, KEY_END) /* Fn+Right */
461+
MATRIX_KEY(0x0b, 0x04, KEY_PREVIOUSSONG) /* Fn+F4 */
462+
MATRIX_KEY(0x0b, 0x05, KEY_MUTE) /* Fn+F1 */
463+
MATRIX_KEY(0x0b, 0x0a, KEY_NEXTSONG) /* Fn+F6 */
464+
MATRIX_KEY(0x0b, 0x0b, KEY_SWITCHVIDEOMODE) /* Fn+F9 */
465+
MATRIX_KEY(0x0b, 0x0d, KEY_CONFIG) /* Fn+F12 */
466+
MATRIX_KEY(0x0c, 0x08, KEY_RFKILL) /* Fn+F10 */
467+
MATRIX_KEY(0x0c, 0x0a, KEY_PLAYPAUSE) /* Fn+F5 */
468+
MATRIX_KEY(0x0e, 0x04, KEY_VOLUMEUP) /* Fn+F3 */
469+
MATRIX_KEY(0x0e, 0x08, KEY_SYSRQ) /* Fn+F11 */
470+
MATRIX_KEY(0x0e, 0x0b, KEY_HOME) /* Fn+Left */
471+
>;
472+
};
473+
};

‎arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,30 @@
1111
#define K3_GPIO(x) (x / 32) (x % 32)
1212

1313
&pinctrl {
14+
espi0_2_cfg: espi0-2-cfg {
15+
espi0-0-pins {
16+
pinmux = <K3_PADCONF(91, 4)>, /* espi0 d0 */
17+
<K3_PADCONF(92, 4)>, /* espi0 d1 */
18+
<K3_PADCONF(93, 4)>, /* espi0 d2 */
19+
<K3_PADCONF(94, 4)>, /* espi0 d3 */
20+
<K3_PADCONF(95, 4)>, /* espi0 cs */
21+
<K3_PADCONF(97, 4)>, /* espi0 reset */
22+
<K3_PADCONF(98, 4)>; /* espi0 alert */
23+
24+
bias-pull-up; /* normal pull-up */
25+
drive-strength = <25>; /* DS8 */
26+
power-source = <1800>;
27+
};
28+
29+
espi0-1-pins {
30+
pinmux = <K3_PADCONF(96, 4)>; /* espi0 clk */
31+
32+
bias-pull-down; /* normal pull-down */
33+
drive-strength = <25>; /* DS8 */
34+
power-source = <1800>;
35+
};
36+
};
37+
1438
/omit-if-no-ref/
1539
dp1_1_cfg: dp1-1-cfg {
1640
dp1-pins {

‎arch/riscv/boot/dts/spacemit/k3.dtsi‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,6 +1103,42 @@
11031103
status = "disabled";
11041104
};
11051105

1106+
espi0: espi@cac8c000 {
1107+
compatible = "spacemit,k3-espi";
1108+
reg = <0x0 0xcac8c000 0x0 0x1000>;
1109+
#address-cells = <1>;
1110+
#size-cells = <1>;
1111+
ranges = <0x0 0x0 0x84000000 0x1000>;
1112+
pr-mem-base0 = <0x84000000>;
1113+
pr-mem-base1 = <0xcac8c000>;
1114+
clocks = <&syscon_apmu CLK_APMU_ESPI_SCLK_SRC>,
1115+
<&syscon_apmu CLK_APMU_ESPI_SCLK>,
1116+
<&syscon_apmu CLK_APMU_ESPI_MCLK>;
1117+
clock-names = "sclk_src", "sclk", "mclk";
1118+
resets = <&syscon_apmu RESET_APMU_ESPI_MCLK>,
1119+
<&syscon_apmu RESET_APMU_ESPI_SCLK>;
1120+
assigned-clocks = <&syscon_apmu CLK_APMU_ESPI_SCLK>;
1121+
assigned-clock-parents = <&syscon_apmu CLK_APMU_ESPI_SCLK_SRC>;
1122+
operating-frequency = <20>;
1123+
io-mode = "single";
1124+
alert-mode = "io1";
1125+
alert-type = "open-drain";
1126+
watchdog-timeout = <0xffff>;
1127+
crc-enable;
1128+
auto-gating-enable;
1129+
peripheral-channel-enable;
1130+
vwire-channel-enable;
1131+
oob-channel-enable;
1132+
flash-channel-enable;
1133+
status = "disabled";
1134+
1135+
ec: ec@0 {
1136+
compatible = "google,cros-ec-espi";
1137+
reg = <0x0 0x1000>;
1138+
status = "disabled";
1139+
};
1140+
};
1141+
11061142
gpio: gpio@d4019000 {
11071143
compatible = "spacemit,k3-gpio";
11081144
reg = <0x0 0xd4019000 0x0 0x100>;

‎arch/riscv/configs/defconfig‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,9 @@ CONFIG_IWLMVM=m
404404
CONFIG_RTW89=y
405405
CONFIG_RTW89_8852BE=y
406406
CONFIG_INPUT_MOUSEDEV=y
407+
CONFIG_SPACEMIT_ESPI_BUS=y
407408
CONFIG_INPUT_EVDEV=y
409+
CONFIG_KEYBOARD_CROS_EC=m
408410
CONFIG_KEYBOARD_GPIO=y
409411
CONFIG_SERIAL_8250=y
410412
CONFIG_SERIAL_8250_CONSOLE=y
@@ -515,6 +517,9 @@ CONFIG_PWM=y
515517
CONFIG_PWM_PXA=m
516518
CONFIG_PHY_SPACEMIT_K1_USB2=y
517519
CONFIG_PHY_SPACEMIT_K3_COMBO_PHY=y
520+
CONFIG_CHROME_PLATFORMS=y
521+
CONFIG_CROS_EC=m
522+
CONFIG_CROS_EC_ESPI=m
518523
CONFIG_LIBNVDIMM=y
519524
CONFIG_VALIDATE_FS_PARSER=y
520525
CONFIG_EXT4_FS=y

0 commit comments

Comments
 (0)