diff options
| author | Yuval Peress <peress@chromium.org> | 2021-06-01 23:45:55 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-06-09 17:35:18 +0000 |
| commit | 5927d4ccc51a131e075c1aad44532caa2faa7ef0 (patch) | |
| tree | 2e31015c1eec8d23d3408666f7ca8fb1b4b3910f | |
| parent | 43b1d390c1451a3083d5ab5fef21a40417a8298c (diff) | |
| download | chrome-ec-5927d4ccc51a131e075c1aad44532caa2faa7ef0.tar.gz | |
zephyr: brya: enable keyboard
BRANCH=none
BUG=b:188605676
TEST=`ksstate on` in EC console, observe keyboard matrix in real time
Signed-off-by: Yuval Peress <peress@chromium.org>
Change-Id: I1b0d26b4ade8298bc91dec2df274d9a159e9bc39
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2932462
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | zephyr/projects/brya/boards/arm/brya/brya.dts | 27 | ||||
| -rw-r--r-- | zephyr/projects/brya/brya/gpio.dts | 10 | ||||
| -rw-r--r-- | zephyr/projects/brya/brya/prj.conf | 10 |
3 files changed, 45 insertions, 2 deletions
diff --git a/zephyr/projects/brya/boards/arm/brya/brya.dts b/zephyr/projects/brya/boards/arm/brya/brya.dts index 4c3b89786d..4e67a1b3ed 100644 --- a/zephyr/projects/brya/boards/arm/brya/brya.dts +++ b/zephyr/projects/brya/boards/arm/brya/brya.dts @@ -126,3 +126,30 @@ status = "okay"; clock-frequency = <I2C_BITRATE_FAST>; }; + +&cros_kb_raw { + /* No KSO2 (it's inverted and implemented by GPIO) */ + pinctrl-0 = <&alt7_no_ksi0_sl + &alt7_no_ksi1_sl + &alt7_no_ksi2_sl + &alt7_no_ksi3_sl + &alt7_no_ksi4_sl + &alt7_no_ksi5_sl + &alt7_no_ksi6_sl + &alt7_no_ksi7_sl + &alt8_no_kso00_sl + &alt8_no_kso01_sl + &alt8_no_kso03_sl + &alt8_no_kso04_sl + &alt8_no_kso05_sl + &alt8_no_kso06_sl + &alt8_no_kso07_sl + &alt9_no_kso08_sl + &alt9_no_kso09_sl + &alt9_no_kso10_sl + &alt9_no_kso11_sl + &alt9_no_kso12_sl + &alt9_no_kso13_sl + &alt9_no_kso14_sl + >; +}; diff --git a/zephyr/projects/brya/brya/gpio.dts b/zephyr/projects/brya/brya/gpio.dts index e22e165b7b..a472d7b8f7 100644 --- a/zephyr/projects/brya/brya/gpio.dts +++ b/zephyr/projects/brya/brya/gpio.dts @@ -47,11 +47,21 @@ enum-name = "GPIO_AC_PRESENT"; label = "ACOK_OD"; }; + ec_kso_02_inv { + gpios = <&gpio1 7 GPIO_OUT_LOW>; + enum-name = "GPIO_KBD_KSO2"; + label = "EC_KSO_02_INV"; + }; pch_wake_odl { gpios = <&gpiob 0 GPIO_ODR_HIGH>; enum-name = "GPIO_EC_PCH_WAKE_ODL"; label = "EC_PCH_WAKE_R_ODL"; }; + pch_int_odl { + gpios = <&gpiob 0 GPIO_ODR_HIGH>; + enum-name = "GPIO_EC_INT_L"; + label = "EC_PCH_INT_ODL"; + }; }; hibernate-wake-pins { diff --git a/zephyr/projects/brya/brya/prj.conf b/zephyr/projects/brya/brya/prj.conf index 09ccbb79bb..f4269f2756 100644 --- a/zephyr/projects/brya/brya/prj.conf +++ b/zephyr/projects/brya/brya/prj.conf @@ -26,11 +26,17 @@ CONFIG_PLATFORM_EC_ESPI=y # Host command CONFIG_PLATFORM_EC_HOSTCMD=y +# Keyboard +CONFIG_PLATFORM_EC_KEYBOARD=y +CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_8042=y +CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y +CONFIG_PLATFORM_EC_VOLUME_BUTTONS=n +CONFIG_PLATFORM_EC_CMD_BUTTON=n +CONFIG_CROS_KB_RAW_NPCX=y + CONFIG_PLATFORM_EC_WORKAROUND_FLASH_DOWNLOAD_API=y # TODO(b/188605676): bring these features up -CONFIG_CROS_KB_RAW_NPCX=n CONFIG_PLATFORM_EC_ADC=n CONFIG_PLATFORM_EC_BACKLIGHT_LID=n CONFIG_PLATFORM_EC_BOARD_VERSION=n -CONFIG_PLATFORM_EC_KEYBOARD=n |