diff options
-rw-r--r-- | zephyr/boards/riscv/it8xxx2/it8xxx2.dts | 36 | ||||
-rw-r--r-- | zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig | 20 | ||||
-rw-r--r-- | zephyr/projects/corsola/BUILD.py | 1 | ||||
-rw-r--r-- | zephyr/projects/corsola/gpio_krabby.dts | 2 | ||||
-rw-r--r-- | zephyr/projects/corsola/kb_krabby.dts | 43 | ||||
-rw-r--r-- | zephyr/projects/corsola/prj.conf | 4 | ||||
-rw-r--r-- | zephyr/projects/corsola/prj_krabby.conf | 16 |
7 files changed, 62 insertions, 60 deletions
diff --git a/zephyr/boards/riscv/it8xxx2/it8xxx2.dts b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts index f4a46e335d..82b5bbc7f1 100644 --- a/zephyr/boards/riscv/it8xxx2/it8xxx2.dts +++ b/zephyr/boards/riscv/it8xxx2/it8xxx2.dts @@ -6,9 +6,7 @@ /dts-v1/; #include <cros/ite/it8xxx2.dtsi> -#include <dt-bindings/gpio_defines.h> #include <it8xxx2.dtsi> -#include <dt-bindings/wake_mask_event_defines.h> / { model = "Google IT8XXX2 Baseboard"; @@ -20,36 +18,6 @@ zephyr,flash = &flash0; zephyr,flash-controller = &flashctrl; }; - - ec-mkbp-host-event-wakeup-mask { - compatible = "ec-wake-mask-event"; - wakeup-mask = <( - HOST_EVENT_MASK(HOST_EVENT_AC_CONNECTED) | - HOST_EVENT_MASK(HOST_EVENT_AC_DISCONNECTED) | - HOST_EVENT_MASK(HOST_EVENT_LID_OPEN) | - HOST_EVENT_MASK(HOST_EVENT_POWER_BUTTON) | - HOST_EVENT_MASK(HOST_EVENT_HANG_DETECT) | - HOST_EVENT_MASK(HOST_EVENT_MODE_CHANGE))>; - }; - - ec-mkbp-event-wakeup-mask { - compatible = "ec-wake-mask-event"; - wakeup-mask = <(MKBP_EVENT_KEY_MATRIX | - MKBP_EVENT_HOST_EVENT)>; - }; - - soc { - /delete-node/ kscan@f01d00; - - cros_kb_raw: cros-kb-raw@f01d00 { - compatible = "ite,it8xxx2-cros-kb-raw"; - reg = <0x00f01d00 0x29>; - label = "CROS_KB_RAW_0"; - interrupt-parent = <&intc>; - interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; - status = "disabled"; - }; - }; }; &uart1 { @@ -61,7 +29,3 @@ &ite_uart1_wrapper { status = "okay"; }; - -&cros_kb_raw { - status = "okay"; -}; diff --git a/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig b/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig index 5a07bcffc6..1bef238fb9 100644 --- a/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig +++ b/zephyr/boards/riscv/it8xxx2/it8xxx2_defconfig @@ -40,19 +40,6 @@ CONFIG_SOC_FLASH_ITE_IT8XXX2=y CONFIG_I2C_ITE_IT8XXX2=y CONFIG_PLATFORM_EC_I2C=y -# Keyboard -CONFIG_PLATFORM_EC_KEYBOARD=y -CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y - -# Lid Switch -CONFIG_PLATFORM_EC_LID_SWITCH=y - -# MKBP -CONFIG_PLATFORM_EC_MKBP_EVENT=y -CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y -CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP=y -CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y - # Pinmux Driver CONFIG_PINMUX=y CONFIG_PINMUX_ITE_IT8XXX2=y @@ -60,13 +47,6 @@ CONFIG_PINMUX_ITE_IT8XXX2=y # Power Button CONFIG_PLATFORM_EC_POWER_BUTTON=y -# Power Sequencing -CONFIG_PLATFORM_EC_POWERSEQ=y -CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y -CONFIG_PLATFORM_EC_POWERSEQ_PP5000_CONTROL=n -CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y -CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y - # PWM CONFIG_PWM=y CONFIG_PWM_SHELL=n diff --git a/zephyr/projects/corsola/BUILD.py b/zephyr/projects/corsola/BUILD.py index beb7e3ab7c..4ee076bee3 100644 --- a/zephyr/projects/corsola/BUILD.py +++ b/zephyr/projects/corsola/BUILD.py @@ -30,6 +30,7 @@ register_corsola_project( here / "battery_krabby.dts", here / "gpio_krabby.dts", here / "i2c_krabby.dts", + here / "kb_krabby.dts", here / "motionsense_krabby.dts", here / "pwm_krabby.dts", ], diff --git a/zephyr/projects/corsola/gpio_krabby.dts b/zephyr/projects/corsola/gpio_krabby.dts index 29fc7dd879..0fed46c405 100644 --- a/zephyr/projects/corsola/gpio_krabby.dts +++ b/zephyr/projects/corsola/gpio_krabby.dts @@ -3,6 +3,8 @@ * found in the LICENSE file. */ +#include <dt-bindings/gpio_defines.h> + / { gpiox: gpio@0 { status = "okay"; diff --git a/zephyr/projects/corsola/kb_krabby.dts b/zephyr/projects/corsola/kb_krabby.dts new file mode 100644 index 0000000000..7e4c501df5 --- /dev/null +++ b/zephyr/projects/corsola/kb_krabby.dts @@ -0,0 +1,43 @@ +/* Copyright 2021 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include <dt-bindings/wake_mask_event_defines.h> + +/ { + ec-mkbp-host-event-wakeup-mask { + compatible = "ec-wake-mask-event"; + wakeup-mask = <( + HOST_EVENT_MASK(HOST_EVENT_AC_CONNECTED) | + HOST_EVENT_MASK(HOST_EVENT_AC_DISCONNECTED) | + HOST_EVENT_MASK(HOST_EVENT_LID_OPEN) | + HOST_EVENT_MASK(HOST_EVENT_POWER_BUTTON) | + HOST_EVENT_MASK(HOST_EVENT_HANG_DETECT) | + HOST_EVENT_MASK(HOST_EVENT_MODE_CHANGE))>; + }; + + ec-mkbp-event-wakeup-mask { + compatible = "ec-wake-mask-event"; + wakeup-mask = <(MKBP_EVENT_KEY_MATRIX | + MKBP_EVENT_HOST_EVENT)>; + }; + + /* Override keyboard scanning */ + soc { + /delete-node/ kscan@f01d00; + + cros_kb_raw: cros-kb-raw@f01d00 { + compatible = "ite,it8xxx2-cros-kb-raw"; + reg = <0x00f01d00 0x29>; + label = "CROS_KB_RAW_0"; + interrupt-parent = <&intc>; + interrupts = <13 IRQ_TYPE_LEVEL_HIGH>; + status = "disabled"; + }; + }; +}; + +&cros_kb_raw { + status = "okay"; +}; diff --git a/zephyr/projects/corsola/prj.conf b/zephyr/projects/corsola/prj.conf index c0afed2e08..80f1d03d96 100644 --- a/zephyr/projects/corsola/prj.conf +++ b/zephyr/projects/corsola/prj.conf @@ -1,7 +1,3 @@ # Copyright 2021 The Chromium OS Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - -# AP SoC configuration -CONFIG_AP=y -CONFIG_AP_ARM_MTK_MT8192=y diff --git a/zephyr/projects/corsola/prj_krabby.conf b/zephyr/projects/corsola/prj_krabby.conf index c034209c7f..bc92bdc094 100644 --- a/zephyr/projects/corsola/prj_krabby.conf +++ b/zephyr/projects/corsola/prj_krabby.conf @@ -8,11 +8,25 @@ CONFIG_SHIMMED_TASKS=y CONFIG_BOARD_KRABBY=y +# AP SoC configuration +CONFIG_AP=y +CONFIG_AP_ARM_MTK_MT8192=y + # Bring up options CONFIG_KERNEL_SHELL=y CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED=y CONFIG_GPIO_EMUL=y +# Power Sequencing +CONFIG_PLATFORM_EC_POWERSEQ=y +CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP=y +CONFIG_PLATFORM_EC_POWERSEQ_PP5000_CONTROL=n +CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y +CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK=y + +# Lid Switch +CONFIG_PLATFORM_EC_LID_SWITCH=y + # Battery CONFIG_PLATFORM_EC_BATTERY=y CONFIG_PLATFORM_EC_BATTERY_CUT_OFF=y @@ -52,6 +66,8 @@ CONFIG_PLATFORM_EC_LED_ONOFF_STATES=y CONFIG_PLATFORM_EC_LED_ONOFF_STATES_BAT_LOW=10 # MKBP event mask +CONFIG_PLATFORM_EC_MKBP_EVENT=y +CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES=y CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK=y CONFIG_PLATFORM_EC_MKBP_HOST_EVENT_WAKEUP_MASK=y CONFIG_PLATFORM_EC_MKBP_USE_GPIO=y |