diff options
| -rw-r--r-- | zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts | 35 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/lazor/include/gpio_map.h | 1 | ||||
| -rw-r--r-- | zephyr/projects/trogdor/lazor/prj.conf | 8 |
3 files changed, 42 insertions, 2 deletions
diff --git a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts index 58fefcf80f..b4b352f202 100644 --- a/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts +++ b/zephyr/projects/trogdor/boards/arm/trogdor/trogdor.dts @@ -111,6 +111,41 @@ }; soc { + cros_kb_raw: cros-kb-raw@400a3000 { + compatible = "nuvoton,npcx-cros-kb-raw"; + reg = <0x400a3000 0x2000>; + label = "CROS_KB_RAW_0"; + interrupts = <49 0>; + clocks = <&pcc NPCX_CLOCK_BUS_APB1 NPCX_PWDWN_CTL1 0>; + /* No KSO2 (it's inverted and implemented by GPIO) */ + pinctrl-0 = <&alt7_no_ksi0_sl /* KSI0 PIN31 */ + &alt7_no_ksi1_sl /* KSI1 PIN30 */ + &alt7_no_ksi2_sl /* KSI2 PIN27 */ + &alt7_no_ksi3_sl /* KSI3 PIN26 */ + &alt7_no_ksi4_sl /* KSI4 PIN25 */ + &alt7_no_ksi5_sl /* KSI5 PIN24 */ + &alt7_no_ksi6_sl /* KSI6 PIN23 */ + &alt7_no_ksi7_sl /* KSI7 PIN22 */ + &alt8_no_kso00_sl /* KSO00 PIN21 */ + &alt8_no_kso01_sl /* KSO01 PIN20 */ + &alt8_no_kso03_sl /* KSO03 PIN16 */ + &alt8_no_kso04_sl /* KSO04 PIN15 */ + &alt8_no_kso05_sl /* KSO05 PIN14 */ + &alt8_no_kso06_sl /* KSO06 PIN13 */ + &alt8_no_kso07_sl /* KSO07 PIN12 */ + &alt9_no_kso08_sl /* KSO08 PIN11 */ + &alt9_no_kso09_sl /* KSO09 PIN10 */ + &alt9_no_kso10_sl /* KSO10 PIN07 */ + &alt9_no_kso11_sl /* KSO11 PIN06 */ + &alt9_no_kso12_sl /* KSO12 PIN05 */ + &alt9_no_kso13_sl /* KSO13 PIN04 */ + &alt9_no_kso14_sl /* KSO14 PIN82 */ + >; + wui_maps = <&wui_io31 &wui_io30 &wui_io27 &wui_io26 + &wui_io25 &wui_io24 &wui_io23 &wui_io22>; + status = "disabled"; + }; + fiu0: cros-flash@40020000 { compatible = "nuvoton,npcx-cros-flash"; reg = <0x40020000 0x2000>; diff --git a/zephyr/projects/trogdor/lazor/include/gpio_map.h b/zephyr/projects/trogdor/lazor/include/gpio_map.h index 605ba9a41c..7a0d86d2fd 100644 --- a/zephyr/projects/trogdor/lazor/include/gpio_map.h +++ b/zephyr/projects/trogdor/lazor/include/gpio_map.h @@ -36,6 +36,7 @@ #define GPIO_WARM_RESET_L NAMED_GPIO(warm_reset_l) #define GPIO_WP_L NAMED_GPIO(ec_wp_odl) #define GPIO_EC_INT_L NAMED_GPIO(ec_int_l) +#define GPIO_KBD_KSO2 NAMED_GPIO(ec_kso_02_inv) /* * Set EC_CROS_GPIO_INTERRUPTS to a space-separated list of GPIO_INT items. diff --git a/zephyr/projects/trogdor/lazor/prj.conf b/zephyr/projects/trogdor/lazor/prj.conf index 352d003028..c9c03ca100 100644 --- a/zephyr/projects/trogdor/lazor/prj.conf +++ b/zephyr/projects/trogdor/lazor/prj.conf @@ -41,9 +41,13 @@ CONFIG_PLATFORM_EC_VBOOT=n CONFIG_PLATFORM_EC_MKBP_EVENT=y CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y +# Keyboard +CONFIG_PLATFORM_EC_KEYBOARD=y +CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y +CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y +CONFIG_CROS_KB_RAW_NPCX=y + # TODO(b/182398910): bringup these features CONFIG_PLATFORM_EC_BACKLIGHT_LID=n -CONFIG_PLATFORM_EC_KEYBOARD=n CONFIG_PLATFORM_EC_SWITCH=n CONFIG_PLATFORM_EC_VBOOT_HASH=n -CONFIG_CROS_KB_RAW_NPCX=n |