diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-03-01 16:12:12 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-03-24 22:31:28 +0000 |
| commit | 6404898740d55eb464a52eabbbc84527facb5496 (patch) | |
| tree | 576b8e6d5d5a1e22677d4a262fc446c649eb95e0 /zephyr | |
| parent | 3207cacf7ed8ca1a82bdc493dd5d6df5654a6fb4 (diff) | |
| download | chrome-ec-6404898740d55eb464a52eabbbc84527facb5496.tar.gz | |
zephyr: delbin: bringup keyboard
Enable keyboard support.
BUG=b:180410072
BRANCH=none
TEST=use keyboard in ChromeOS
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I82c6e8a0a289ae10f9aaae532fc5d7359eea3ec0
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2727847
Reviewed-by: Keith Short <keithshort@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'zephyr')
| -rw-r--r-- | zephyr/projects/delbin/boards/arm/delbin/delbin.dts | 35 | ||||
| -rw-r--r-- | zephyr/projects/delbin/include/gpio_map.h | 1 | ||||
| -rw-r--r-- | zephyr/projects/delbin/prj.conf | 2 |
3 files changed, 36 insertions, 2 deletions
diff --git a/zephyr/projects/delbin/boards/arm/delbin/delbin.dts b/zephyr/projects/delbin/boards/arm/delbin/delbin.dts index 7b09e33ec9..cd56322422 100644 --- a/zephyr/projects/delbin/boards/arm/delbin/delbin.dts +++ b/zephyr/projects/delbin/boards/arm/delbin/delbin.dts @@ -358,6 +358,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/delbin/include/gpio_map.h b/zephyr/projects/delbin/include/gpio_map.h index 2648755bf7..a9720151a5 100644 --- a/zephyr/projects/delbin/include/gpio_map.h +++ b/zephyr/projects/delbin/include/gpio_map.h @@ -19,6 +19,7 @@ #define GPIO_EN_PP3300_A NAMED_GPIO(en_pp3300_a) #define GPIO_EN_PP5000 NAMED_GPIO(en_pp5000_a) #define GPIO_EN_PPVAR_VCCIN NAMED_GPIO(en_ppvar_vccin) +#define GPIO_KBD_KSO2 NAMED_GPIO(ec_kso_02_inv) #define GPIO_LID_OPEN NAMED_GPIO(ec_lid_open) #define GPIO_PCH_PWRBTN_L NAMED_GPIO(ec_pch_pwr_btn_odl) #define GPIO_PCH_RSMRST_L NAMED_GPIO(ec_pch_rsmrst_odl) diff --git a/zephyr/projects/delbin/prj.conf b/zephyr/projects/delbin/prj.conf index 6e831df0eb..c7e847f538 100644 --- a/zephyr/projects/delbin/prj.conf +++ b/zephyr/projects/delbin/prj.conf @@ -24,7 +24,5 @@ CONFIG_PLATFORM_EC_POWERSEQ_RTC_RESET=y # TODO(b/180410072): bringup these features CONFIG_PLATFORM_EC_BOARD_VERSION=n -CONFIG_PLATFORM_EC_KEYBOARD=n -CONFIG_CROS_KB_RAW_NPCX=n CONFIG_PLATFORM_EC_VBOOT_HASH=n CONFIG_PLATFORM_EC_VSTORE=n |