diff options
| author | Rajesh Kumar <rajesh3.kumar@intel.com> | 2021-12-30 14:19:40 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-01-12 04:53:43 +0000 |
| commit | 37b2f7a5cfaf53582d64b12db2c797f505fb678f (patch) | |
| tree | 4bcf52a5923466a3c6d315245ceef8ae90224a92 | |
| parent | dd99400f9abaf7d74f31ee607b24f7aff3d3f22f (diff) | |
| download | chrome-ec-37b2f7a5cfaf53582d64b12db2c797f505fb678f.tar.gz | |
zephyr: brya: Enable keyboard configuration
Enable keypad, keyboard backlight and volume button on brya
BUG=b:212541307
BRANCH=none
TEST=zmake testall
TEST=EC console command "kblight" and Volume up/down keys
Signed-off-by: Rajesh Kumar <rajesh3.kumar@intel.com>
Change-Id: Ie8ed496b82ef1d6dc2f30f69a45432c56d389680
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3362502
Reviewed-by: Aaron Massey <aaronmassey@google.com>
Reviewed-by: Fabio Baltieri <fabiobaltieri@google.com>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
| -rw-r--r-- | zephyr/dts/bindings/gpio/gpio-enum-name.yaml | 1 | ||||
| -rw-r--r-- | zephyr/projects/brya/brya/gpio.dts | 12 | ||||
| -rw-r--r-- | zephyr/projects/brya/brya/include/gpio_map.h | 3 | ||||
| -rw-r--r-- | zephyr/projects/brya/brya/prj.conf | 7 |
4 files changed, 22 insertions, 1 deletions
diff --git a/zephyr/dts/bindings/gpio/gpio-enum-name.yaml b/zephyr/dts/bindings/gpio/gpio-enum-name.yaml index 27fcd06faa..b086246681 100644 --- a/zephyr/dts/bindings/gpio/gpio-enum-name.yaml +++ b/zephyr/dts/bindings/gpio/gpio-enum-name.yaml @@ -123,6 +123,7 @@ properties: - GPIO_I2C_F_SDA - GPIO_IMVP9_VRRDY_OD - GPIO_KBD_KSO2 + - GPIO_EC_KB_BL_EN_L - GPIO_LID_ACCEL_INT_L - GPIO_LID_OPEN - GPIO_M2_SSD_PLN diff --git a/zephyr/projects/brya/brya/gpio.dts b/zephyr/projects/brya/brya/gpio.dts index 5b54cbd5b6..0e520e6d1b 100644 --- a/zephyr/projects/brya/brya/gpio.dts +++ b/zephyr/projects/brya/brya/gpio.dts @@ -27,6 +27,10 @@ gpios = <&gpioa 3 GPIO_INPUT>; enum-name = "GPIO_BATT_PRES_ODL"; }; + ec_kb_bl_en_l { + gpios = <&gpio8 6 GPIO_OUT_HIGH>; + enum-name = "GPIO_EC_KB_BL_EN_L"; + }; ec_chg_led_y_c1 { gpios = <&gpioc 3 GPIO_OUT_LOW>; enum-name = "GPIO_EC_CHG_LED_Y_C1"; @@ -145,6 +149,14 @@ gpios = <&gpio6 1 GPIO_OUT_HIGH>; enum-name = "GPIO_EN_PP5000_FAN"; }; + ec_voldn_btn_odl { + gpios = <&gpio9 3 GPIO_INPUT_PULL_UP>; + enum-name = "GPIO_VOLUME_DOWN_L"; + }; + ec_volup_btn_odl { + gpios = <&gpio9 7 GPIO_INPUT_PULL_UP>; + enum-name = "GPIO_VOLUME_UP_L"; + }; }; hibernate-wake-pins { diff --git a/zephyr/projects/brya/brya/include/gpio_map.h b/zephyr/projects/brya/brya/include/gpio_map.h index 2dc60fdf0a..61b762f0d0 100644 --- a/zephyr/projects/brya/brya/include/gpio_map.h +++ b/zephyr/projects/brya/brya/include/gpio_map.h @@ -65,6 +65,7 @@ #endif #define GPIO_EC_BATT_PRES_ODL GPIO_BATT_PRES_ODL +#define GPIO_ID_1_EC_KB_BL_EN GPIO_EC_BATT_PRES_ODL #define EC_CROS_GPIO_INTERRUPTS \ GMR_TABLET_MODE_INT(GPIO_TABLET_MODE_L, GPIO_INT_EDGE_BOTH) \ @@ -73,6 +74,8 @@ power_button_interrupt) \ GPIO_INT(GPIO_WP_L, GPIO_INT_EDGE_BOTH, switch_interrupt) \ GPIO_INT(GPIO_AC_PRESENT, GPIO_INT_EDGE_BOTH, extpower_interrupt) \ + GPIO_INT(GPIO_VOLUME_DOWN_L, GPIO_INT_EDGE_BOTH, button_interrupt)\ + GPIO_INT(GPIO_VOLUME_UP_L, GPIO_INT_EDGE_BOTH, button_interrupt) \ LIS2DW12_INT(GPIO_EC_ACCEL_INT, GPIO_INT_EDGE_FALLING) \ LSM6DSO_INT(GPIO_EC_IMU_INT_L, GPIO_INT_EDGE_FALLING) \ POWER_SIGNAL_INT(GPIO_PCH_SLP_S0_L, GPIO_INT_EDGE_BOTH) \ diff --git a/zephyr/projects/brya/brya/prj.conf b/zephyr/projects/brya/brya/prj.conf index 1bfd3ce95b..107d8d013f 100644 --- a/zephyr/projects/brya/brya/prj.conf +++ b/zephyr/projects/brya/brya/prj.conf @@ -98,10 +98,15 @@ CONFIG_PLATFORM_EC_MP2964=y 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_KEYBOARD_KEYPAD=y +CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3=y +CONFIG_PLATFORM_EC_VOLUME_BUTTONS=y CONFIG_PLATFORM_EC_CMD_BUTTON=n CONFIG_CROS_KB_RAW_NPCX=y +# Keyboard Backlight +CONFIG_PLATFORM_EC_PWM_KBLIGHT=y + CONFIG_PLATFORM_EC_WORKAROUND_FLASH_DOWNLOAD_API=y CONFIG_SYSCON=y |