diff options
| author | Jack Rosenthal <jrosenth@chromium.org> | 2021-11-04 12:11:58 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-11-05 04:22:34 +0000 |
| commit | 252457d4b21f46889eebad61d4c0a65331919cec (patch) | |
| tree | 01856c4d31d710b20e85a74c8d7b5836e35c3b98 /zephyr/shim/include | |
| parent | 08f5a1e6fc2c9467230444ac9b582dcf4d9f0068 (diff) | |
| download | chrome-ec-stabilize-14411.B-ish.tar.gz | |
ish: Trim down the release branchstabilize-wristpin-14469.59.B-ishstabilize-voshyr-14637.B-ishstabilize-quickfix-14695.187.B-ishstabilize-quickfix-14695.124.B-ishstabilize-quickfix-14526.91.B-ishstabilize-14695.85.B-ishstabilize-14695.107.B-ishstabilize-14682.B-ishstabilize-14633.B-ishstabilize-14616.B-ishstabilize-14589.B-ishstabilize-14588.98.B-ishstabilize-14588.14.B-ishstabilize-14588.123.B-ishstabilize-14536.B-ishstabilize-14532.B-ishstabilize-14528.B-ishstabilize-14526.89.B-ishstabilize-14526.84.B-ishstabilize-14526.73.B-ishstabilize-14526.67.B-ishstabilize-14526.57.B-ishstabilize-14498.B-ishstabilize-14496.B-ishstabilize-14477.B-ishstabilize-14469.9.B-ishstabilize-14469.8.B-ishstabilize-14469.58.B-ishstabilize-14469.41.B-ishstabilize-14442.B-ishstabilize-14438.B-ishstabilize-14411.B-ishstabilize-14396.B-ishstabilize-14395.B-ishstabilize-14388.62.B-ishstabilize-14388.61.B-ishstabilize-14388.52.B-ishstabilize-14385.B-ishstabilize-14345.B-ishstabilize-14336.B-ishstabilize-14333.B-ishrelease-R99-14469.B-ishrelease-R98-14388.B-ishrelease-R102-14695.B-ishrelease-R101-14588.B-ishrelease-R100-14526.B-ishfirmware-cherry-14454.B-ishfirmware-brya-14505.B-ishfirmware-brya-14505.71.B-ishfactory-kukui-14374.B-ishfactory-guybrush-14600.B-ishfactory-cherry-14455.B-ishfactory-brya-14517.B-ish
In the interest of making long-term branch maintenance incur as little
technical debt on us as possible, we should not maintain any files on
the branch we are not actually using.
This has the added effect of making it extremely clear when merging CLs
from the main branch when changes have the possibility to affect us.
The follow-on CL adds a convenience script to actually pull updates from
the main branch and generate a CL for the update.
BUG=b:204206272
BRANCH=ish
TEST=make BOARD=arcada_ish && make BOARD=drallion_ish
Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I17e4694c38219b5a0823e0a3e55a28d1348f4b18
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3262038
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Tom Hughes <tomhughes@chromium.org>
Diffstat (limited to 'zephyr/shim/include')
27 files changed, 0 insertions, 2985 deletions
diff --git a/zephyr/shim/include/adc_chip.h b/zephyr/shim/include/adc_chip.h deleted file mode 100644 index c51cdfbb30..0000000000 --- a/zephyr/shim/include/adc_chip.h +++ /dev/null @@ -1,16 +0,0 @@ -/* 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. - */ - -/* - * This file is left intentionally blank. It is required since the - * platform/ec/common/adc.c file includes it. Normally, this file - * would define chip specific ADC configs and would reside under - * platform/ec/chip/... - */ - -#ifndef __CROS_EC_ADC_CHIP_H -#define __CROS_EC_ADC_CHIP_H - -#endif /* __CROS_EC_ADC_CHIP_H */ diff --git a/zephyr/shim/include/atomic.h b/zephyr/shim/include/atomic.h deleted file mode 100644 index ad534d116b..0000000000 --- a/zephyr/shim/include/atomic.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_ATOMIC_H -#define __CROS_EC_ATOMIC_H - -#include <sys/atomic.h> - -static inline atomic_val_t atomic_clear_bits(atomic_t *addr, atomic_val_t bits) -{ - return atomic_and(addr, ~bits); -} - -#endif /* __CROS_EC_ATOMIC_H */ diff --git a/zephyr/shim/include/battery_enum.h b/zephyr/shim/include/battery_enum.h deleted file mode 100644 index a461829a31..0000000000 --- a/zephyr/shim/include/battery_enum.h +++ /dev/null @@ -1,36 +0,0 @@ -/* 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. - */ - -#ifndef __CROS_EC_CONFIG_CHIP_H -#error "This file must only be included from config_chip.h and it should be" \ - "included in all zephyr builds automatically" -#endif - -#define BATTERY_ENUM(val) DT_CAT(BATTERY_, val) -#define BATTERY_TYPE(id) BATTERY_ENUM(DT_STRING_UPPER_TOKEN(id, enum_name)) -#define BATTERY_TYPE_WITH_COMMA(id) BATTERY_TYPE(id), - -/* This produces a list of BATTERY_<ENUM_NAME> identifiers */ -#if DT_NODE_EXISTS(DT_PATH(batteries)) - -enum battery_type { - DT_FOREACH_CHILD(DT_PATH(batteries), BATTERY_TYPE_WITH_COMMA) - - BATTERY_TYPE_COUNT, -}; - -#else /* DT_NODE_EXISTS(DT_PATH(batteries)) */ - -enum battery_type { -#if DT_NODE_EXISTS(DT_PATH(named_batteries)) - DT_FOREACH_CHILD(DT_PATH(named_batteries), BATTERY_TYPE_WITH_COMMA) -#endif - - BATTERY_TYPE_COUNT, -}; - -#endif /* DT_NODE_EXISTS(DT_PATH(batteries)) */ - -#undef BATTERY_TYPE_WITH_COMMA diff --git a/zephyr/shim/include/bbram.h b/zephyr/shim/include/bbram.h deleted file mode 100644 index 3eba4b157b..0000000000 --- a/zephyr/shim/include/bbram.h +++ /dev/null @@ -1,16 +0,0 @@ -/* 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. - */ - -#ifndef ZEPHYR_SHIM_INCLUDE_BBRAM_H_ -#define ZEPHYR_SHIM_INCLUDE_BBRAM_H_ - -#include <devicetree.h> - -#define BBRAM_SIZE DT_REG_SIZE_BY_NAME(DT_NODELABEL(bbram), memory) -#define BBRAM_ADDR DT_REG_ADDR_BY_NAME(DT_NODELABEL(bbram), memory) -#define BBRAM(offset) REG8(BBRAM_ADDR + offset) -#define BBRAM_BKUP_STS BBRAM(CONFIG_BBRAM_BKUP_STS) - -#endif /* ZEPHYR_SHIM_INCLUDE_BBRAM_H_ */ diff --git a/zephyr/shim/include/board.h b/zephyr/shim/include/board.h deleted file mode 100644 index df3ef33c0e..0000000000 --- a/zephyr/shim/include/board.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __BOARD_H -#define __BOARD_H - -#include <devicetree.h> - -/* Included shimed version of gpio signal. */ -#include "gpio_signal.h" - -/* Include board specific gpio mapping/aliases if named_pgios node exists */ -#if DT_NODE_EXISTS(DT_PATH(named_gpios)) -#include "gpio_map.h" -#endif - -/* Include board specific i2c mapping if I2C is enabled. */ -#if defined(CONFIG_I2C) -#include "i2c/i2c.h" -#endif - -#ifdef CONFIG_PWM -#include "pwm_map.h" -#endif - -/* Include board specific sensor configuration if motionsense is enabled */ -#ifdef CONFIG_MOTIONSENSE -#include "motionsense_sensors.h" -#endif - -#endif /* __BOARD_H */ diff --git a/zephyr/shim/include/builtin/assert.h b/zephyr/shim/include/builtin/assert.h deleted file mode 100644 index 21a6c5b3d7..0000000000 --- a/zephyr/shim/include/builtin/assert.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_ASSERT_H -#define __CROS_EC_ASSERT_H - -#include <sys/__assert.h> - -#undef ASSERT -#undef assert -#define ASSERT __ASSERT_NO_MSG -#define assert __ASSERT_NO_MSG - -#endif /* __CROS_EC_ASSERT_H */ diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h deleted file mode 100644 index 04d2ca1d5d..0000000000 --- a/zephyr/shim/include/config_chip.h +++ /dev/null @@ -1,1811 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_CONFIG_CHIP_H -#define __CROS_EC_CONFIG_CHIP_H - -#include <devicetree.h> -#include <autoconf.h> - -/* - * The battery enum is used in various drivers and these assume that it is - * always available (defined in board.h). With Zephyr we don't include board.h - * so we have a battery_enum.h header in the shim which defines - * enum battery_type based on settings in the device tree. Include that here. - */ -#ifdef CONFIG_PLATFORM_EC_BATTERY -#include "battery_enum.h" -#endif - -/* - * This file translates Kconfig options to platform/ec options. - * - * Options which are from Zephyr platform/ec module (Kconfig) start - * with CONFIG_PLATFORM_EC_, and can be found in the Kconfig file. - * - * Options which are for the platform/ec configuration can be found in - * common/config.h. - */ - -/* - * Obsolete configs - these are options that are not needed, either because - * Zephyr features directly replace the option, or because the config option - * will not be used with Zephyr OS. - */ - -/* - * ROM resident support. The ROM resident capabilities in the Chromium OS - * code are used with EC chipsets that provide more flash space than - * executable RAM. These options allow storing the initialized data into - * an unused area of flash where it is copied directly from flash into data - * RAM by the early boot code. - * - * When ROM resident is disabled, the initialized data is stored in the main - * image, copied from flash to executable RAM by the chip boot loader, and - * then copied from executable RAM to data RAM by the early boot code. - * - * Supporting this under Zephyr would require linker changes to the common - * Zephyr linking. - */ -#undef CONFIG_CHIP_DATA_IN_INIT_ROM -#undef CONFIG_CHIP_INIT_ROM_REGION -#undef CONFIG_RO_ROM_RESIDENT_MEM_OFF -#undef CONFIG_RO_ROM_RESIDENT_SIZE -#undef CONFIG_RW_ROM_RESIDENT_MEM_OFF -#undef CONFIG_RW_ROM_RESIDENT_SIZE - -/* - * ECOS specific options, not used in Zephyr. - */ -#undef CONFIG_CONSOLE_UART /* Only used by the Chromium EC chip drivers */ -#undef CONFIG_I2C_MULTI_PORT_CONTROLLER /* Not required by I2C shim */ -#undef CONFIG_IRQ_COUNT /* Only used by Chromium EC core drivers */ -#undef CONFIG_KEYBOARD_KSO_HIGH_DRIVE /* Used by the Chromium EC chip drivers */ -#undef CONFIG_LTO /* Link time optimization enabled by Zephyr build system */ -#undef CONFIG_STACK_SIZE /* Only used in Chromium EC core init code */ -#ifndef CONFIG_FPU -#undef CONFIG_FPU /* Used in Zephyr as well, enabled in Kconfig directly */ -#endif -#ifndef CONFIG_WATCHDOG -#undef CONFIG_WATCHDOG /* Used in Zephyr as well, enabled in Kconfig directly */ -#endif - -/* - * The Zephyr I2C shell command provides the same functionality as the Chromium - * EC i2cscan and i2cxfer commands, so they are always disabled. - */ -#undef CONFIG_CMD_I2C_SCAN -#undef CONFIG_CMD_I2C_XFER - -/* - * This not used by the Zephyr code since we always make cros_crc8() available. - * Define it here to reduce the delta from the ECOS CONFIG. - */ -#undef CONFIG_CRC8 -#define CONFIG_CRC8 - -/* - * This is not used by the Zephyr code. - * Define it here to reduce the delta from the ECOS CONFIG. - */ -#undef CONFIG_CHIP_PRE_INIT -#define CONFIG_CHIP_PRE_INIT - -#undef CONFIG_BC12_SINGLE_DRIVER -#ifdef CONFIG_PLATFORM_EC_BC12_SINGLE_DRIVER -#define CONFIG_BC12_SINGLE_DRIVER -#endif - -#undef CONFIG_CHARGER_SINGLE_CHIP -#define CONFIG_CHARGER_SINGLE_CHIP - -/* EC chipset configuration */ -#define HOOK_TICK_INTERVAL CONFIG_CROS_EC_HOOK_TICK_INTERVAL -#define HOOK_TICK_INTERVAL_MS (HOOK_TICK_INTERVAL / 1000) - -/* Chipset and power configuration */ -#ifdef CONFIG_AP_ARM_QUALCOMM_SC7180 -#define CONFIG_CHIPSET_SC7180 -#endif - -#ifdef CONFIG_AP_ARM_QUALCOMM_SC7280 -#define CONFIG_CHIPSET_SC7280 -#endif - -#ifdef CONFIG_AP_X86_INTEL_CML -#define CONFIG_CHIPSET_COMETLAKE -#define CONFIG_CHIPSET_HAS_PRE_INIT_CALLBACK -#endif - -#ifdef CONFIG_AP_X86_INTEL_TGL -#define CONFIG_CHIPSET_TIGERLAKE -#endif - -#undef CONFIG_THROTTLE_AP -#ifdef CONFIG_PLATFORM_EC_THROTTLE_AP -#define CONFIG_THROTTLE_AP -#endif - -#undef CONFIG_CHIPSET_CAN_THROTTLE -#ifdef CONFIG_PLATFORM_EC_CHIPSET_CAN_THROTTLE -#define CONFIG_CHIPSET_CAN_THROTTLE -#endif - -#undef CONFIG_CMD_APTHROTTLE -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_APTHROTTLE -#define CONFIG_CMD_APTHROTTLE -#endif - -#undef CONFIG_BACKLIGHT_LID -#ifdef CONFIG_PLATFORM_EC_BACKLIGHT_LID -#define CONFIG_BACKLIGHT_LID -#endif - -/* Battery configuration */ -#undef CONFIG_BATTERY -#undef CONFIG_BATTERY_FUEL_GAUGE -#ifdef CONFIG_PLATFORM_EC_BATTERY -#define CONFIG_BATTERY -#define CONFIG_BATTERY_FUEL_GAUGE - -#endif /* CONFIG_PLATFORM_EC_BATTERY_FUEL_GAUGE */ - -#undef CONFIG_BATTERY_SMART -#ifdef CONFIG_PLATFORM_EC_BATTERY_SMART -#define CONFIG_BATTERY_SMART -#endif - -#undef CONFIG_I2C_VIRTUAL_BATTERY -#undef I2C_PORT_VIRTUAL_BATTERY -#ifdef CONFIG_PLATFORM_EC_I2C_VIRTUAL_BATTERY -#define CONFIG_I2C_VIRTUAL_BATTERY -#define I2C_PORT_VIRTUAL_BATTERY I2C_PORT_BATTERY -#endif - -#undef CONFIG_I2C_PASSTHRU_RESTRICTED -#ifdef CONFIG_PLATFORM_EC_I2C_PASSTHRU_RESTRICTED -#define CONFIG_I2C_PASSTHRU_RESTRICTED -#endif - -#undef CONFIG_CMD_I2C_SPEED -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_I2C_SPEED -#define CONFIG_CMD_I2C_SPEED -#endif - -#undef CONFIG_BATTERY_PRESENT_CUSTOM -#ifdef CONFIG_PLATFORM_EC_BATTERY_PRESENT_CUSTOM -#define CONFIG_BATTERY_PRESENT_CUSTOM -#endif - -#undef CONFIG_BATTERY_PRESENT_GPIO -#ifdef CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO -/* This is always GPIO_BATT_PRES_ODL with Zephyr */ -#define CONFIG_BATTERY_PRESENT_GPIO GPIO_BATT_PRES_ODL -#endif - -#undef CONFIG_BATTERY_CRITICAL_SHUTDOWN_CUT_OFF -#ifdef CONFIG_PLATFORM_EC_BATTERY_CRITICAL_SHUTDOWN_CUT_OFF -#define CONFIG_BATTERY_CRITICAL_SHUTDOWN_CUT_OFF -#endif - -#undef CONFIG_BATTERY_CHECK_CHARGE_TEMP_LIMITS -#ifdef CONFIG_PLATFORM_EC_BATTERY_CHECK_CHARGE_TEMP_LIMITS -#define CONFIG_BATTERY_CHECK_CHARGE_TEMP_LIMITS -#endif - -#undef CONFIG_BATTERY_CUT_OFF -#ifdef CONFIG_PLATFORM_EC_BATTERY_CUT_OFF -#define CONFIG_BATTERY_CUT_OFF -#endif - -#undef CONFIG_BATTERY_HW_PRESENT_CUSTOM -#ifdef CONFIG_PLATFORM_EC_BATTERY_HW_PRESENT_CUSTOM -#define CONFIG_BATTERY_HW_PRESENT_CUSTOM -#endif - -#undef CONFIG_BATTERY_REVIVE_DISCONNECT -#ifdef CONFIG_PLATFORM_EC_BATTERY_REVIVE_DISCONNECT -#define CONFIG_BATTERY_REVIVE_DISCONNECT -#endif - -#undef CONFIG_BATTERY_MEASURE_IMBALANCE -#ifdef CONFIG_PLATFORM_EC_BATTERY_MEASURE_IMBALANCE - -#define CONFIG_BATTERY_MEASURE_IMBALANCE -#define CONFIG_BATTERY_MAX_IMBALANCE_MV \ - CONFIG_PLATFORM_EC_BATTERY_MAX_IMBALANCE_MV -#define CONFIG_CHARGER_MIN_BAT_PCT_IMBALANCED_POWER_ON \ - CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_IMBALANCED_POWER_ON - -#endif - -#undef CONFIG_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV -#if defined(CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV) && \ - (CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV > 0) -#define CONFIG_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV \ - CONFIG_PLATFORM_EC_BATT_FULL_CHIPSET_OFF_INPUT_LIMIT_MV -#endif - -#undef CONFIG_BOARD_RESET_AFTER_POWER_ON -#ifdef CONFIG_PLATFORM_EC_BOARD_RESET_AFTER_POWER_ON -#define CONFIG_BOARD_RESET_AFTER_POWER_ON -#endif - -#undef CONFIG_CHARGER_ISL9241 -#ifdef CONFIG_PLATFORM_EC_CHARGER_ISL9241 -#define CONFIG_CHARGER_ISL9241 -#endif - -/* - * Note - ISL9241 chargers for all channels are configured with the same - * switching frequency. Use the first ISL9241 instance found in the device tree. - */ -#undef CONFIG_ISL9241_SWITCHING_FREQ -#define ISL9241_NODE DT_INST(0, intersil_isl9241) -#if DT_NODE_EXISTS(ISL9241_NODE) && \ - DT_NODE_HAS_PROP(ISL9241_NODE, switching_frequency) -#define CONFIG_ISL9241_SWITCHING_FREQ \ - DT_PROP(ISL9241_NODE, switching_frequency) -#endif - -#undef CONFIG_CHARGER_ISL9237 -#ifdef CONFIG_PLATFORM_EC_CHARGER_ISL9237 -#define CONFIG_CHARGER_ISL9237 -#endif - -#undef CONFIG_CHARGER_ISL9238 -#ifdef CONFIG_PLATFORM_EC_CHARGER_ISL9238 -#define CONFIG_CHARGER_ISL9238 -#endif - -#undef CONFIG_CHARGER_ISL9238C -#ifdef CONFIG_PLATFORM_EC_CHARGER_ISL9238C -#define CONFIG_CHARGER_ISL9238C -#endif - -#undef CONFIG_CHARGER_MAINTAIN_VBAT -#ifdef CONFIG_PLATFORM_EC_CHARGER_MAINTAIN_VBAT -#define CONFIG_CHARGER_MAINTAIN_VBAT -#endif - -#undef CONFIG_CHARGER_NARROW_VDC -#ifdef CONFIG_PLATFORM_EC_CHARGER_NARROW_VDC -#define CONFIG_CHARGER_NARROW_VDC -#endif - -#undef CONFIG_CHARGER_OTG -#ifdef CONFIG_PLATFORM_EC_CHARGER_OTG -#define CONFIG_CHARGER_OTG -#endif - -#undef CONFIG_CHIPSET_RESET_HOOK -#ifdef CONFIG_PLATFORM_EC_CHIPSET_RESET_HOOK -#define CONFIG_CHIPSET_RESET_HOOK -#endif - -#undef CONFIG_CHIPSET_RESUME_INIT_HOOK -#ifdef CONFIG_PLATFORM_EC_CHIPSET_RESUME_INIT_HOOK -#define CONFIG_CHIPSET_RESUME_INIT_HOOK -#endif - -#ifdef CONFIG_PLATFORM_EC_EXTPOWER_GPIO -#define CONFIG_EXTPOWER_GPIO - -/* This always needs to be defined for this option to work */ -#define CONFIG_EXTPOWER -#endif - -/* Bringup configuration */ -#ifdef CONFIG_PLATFORM_EC_BRINGUP -#define CONFIG_BRINGUP -#endif - -#undef CONFIG_EMULATED_SYSRQ -#ifdef CONFIG_PLATFORM_EC_EMULATED_SYSRQ -#define CONFIG_EMULATED_SYSRQ -#endif - -/* eSPI configuration */ -#ifdef CONFIG_PLATFORM_EC_ESPI - -#ifdef CONFIG_PLATFORM_EC_HOSTCMD -#define CONFIG_HOSTCMD_ESPI -#endif - -/* eSPI signals */ -#ifdef CONFIG_PLATFORM_EC_ESPI_VW_SLP_S3 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S3 -#endif - -#ifdef CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4 -#define CONFIG_HOSTCMD_ESPI_VW_SLP_S4 -#endif - -#ifdef CONFIG_PLATFORM_EC_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST -#define CONFIG_HOSTCMD_ESPI_RESET_SLP_SX_VW_ON_ESPI_RST -#endif - -#endif /* CONFIG_PLATFORM_EC_ESPI */ - -#if DT_NODE_EXISTS(DT_NODELABEL(flash0)) -#define CONFIG_PROGRAM_MEMORY_BASE DT_REG_ADDR(DT_NODELABEL(flash0)) -#else -#define CONFIG_PROGRAM_MEMORY_BASE 0X0 -#endif - -#if DT_NODE_EXISTS(DT_NODELABEL(sram0)) -#define CONFIG_RAM_BASE DT_REG_ADDR(DT_NODELABEL(sram0)) -#define CONFIG_DATA_RAM_SIZE DT_REG_SIZE(DT_NODELABEL(sram0)) -#else -#define CONFIG_RAM_BASE 0x0 -#define CONFIG_DATA_RAM_SIZE 0x0 -#endif - -#define CONFIG_RO_MEM_OFF CONFIG_CROS_EC_RO_MEM_OFF -#define CONFIG_RO_MEM_SIZE CONFIG_CROS_EC_RO_MEM_SIZE -#define CONFIG_RW_MEM_OFF CONFIG_CROS_EC_RW_MEM_OFF -#define CONFIG_RW_MEM_SIZE CONFIG_CROS_EC_RW_MEM_SIZE - -#define CONFIG_WP_STORAGE_OFF CONFIG_EC_PROTECTED_STORAGE_OFF -#define CONFIG_WP_STORAGE_SIZE CONFIG_EC_PROTECTED_STORAGE_SIZE -#define CONFIG_RO_SIZE CONFIG_CROS_EC_RO_SIZE -#define CONFIG_RW_SIZE CONFIG_CROS_EC_RW_SIZE - -/* Flash settings */ -#undef CONFIG_EXTERNAL_STORAGE -#undef CONFIG_INTERNAL_STORAGE -#undef CONFIG_MAPPED_STORAGE -#undef CONFIG_FLASH_PSTATE -#undef CONFIG_FLASH_SIZE_BYTES -#ifdef CONFIG_PLATFORM_EC_FLASH_CROS -#include "flash_chip.h" -#define CONFIG_FLASH_CROS - -/* Internal, don't use outside this header */ -#define _BINMAN_RO_PATH DT_PATH(binman, wp_ro) -#define _BINMAN_RW_PATH DT_PATH(binman, ec_rw) - -#define CONFIG_EC_PROTECTED_STORAGE_OFF DT_PROP(_BINMAN_RO_PATH, offset) -#define CONFIG_EC_PROTECTED_STORAGE_SIZE DT_PROP(_BINMAN_RO_PATH, size) -#define CONFIG_EC_WRITABLE_STORAGE_OFF DT_PROP(_BINMAN_RW_PATH, offset) -#define CONFIG_EC_WRITABLE_STORAGE_SIZE DT_PROP(_BINMAN_RW_PATH, size) - -#define CONFIG_RAM_SIZE CONFIG_DATA_RAM_SIZE - -#ifdef CONFIG_PLATFORM_EC_EXTERNAL_STORAGE -#define CONFIG_EXTERNAL_STORAGE -#endif - -#ifdef CONFIG_PLATFORM_EC_INTERNAL_STORAGE -#define CONFIG_INTERNAL_STORAGE -#endif - -#ifdef CONFIG_PLATFORM_EC_MAPPED_STORAGE -#define CONFIG_MAPPED_STORAGE -#endif - -#ifdef CONFIG_PLATFORM_EC_FLASH_PSTATE -#define CONFIG_FLASH_PSTATE -#endif - -#undef CONFIG_CMD_FLASH -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_FLASH -#define CONFIG_CMD_FLASH -#endif - -#undef CONFIG_CMD_FLASHINFO -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_FLASHINFO -#define CONFIG_CMD_FLASHINFO -#endif - -#undef CONFIG_CMD_FLASH_WP -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_FLASH_WP -#define CONFIG_CMD_FLASH_WP -#endif - -#endif /* CONFIG_PLATFORM_EC_FLASH_CROS */ - -#undef CONFIG_ADC -#ifdef CONFIG_PLATFORM_EC_ADC -#define CONFIG_ADC -#endif - -#undef CONFIG_ADC_CHANNELS_RUNTIME_CONFIG -#ifdef CONFIG_PLATFORM_EC_ADC_CHANNELS_RUNTIME_CONFIG -#define CONFIG_ADC_CHANNELS_RUNTIME_CONFIG -#endif - -#undef CONFIG_CMD_ADC -#ifdef CONFIG_PLATFORM_EC_ADC_CMD -#define CONFIG_CMD_ADC -#endif - -#undef CONFIG_TEMP_SENSOR -#ifdef CONFIG_PLATFORM_EC_TEMP_SENSOR -#define CONFIG_TEMP_SENSOR -#endif - -#undef CONFIG_THERMISTOR -#ifdef CONFIG_PLATFORM_EC_THERMISTOR -#define CONFIG_THERMISTOR -#endif - -#ifdef CONFIG_PLATFORM_EC_I2C -/* Also see shim/include/i2c/i2c.h which defines the ports enum */ -#define CONFIG_I2C_CONTROLLER -#endif - -#undef CONFIG_I2C_DEBUG -#ifdef CONFIG_PLATFORM_EC_I2C_DEBUG -#define CONFIG_I2C_DEBUG -#endif - -#undef CONFIG_I2C_DEBUG_PASSTHRU -#ifdef CONFIG_PLATFORM_EC_I2C_DEBUG_PASSTHRU -#define CONFIG_I2C_DEBUG_PASSTHRU -#endif - -#undef CONFIG_SMBUS_PEC -#ifdef CONFIG_PLATFORM_EC_SMBUS_PEC -#define CONFIG_SMBUS_PEC -#endif - -#undef CONFIG_KEYBOARD_PROTOCOL_8042 -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_8042 -#define CONFIG_KEYBOARD_PROTOCOL_8042 -#endif /* CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_8042 */ - -#undef CONFIG_KEYBOARD_PROTOCOL_MKBP -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_PROTOCOL_MKBP -#define CONFIG_KEYBOARD_PROTOCOL_MKBP -#endif - -#undef CONFIG_MKBP_INPUT_DEVICES -#ifdef CONFIG_PLATFORM_EC_MKBP_INPUT_DEVICES -#define CONFIG_MKBP_INPUT_DEVICES -#endif - -#undef CONFIG_MKBP_EVENT_WAKEUP_MASK -#if defined(CONFIG_PLATFORM_EC_MKBP_EVENT_WAKEUP_MASK) && \ - DT_NODE_EXISTS(DT_PATH(ec_mkbp_event_wakeup_mask)) -#define CONFIG_MKBP_EVENT_WAKEUP_MASK \ - DT_PROP(DT_PATH(ec_mkbp_event_wakeup_mask), wakeup_mask) -#endif - -#undef CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK -#if defined(CONFIG_PLATFORM_EC_MKBP_HOST_EVENT_WAKEUP_MASK) && \ - DT_NODE_EXISTS(DT_PATH(ec_mkbp_host_event_wakeup_mask)) -#define CONFIG_MKBP_HOST_EVENT_WAKEUP_MASK \ - DT_PROP(DT_PATH(ec_mkbp_host_event_wakeup_mask), wakeup_mask) -#endif - -#undef CONFIG_CMD_KEYBOARD -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_KEYBOARD -#define CONFIG_CMD_KEYBOARD -#endif - -#undef CONFIG_KEYBOARD_COL2_INVERTED -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED -#define CONFIG_KEYBOARD_COL2_INVERTED -#endif /* CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED */ - -#undef CONFIG_KEYBOARD_REFRESH_ROW3 -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3 -#define CONFIG_KEYBOARD_REFRESH_ROW3 -#endif /* CONFIG_PLATFORM_EC_KEYBOARD_REFRESH_ROW3 */ - -#undef CONFIG_KEYBOARD_KEYPAD -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_KEYPAD -#define CONFIG_KEYBOARD_KEYPAD -#endif - -#undef CONFIG_KEYBOARD_VIVALDI -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_VIVALDI -#define CONFIG_KEYBOARD_VIVALDI -#endif - -#undef CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2 -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI2 -#define CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI2 -#endif - -#undef CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI3 -#ifdef CONFIG_PLATFORM_EC_KEYBOARD_PWRBTN_ASSERTS_KSI3 -#define CONFIG_KEYBOARD_PWRBTN_ASSERTS_KSI3 -#endif - -#undef CONFIG_VOLUME_BUTTONS -#ifdef CONFIG_PLATFORM_EC_VOLUME_BUTTONS -#define CONFIG_VOLUME_BUTTONS -#endif - -#undef CONFIG_CMD_BUTTON -#ifdef CONFIG_PLATFORM_EC_CMD_BUTTON -#define CONFIG_CMD_BUTTON -#endif - -#undef CONFIG_PWM_KBLIGHT -#undef CONFIG_KEYBOARD_BACKLIGHT -#ifdef CONFIG_PLATFORM_EC_PWM_KBLIGHT -#define CONFIG_PWM_KBLIGHT -#define CONFIG_KEYBOARD_BACKLIGHT -#endif - -#undef CONFIG_LED_COMMON -#ifdef CONFIG_PLATFORM_EC_LED_COMMON -#define CONFIG_LED_COMMON -#endif - -#undef CONFIG_LED_PWM -#ifdef CONFIG_PLATFORM_EC_LED_PWM -#define CONFIG_LED_PWM -#endif - -#undef CONFIG_LED_PWM_COUNT -#if DT_HAS_COMPAT_STATUS_OKAY(cros_ec_pwm_leds) -#define CONFIG_LED_PWM_COUNT DT_PROP_LEN(DT_INST(0, cros_ec_pwm_leds), leds) -#endif - -#undef CONFIG_CMD_LEDTEST -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_LEDTEST -#define CONFIG_CMD_LEDTEST -#endif - -#undef CONFIG_PWM_DISPLIGHT -#ifdef CONFIG_PLATFORM_EC_PWM_DISPLIGHT -#define CONFIG_PWM_DISPLIGHT -#endif - -#undef CONFIG_CPU_PROCHOT_ACTIVE_LOW -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_CPU_PROCHOT_ACTIVE_LOW -#define CONFIG_CPU_PROCHOT_ACTIVE_LOW -#endif - -#undef CONFIG_POWER_TRACK_HOST_SLEEP_STATE -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_HOST_SLEEP -#define CONFIG_POWER_TRACK_HOST_SLEEP_STATE -#endif - -#undef CONFIG_POWER_SLEEP_FAILURE_DETECTION -#ifdef CONFIG_PLATFORM_EC_POWER_SLEEP_FAILURE_DETECTION -#define CONFIG_POWER_SLEEP_FAILURE_DETECTION -#endif - -#undef CONFIG_HOSTCMD_AP_RESET -#ifdef CONFIG_PLATFORM_EC_HOSTCMD_AP_RESET -#define CONFIG_HOSTCMD_AP_RESET -#endif - -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_RSMRST_DELAY -#define CONFIG_CHIPSET_X86_RSMRST_DELAY -#endif - -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_SLP_S3_L_OVERRIDE -#define CONFIG_CHIPSET_SLP_S3_L_OVERRIDE -#endif - -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_PP3300_RAIL_FIRST -#define CONFIG_CHIPSET_PP3300_RAIL_FIRST -#endif - -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_RTC_RESET -#define CONFIG_BOARD_HAS_RTC_RESET -#endif - -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_PP5000_CONTROL -#define CONFIG_POWER_PP5000_CONTROL -#endif - -#undef CONFIG_POWER_S0IX -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_S0IX -#define CONFIG_POWER_S0IX -#endif - -#undef CONFIG_POWER_BUTTON_X86 -#ifdef CONFIG_PLATFORM_EC_POWERSEQ_INTEL -#define CONFIG_POWER_BUTTON_X86 -#endif - -#undef CONFIG_FAKE_SHMEM -#ifdef CONFIG_ARCH_POSIX -#define CONFIG_FAKE_SHMEM -#endif - -#undef CONFIG_PWM -#ifdef CONFIG_PLATFORM_EC_PWM -#define CONFIG_PWM -#endif - -#undef CONFIG_CMD_S5_TIMEOUT -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_S5_TIMEOUT -#define CONFIG_CMD_S5_TIMEOUT -#endif - -#undef CONFIG_CMD_SHMEM -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_SHMEM -#define CONFIG_CMD_SHMEM -#endif - -#undef CONFIG_CROS_FWID_VERSION -#ifdef CONFIG_PLATFORM_EC_CROS_FWID_VERSION -#define CONFIG_CROS_FWID_VERSION -#endif - -#ifdef CONFIG_PLATFORM_EC_TIMER -#define CONFIG_HWTIMER_64BIT -#define CONFIG_HW_SPECIFIC_UDELAY - -#undef CONFIG_CMD_GETTIME -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_GETTIME -#define CONFIG_CMD_GETTIME -#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_GETTIME */ - -#undef CONFIG_CMD_TIMERINFO -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_TIMERINFO -#define CONFIG_CMD_TIMERINFO -#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_TIMERINFO */ - -#undef CONFIG_CMD_WAITMS -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_WAITMS -#define CONFIG_CMD_WAITMS -#endif /* CONFIG_PLATFORM_EC_CONSOLE_CMD_TIMERINFO */ - -#endif /* CONFIG_PLATFORM_EC_TIMER */ - -/* USB-C things */ -#ifdef CONFIG_PLATFORM_EC_USBC - -/* Zephyr only supports v2 so we always define this */ -#define CONFIG_USB_PD_TCPMV2 - -/* - * Define these here for now. They are not actually CONFIG options in the EC - * code base. Ideally they would be defined in the devicetree (perhaps for a - * 'board' driver if not in the USB chip driver itself). - * - * SN5S30 PPC supports up to 24V VBUS source and sink, however passive USB-C - * cables only support up to 60W. - */ -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - -/* TODO: b/144165680 - measure and check these values on Volteer */ -#define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ -#define PD_POWER_SUPPLY_TURN_OFF_DELAY 30000 /* us */ -#endif - -#undef CONFIG_CMD_PPC_DUMP -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_PPC_DUMP -#define CONFIG_CMD_PPC_DUMP -#endif - -#undef CONFIG_CMD_TCPC_DUMP -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_TCPC_DUMP -#define CONFIG_CMD_TCPC_DUMP -#endif - -#undef CONFIG_USB_POWER_DELIVERY -#ifdef CONFIG_PLATFORM_EC_USB_POWER_DELIVERY -#define CONFIG_USB_POWER_DELIVERY -#endif - -#undef CONFIG_CHARGER -#undef CONFIG_CHARGE_MANAGER -#ifdef CONFIG_PLATFORM_EC_CHARGE_MANAGER -#define CONFIG_CHARGE_MANAGER -#define CONFIG_CHARGER - -/* TODO: Put these charger defines in the devicetree? */ -#define CONFIG_CHARGER_SENSE_RESISTOR 10 -#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 - -#endif - -#undef CONFIG_CHARGER_INPUT_CURRENT -#ifdef CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT -#define CONFIG_CHARGER_INPUT_CURRENT CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT -#endif - -#undef CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON -#ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON -#define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON \ - CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON -#endif - -#undef CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC -#ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC -#define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC \ - CONFIG_PLATFORM_EC_CHARGER_MIN_BAT_PCT_FOR_POWER_ON_WITH_AC -#endif - -#undef CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT -#ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT -#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT \ - CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON_WITH_BATT -#endif - -#undef CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON -#ifdef CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON -#define CONFIG_CHARGER_MIN_POWER_MW_FOR_POWER_ON \ - CONFIG_PLATFORM_EC_CHARGER_MIN_POWER_MW_FOR_POWER_ON -#endif - -#undef CONFIG_CHARGE_RAMP_SW -#ifdef CONFIG_PLATFORM_EC_CHARGE_RAMP_SW -#define CONFIG_CHARGE_RAMP_SW -#endif - -#undef CONFIG_CHARGE_RAMP_HW -#ifdef CONFIG_PLATFORM_EC_CHARGE_RAMP_HW -#define CONFIG_CHARGE_RAMP_HW -#endif - -#undef CONFIG_CMD_CHGRAMP -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_CHGRAMP -#define CONFIG_CMD_CHGRAMP -#endif - -#undef CONFIG_USB_PID -#ifdef CONFIG_PLATFORM_EC_USB_PID -#define CONFIG_USB_PID CONFIG_PLATFORM_EC_USB_PID -#endif - -#undef CONFIG_USB_BCD_DEV -#ifdef CONFIG_PLATFORM_EC_USB_BCD_DEV -#define CONFIG_USB_BCD_DEV CONFIG_PLATFORM_EC_USB_BCD_DEV -#endif - -#undef CONFIG_USB_VID -#ifdef CONFIG_PLATFORM_EC_USB_VID -#define CONFIG_USB_VID CONFIG_PLATFORM_EC_USB_VID -#endif - -/* VBUS-voltage measurement */ -#undef CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT -#undef CONFIG_USB_PD_VBUS_MEASURE_CHARGER -#undef CONFIG_USB_PD_VBUS_MEASURE_TCPC -#undef CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT -#undef CONFIG_USB_PD_VBUS_MEASURE_BY_BOARD -#ifdef CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_NOT_PRESENT -#define CONFIG_USB_PD_VBUS_MEASURE_NOT_PRESENT -#elif defined(CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER) -#define CONFIG_USB_PD_VBUS_MEASURE_CHARGER -#elif defined(CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_TCPC) -#define CONFIG_USB_PD_VBUS_MEASURE_TCPC -#elif defined(CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_ADC_EACH_PORT) -#define CONFIG_USB_PD_VBUS_MEASURE_ADC_EACH_PORT -#elif defined(CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_BY_BOARD) -#define CONFIG_USB_PD_VBUS_MEASURE_BY_BOARD -#endif /* VBUS-voltage measurement */ - -#undef CONFIG_USB_CHARGER -#ifdef CONFIG_PLATFORM_EC_USB_CHARGER -#define CONFIG_USB_CHARGER -#endif - -#define USB_PORT_COUNT CONFIG_PLATFORM_EC_USB_A_PORT_COUNT - -#undef CONFIG_USB_PORT_POWER_DUMB -#ifdef CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB -#define CONFIG_USB_PORT_POWER_DUMB -#endif - -#undef CONFIG_USB_PORT_POWER_DUMB_CUSTOM_HOOK -#ifdef CONFIG_PLATFORM_EC_USB_PORT_POWER_DUMB_CUSTOM_HOOK -#define CONFIG_USB_PORT_POWER_DUMB_CUSTOM_HOOK -#endif - -#undef CONFIG_BC12_DETECT_PI3USB9201 -#ifdef CONFIG_PLATFORM_EC_BC12_DETECT_PI3USB9201 -#define CONFIG_BC12_DETECT_PI3USB9201 -#endif - -#undef CONFIG_BC12_DETECT_MT6360 -#ifdef CONFIG_PLATFORM_EC_BC12_DETECT_MT6360 -#define CONFIG_BC12_DETECT_MT6360 -#endif - -#undef CONFIG_MT6360_BC12_GPIO -#ifdef CONFIG_PLATFORM_EC_MT6360_BC12_GPIO -#define CONFIG_MT6360_BC12_GPIO -#endif - -#undef CONFIG_HOSTCMD_REGULATOR -#ifdef CONFIG_PLATFORM_EC_HOSTCMD_REGULATOR -#define CONFIG_HOSTCMD_REGULATOR -#endif - -#undef CONFIG_USB_PD_DUAL_ROLE -#ifdef CONFIG_PLATFORM_EC_USB_PD_DUAL_ROLE -#define CONFIG_USB_PD_DUAL_ROLE -#endif - -#undef CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -#ifdef CONFIG_PLATFORM_EC_USB_PD_DUAL_ROLE_AUTO_TOGGLE -#define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE -#endif - -#undef CONFIG_USB_PD_DISCHARGE_PPC -#ifdef CONFIG_PLATFORM_EC_USB_PD_DISCHARGE_PPC -#define CONFIG_USB_PD_DISCHARGE_PPC -#endif - -#undef CONFIG_USB_PD_LOGGING -#ifdef CONFIG_PLATFORM_EC_USB_PD_LOGGING -#define CONFIG_USB_PD_LOGGING -#endif - -#undef CONFIG_USBC_OCP -#ifdef CONFIG_PLATFORM_EC_USBC_OCP -#define CONFIG_USBC_OCP -#endif - -#undef CONFIG_USB_PD_CONSOLE_CMD -#ifdef CONFIG_PLATFORM_EC_USB_PD_CONSOLE_CMD -#define CONFIG_USB_PD_CONSOLE_CMD -#endif - -#undef CONFIG_USB_PD_HOST_CMD -#ifdef CONFIG_PLATFORM_EC_USB_PD_HOST_CMD -#define CONFIG_USB_PD_HOST_CMD -#endif - -#undef CONFIG_USB_PD_REV30 -#ifdef CONFIG_PLATFORM_EC_USB_PD_REV30 -#define CONFIG_USB_PD_REV30 - -/* - * Support USB PD 3.0 Extended Messages. Note that Chromebooks disabling this - * config item are non-compliant with PD 3.0, because they have batteries but do - * not support Get_Battery_Cap or Get_Battery_Status. - */ -#define CONFIG_USB_PD_EXTENDED_MESSAGES -#endif - -#undef CONFIG_USB_PD_VBUS_DETECT_TCPC -#undef CONFIG_USB_PD_VBUS_DETECT_CHARGER -#undef CONFIG_USB_PD_VBUS_DETECT_GPIO -#undef CONFIG_USB_PD_VBUS_DETECT_PPC -#undef CONFIG_USB_PD_VBUS_DETECT_NONE -#ifdef CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_TCPC -#define CONFIG_USB_PD_VBUS_DETECT_TCPC -#endif -#ifdef CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_CHARGER -#define CONFIG_USB_PD_VBUS_DETECT_CHARGER -#endif -#ifdef CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_PPC -#define CONFIG_USB_PD_VBUS_DETECT_PPC -#endif -#ifdef CONFIG_PLATFORM_EC_USB_PD_VBUS_DETECT_NONE -#define CONFIG_USB_PD_VBUS_DETECT_NONE -#endif - -#undef CONFIG_USB_PD_5V_EN_CUSTOM -#ifdef CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM -#define CONFIG_USB_PD_5V_EN_CUSTOM -#endif - -#undef CONFIG_USB_TYPEC_SM -#ifdef CONFIG_PLATFORM_EC_USB_TYPEC_SM -#define CONFIG_USB_TYPEC_SM -#endif - -#undef CONFIG_USB_PRL_SM -#ifdef CONFIG_PLATFORM_EC_USB_PRL_SM -#define CONFIG_USB_PRL_SM -#endif - -#undef CONFIG_USB_PE_SM -#ifdef CONFIG_PLATFORM_EC_USB_PE_SM -#define CONFIG_USB_PE_SM -#endif - -#undef CONFIG_USB_PD_DECODE_SOP -#ifdef CONFIG_PLATFORM_EC_USB_PD_DECODE_SOP -#define CONFIG_USB_PD_DECODE_SOP -#endif - -#undef CONFIG_USB_VPD -#ifdef CONFIG_PLATFORM_EC_USB_VPD -#define CONFIG_USB_VPD -#endif - -#undef CONFIG_USB_CTVPD -#ifdef CONFIG_PLATFORM_EC_USB_CTVPD -#define CONFIG_USB_CTVPD -#endif - -#undef CONFIG_USB_DRP_ACC_TRYSRC -#ifdef CONFIG_PLATFORM_EC_USB_DRP_ACC_TRYSRC -#define CONFIG_USB_DRP_ACC_TRYSRC -#endif - -#undef CONFIG_USB_PD_TCPM_PS8751 -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8751 -#define CONFIG_USB_PD_TCPM_PS8751 -#endif - -#undef CONFIG_USB_PD_TCPM_PS8805 -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8805 -#define CONFIG_USB_PD_TCPM_PS8805 -#endif - -#undef CONFIG_USB_PD_TCPM_PS8805_FORCE_DID -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8805_FORCE_DID -#define CONFIG_USB_PD_TCPM_PS8805_FORCE_DID -#endif - -#undef CONFIG_USB_PD_TCPM_PS8815 -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8815 -#define CONFIG_USB_PD_TCPM_PS8815 -#endif - -#undef CONFIG_USB_PD_TCPM_PS8815_FORCE_DID -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_PS8815_FORCE_DID -#define CONFIG_USB_PD_TCPM_PS8815_FORCE_DID -#endif - -#undef CONFIG_USB_PD_TCPM_MULTI_PS8XXX -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_MULTI_PS8XXX -#define CONFIG_USB_PD_TCPM_MULTI_PS8XXX -#endif - -#undef CONFIG_USB_PD_TCPM_RT1715 -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_RT1715 -#define CONFIG_USB_PD_TCPM_RT1715 -#endif - -#undef CONFIG_USB_PD_TCPM_TUSB422 -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_TUSB422 -#define CONFIG_USB_PD_TCPM_TUSB422 -#endif - -#undef CONFIG_USB_PD_TCPM_TCPCI -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_TCPCI -#define CONFIG_USB_PD_TCPM_TCPCI -#endif - -#undef CONFIG_USB_PD_TCPM_ITE_ON_CHIP -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_ITE_ON_CHIP -#define CONFIG_USB_PD_TCPM_ITE_ON_CHIP - -/* TODO(b:189855648): hard-code a few things here; move to zephyr? */ -#define IT83XX_USBPD_PHY_PORT_COUNT 2 -#endif - -#undef CONFIG_USB_PD_TCPM_DRIVER_IT8XXX2 -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_DRIVER_IT8XXX2 -#define CONFIG_USB_PD_TCPM_DRIVER_IT8XXX2 -#endif - -#undef CONFIG_USB_PD_TCPM_DRIVER_IT83XX -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_DRIVER_IT83XX -#define CONFIG_USB_PD_TCPM_DRIVER_IT83XX -#endif - -#undef CONFIG_USB_PD_PORT_MAX_COUNT -#ifdef CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT -#define CONFIG_USB_PD_PORT_MAX_COUNT CONFIG_PLATFORM_EC_USB_PD_PORT_MAX_COUNT -#endif - -#undef CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT -#ifdef CONFIG_PLATFORM_EC_USB_PD_ITE_ACTIVE_PORT_COUNT -#define CONFIG_USB_PD_ITE_ACTIVE_PORT_COUNT \ - CONFIG_PLATFORM_EC_USB_PD_ITE_ACTIVE_PORT_COUNT -#endif - -#undef CONFIG_USBC_PPC -#ifdef CONFIG_PLATFORM_EC_USBC_PPC -#define CONFIG_USBC_PPC -#endif - -#undef CONFIG_USBC_PPC_SN5S330 -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_SN5S330 -#define CONFIG_USBC_PPC_SN5S330 -#endif - -#undef CONFIG_USBC_PPC_SYV682X -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_SYV682X -#define CONFIG_USBC_PPC_SYV682X -#endif - -#undef CONFIG_USBC_PPC_SYV682C -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_SYV682C -#define CONFIG_USBC_PPC_SYV682C -#endif - -#undef CONFIG_USBC_PPC_SYV682X_NO_CC -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_SYV682X_NO_CC -#define CONFIG_USBC_PPC_SYV682X_NO_CC -#endif - -#undef CONFIG_USBC_PPC_SYV682X_SMART_DISCHARGE -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_SYV682X_SMART_DISCHARGE -#define CONFIG_USBC_PPC_SYV682X_SMART_DISCHARGE -#endif - -#undef CONFIG_USB_PD_TCPC_RUNTIME_CONFIG -#undef CONFIG_USB_MUX_RUNTIME_CONFIG -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG -#define CONFIG_USB_PD_TCPC_RUNTIME_CONFIG - -#ifdef CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG -#define CONFIG_USB_MUX_RUNTIME_CONFIG -#endif /* CONFIG_PLATFORM_EC_USB_MUX_RUNTIME_CONFIG */ - -#endif /* CONFIG_PLATFORM_EC_USB_PD_TCPC_RUNTIME_CONFIG */ - -#undef CONFIG_USB_PD_ALT_MODE -#ifdef CONFIG_PLATFORM_EC_USB_PD_ALT_MODE -#define CONFIG_USB_PD_ALT_MODE -#endif - -#undef CONFIG_USB_PD_ALT_MODE_DFP -#ifdef CONFIG_PLATFORM_EC_USB_PD_ALT_MODE_DFP -#define CONFIG_USB_PD_ALT_MODE_DFP -#endif - -#undef CONFIG_USB_PD_ALT_MODE_UFP -#ifdef CONFIG_PLATFORM_EC_USB_PD_ALT_MODE_UFP -#define CONFIG_USB_PD_ALT_MODE_UFP -#endif - -#undef CONFIG_USB_PD_DPS -#ifdef CONFIG_PLATFORM_EC_USB_PD_DPS -#define CONFIG_USB_PD_DPS -#endif - -#undef CONFIG_DP_REDRIVER_TDP142 -#ifdef CONFIG_PLATFORM_EC_DP_REDRIVER_TDP142 -#define CONFIG_DP_REDRIVER_TDP142 -#endif - -#undef CONFIG_USBC_RETIMER_FW_UPDATE -#ifdef CONFIG_PLATFORM_EC_USBC_RETIMER_FW_UPDATE -#define CONFIG_USBC_RETIMER_FW_UPDATE -#endif - -#undef CONFIG_USBC_RETIMER_INTEL_BB -#ifdef CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB - -#define USBC_PORT_C1_BB_RETIMER_I2C_ADDR \ - DT_REG_ADDR(DT_NODELABEL(usb_c1_bb_retimer)) -#define CONFIG_USBC_RETIMER_INTEL_BB -#endif - -#undef CONFIG_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG -#ifdef CONFIG_PLATFORM_EC_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG -#define CONFIG_USBC_RETIMER_INTEL_BB_RUNTIME_CONFIG -#endif - -#undef CONFIG_USBC_RETIMER_ANX7451 -#ifdef CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7451 -#define CONFIG_USBC_RETIMER_ANX7451 -#endif - -#undef CONFIG_USBC_RETIMER_PS8811 -#ifdef CONFIG_PLATFORM_EC_USBC_RETIMER_PS8811 -#define CONFIG_USBC_RETIMER_PS8811 -#endif - -#undef CONFIG_USBC_SS_MUX -#ifdef CONFIG_PLATFORM_EC_USBC_SS_MUX -#define CONFIG_USBC_SS_MUX -#endif - -#undef CONFIG_USBC_SS_MUX_DFP_ONLY -#ifdef CONFIG_PLATFORM_EC_USBC_SS_MUX_DFP_ONLY -#define CONFIG_USBC_SS_MUX_DFP_ONLY -#endif - -#undef CONFIG_USB_MUX_IT5205 -#ifdef CONFIG_PLATFORM_EC_USB_MUX_IT5205 -#define CONFIG_USB_MUX_IT5205 -#endif - -#undef CONFIG_USB_MUX_PS8743 -#ifdef CONFIG_PLATFORM_EC_USB_MUX_PS8743 -#define CONFIG_USB_MUX_PS8743 -#endif - -#undef CONFIG_USB_MUX_VIRTUAL -#ifdef CONFIG_PLATFORM_EC_USB_MUX_VIRTUAL -#define CONFIG_USB_MUX_VIRTUAL -#endif - -#undef CONFIG_USB_PD_TCPM_MUX -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPM_MUX -#define CONFIG_USB_PD_TCPM_MUX -#endif - -#undef CONFIG_USBC_PPC_DEDICATED_INT -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_DEDICATED_INT -#define CONFIG_USBC_PPC_DEDICATED_INT -#endif - -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_PD -#define CONFIG_CONSOLE_CMD_PD -#endif - -#ifdef CONFIG_HAS_TASK_PD_INT_C0 -/* This must be defined if any task is active */ -#define CONFIG_HAS_TASK_PD_INT -#endif - -#undef CONFIG_MKBP_EVENT -#undef CONFIG_MKBP_USE_GPIO -#undef CONFIG_MKBP_USE_HOST_EVENT -#undef CONFIG_MKBP_USE_GPIO_AND_HOST_EVENT -#undef CONFIG_MKBP_USE_CUSTOM -#ifdef CONFIG_PLATFORM_EC_MKBP_EVENT -#define CONFIG_MKBP_EVENT -#ifdef CONFIG_PLATFORM_EC_MKBP_USE_GPIO -#define CONFIG_MKBP_USE_GPIO -#elif defined(CONFIG_PLATFORM_EC_MKBP_USE_HOST_EVENT) -#define CONFIG_MKBP_USE_HOST_EVENT -#elif defined(CONFIG_PLATFORM_EC_MKBP_USE_GPIO_AND_HOST_EVENT) -#define CONFIG_MKBP_USE_GPIO_AND_HOST_EVENT -#elif defined(CONFIG_PLATFORM_EC_MKBP_USE_CUSTOM) -#define CONFIG_MKBP_USE_CUSTOM -#endif -#endif /* CONFIG_PLATFORM_EC_MKBP_EVENT */ - -#undef CONFIG_USB_PD_TCPC_LOW_POWER -#undef CONFIG_USB_PD_TCPC_LPM_EXIT_DEBOUNCE -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER -#define CONFIG_USB_PD_TCPC_LOW_POWER -#define CONFIG_USB_PD_TCPC_LPM_EXIT_DEBOUNCE \ - CONFIG_PLATFORM_EC_USB_PD_TCPC_LPM_EXIT_DEBOUNCE_US -#endif /* CONFIG_PLATFORM_EC_USB_PD_TCPC_LOW_POWER */ - -#undef CONFIG_USB_PD_DEBUG_LEVEL -#ifdef CONFIG_PLATFORM_EC_USB_PD_DEBUG_FIXED_LEVEL -#define CONFIG_USB_PD_DEBUG_LEVEL CONFIG_PLATFORM_EC_USB_PD_DEBUG_LEVEL -#endif - -#undef CONFIG_USBC_VCONN -#ifdef CONFIG_PLATFORM_EC_USBC_VCONN -#define CONFIG_USBC_VCONN - -/* This must be defined as well */ -#define CONFIG_USBC_VCONN_SWAP -#endif /* CONFIG_PLATFORM_EC_USBC_VCONN */ - -#undef CONFIG_USB_PD_TRY_SRC -#ifdef CONFIG_PLATFORM_EC_USB_PD_TRY_SRC -#define CONFIG_USB_PD_TRY_SRC -#endif - -#undef CONFIG_USBC_PPC_POLARITY -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_POLARITY -#define CONFIG_USBC_PPC_POLARITY -#endif - -#undef CONFIG_USBC_PPC_SBU -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_SBU -#define CONFIG_USBC_PPC_SBU -#endif - -#undef CONFIG_USBC_PPC_VCONN -#ifdef CONFIG_PLATFORM_EC_USBC_PPC_VCONN -#define CONFIG_USBC_PPC_VCONN -#endif - -#undef CONFIG_USB_PD_USB32_DRD -#ifdef CONFIG_PLATFORM_EC_USB_PD_USB32_DRD -#define CONFIG_USB_PD_USB32_DRD -#endif - -#undef CONFIG_HOSTCMD_PD_CONTROL -#ifdef CONFIG_PLATFORM_EC_HOSTCMD_PD_CONTROL -#define CONFIG_HOSTCMD_PD_CONTROL -#endif - -#undef CONFIG_CMD_HCDEBUG -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_HCDEBUG -#define CONFIG_CMD_HCDEBUG -#endif - -#undef CONFIG_CMD_USB_PD_PE -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_USB_PD_PE -#define CONFIG_CMD_USB_PD_PE -#endif - -#undef CONFIG_CMD_USB_PD_CABLE -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_USB_PD_CABLE -#define CONFIG_CMD_USB_PD_CABLE -#endif - -#undef CONFIG_USB_PD_TBT_COMPAT_MODE -#ifdef CONFIG_PLATFORM_EC_USB_PD_TBT_COMPAT_MODE -#define CONFIG_USB_PD_TBT_COMPAT_MODE -#endif - -#undef CONFIG_USB_PD_USB4 -#ifdef CONFIG_PLATFORM_EC_USB_PD_USB4 -#define CONFIG_USB_PD_USB4 -#endif - -#undef CONFIG_USB_PD_FRS -#ifdef CONFIG_PLATFORM_EC_USB_PD_FRS -#define CONFIG_USB_PD_FRS -#endif - -#undef CONFIG_USB_PD_FRS_TCPC -#ifdef CONFIG_PLATFORM_EC_USB_PD_FRS_TCPC -#define CONFIG_USB_PD_FRS_TCPC -#endif - -#undef CONFIG_USB_PD_FRS_PPC -#ifdef CONFIG_PLATFORM_EC_USB_PD_FRS_PPC -#define CONFIG_USB_PD_FRS_PPC -#endif - -#undef CONFIG_VSTORE -#undef VSTORE_SLOT_COUNT -#ifdef CONFIG_PLATFORM_EC_VSTORE -#define CONFIG_VSTORE -#define CONFIG_VSTORE_SLOT_COUNT CONFIG_PLATFORM_EC_VSTORE_SLOT_COUNT -#endif - -/* motion sense */ -#undef CONFIG_MOTIONSENSE -#ifdef CONFIG_PLATFORM_EC_MOTIONSENSE -#define CONFIG_MOTIONSENSE - -#undef CONFIG_ACCEL_FIFO -#undef CONFIG_ACCEL_FIFO_SIZE -#undef CONFIG_ACCEL_FIFO_THRES -#ifdef CONFIG_PLATFORM_EC_ACCEL_FIFO -#define CONFIG_ACCEL_FIFO -#define CONFIG_ACCEL_FIFO_SIZE CONFIG_PLATFORM_EC_ACCEL_FIFO_SIZE -#define CONFIG_ACCEL_FIFO_THRES CONFIG_PLATFORM_EC_ACCEL_FIFO_THRES -#endif /* CONFIG_PLATFORM_EC_ACCEL_FIFO */ - -#undef CONFIG_CMD_ACCELS -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCELS -#define CONFIG_CMD_ACCELS -#endif - -#undef CONFIG_CMD_ACCEL_INFO -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_INFO -#define CONFIG_CMD_ACCEL_INFO -#endif - -#undef CONFIG_ACCEL_SPOOF_MODE -#ifdef CONFIG_PLATFORM_EC_ACCEL_SPOOF_MODE -#define CONFIG_ACCEL_SPOOF_MODE -#endif - -#undef CONFIG_CMD_ACCEL_SPOOF -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_ACCEL_SPOOF -#define CONFIG_CMD_ACCEL_SPOOF -#endif - -#undef CONFIG_SENSOR_TIGHT_TIMESTAMPS -#ifdef CONFIG_PLATFORM_EC_SENSOR_TIGHT_TIMESTAMPS -#define CONFIG_SENSOR_TIGHT_TIMESTAMPS -#endif - -#undef CONFIG_ACCEL_INTERRUPTS -#ifdef CONFIG_PLATFORM_EC_ACCEL_INTERRUPTS -#define CONFIG_ACCEL_INTERRUPTS -#endif - -#undef CONFIG_ALS -#undef CONFIG_ALS_COUNT -#ifdef CONFIG_PLATFORM_EC_ALS -#define CONFIG_ALS -#define ALS_COUNT CONFIG_PLATFORM_EC_ALS_COUNT -#else -#define ALS_COUNT 0 -#endif - -#undef CONFIG_DYNAMIC_MOTION_SENSOR_COUNT -#ifdef CONFIG_PLATFORM_EC_DYNAMIC_MOTION_SENSOR_COUNT -#define CONFIG_DYNAMIC_MOTION_SENSOR_COUNT -#endif - -#undef CONFIG_LID_ANGLE -#ifdef CONFIG_PLATFORM_EC_LID_ANGLE -#define CONFIG_LID_ANGLE -#endif - -#undef CONFIG_LID_ANGLE_UPDATE -#ifdef CONFIG_PLATFORM_EC_LID_ANGLE_UPDATE -#define CONFIG_LID_ANGLE_UPDATE -#endif - -#undef CONFIG_TABLET_MODE -#ifdef CONFIG_PLATFORM_EC_TABLET_MODE -#define CONFIG_TABLET_MODE -#endif - -#undef CONFIG_TABLET_MODE_SWITCH -#ifdef CONFIG_PLATFORM_EC_TABLET_MODE_SWITCH -#define CONFIG_TABLET_MODE_SWITCH -#endif - -#undef CONFIG_GMR_TABLET_MODE -#ifdef CONFIG_PLATFORM_EC_GMR_TABLET_MODE -#define CONFIG_GMR_TABLET_MODE -#endif - -/* sensors */ -#undef CONFIG_ACCELGYRO_BMI160 -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI160 -#define CONFIG_ACCELGYRO_BMI160 -#endif - -#undef CONFIG_ACCELGYRO_BMI260 -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI260 -#define CONFIG_ACCELGYRO_BMI260 -#endif - -#undef CONFIG_ACCELGYRO_BMI3XX -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI3XX -#define CONFIG_ACCELGYRO_BMI3XX -#endif - -#undef CONFIG_ACCEL_BMA255 -#ifdef CONFIG_PLATFORM_EC_ACCEL_BMA255 -#define CONFIG_ACCEL_BMA255 -#endif - -#undef CONFIG_ACCEL_BMA4XX -#ifdef CONFIG_PLATFORM_EC_ACCEL_BMA4XX -#define CONFIG_ACCEL_BMA4XX -#endif - -#undef CONFIG_ACCEL_KX022 -#ifdef CONFIG_PLATFORM_EC_ACCEL_KX022 -#define CONFIG_ACCEL_KX022 -#endif - -#undef CONFIG_ALS_TCS3400 -#ifdef CONFIG_PLATFORM_EC_ALS_TCS3400 -#define CONFIG_ALS_TCS3400 -#endif - -#undef CONFIG_ACCELGYRO_ICM426XX -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_ICM426XX -#define CONFIG_ACCELGYRO_ICM426XX -#endif - -#undef CONFIG_ACCELGYRO_ICM42607 -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_ICM42607 -#define CONFIG_ACCELGYRO_ICM42607 -#endif - -#endif /* CONFIG_PLATFORM_EC_MOTIONSENSE */ - -#undef CONFIG_HOSTCMD_GET_UPTIME_INFO -#ifdef CONFIG_PLATFORM_EC_HOSTCMD_GET_UPTIME_INFO -#define CONFIG_HOSTCMD_GET_UPTIME_INFO -#endif - -#undef CONFIG_CMD_AP_RESET_LOG -#ifdef CONFIG_PLATFORM_EC_AP_RESET_LOG -#define CONFIG_CMD_AP_RESET_LOG -#endif - -#undef CONFIG_POWER_BUTTON -#ifdef CONFIG_PLATFORM_EC_POWER_BUTTON -#define CONFIG_POWER_BUTTON -#endif - -#undef CONFIG_COMMON_PANIC_OUTPUT -#ifdef CONFIG_PLATFORM_EC_PANIC -#define CONFIG_COMMON_PANIC_OUTPUT -#endif - -#undef CONFIG_SOFTWARE_PANIC -#ifdef CONFIG_PLATFORM_EC_SOFTWARE_PANIC -#define CONFIG_SOFTWARE_PANIC -#endif - -#undef CONFIG_CMD_CRASH -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_CRASH -#define CONFIG_CMD_CRASH -#endif - -#undef CONFIG_CMD_STACKOVERFLOW -#ifdef CONFIG_PLATFORM_EC_STACKOVERFLOW -#define CONFIG_CMD_STACKOVERFLOW -#endif - -#undef CONFIG_CMD_MEM -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_MEM -#define CONFIG_CMD_MEM -#endif - -#undef CONFIG_CMD_MD -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_MD -#define CONFIG_CMD_MD -#endif - -#undef CONFIG_CMD_RW -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_RW -#define CONFIG_CMD_RW -#endif - -#undef CONFIG_RTC -#ifdef CONFIG_PLATFORM_EC_RTC -#define CONFIG_RTC -#endif - -#undef CONFIG_CMD_RTC -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC -#define CONFIG_CMD_RTC -#endif - -#undef CONFIG_CMD_RTC_ALARM -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_RTC_ALARM -#define CONFIG_CMD_RTC_ALARM -#endif - -#undef CONFIG_HOSTCMD_RTC -#ifdef CONFIG_PLATFORM_EC_HOSTCMD_RTC -#define CONFIG_HOSTCMD_RTC -#endif - -#undef CONFIG_HOST_COMMAND_STATUS -#ifdef CONFIG_PLATFORM_EC_HOST_COMMAND_STATUS -#define CONFIG_HOST_COMMAND_STATUS -#endif - -#undef CONFIG_SWITCH -#ifdef CONFIG_PLATFORM_EC_SWITCH -#define CONFIG_SWITCH -#endif - -#undef CONFIG_LN9310 -#ifdef CONFIG_PLATFORM_EC_SWITCHCAP_LN9310 -#define CONFIG_LN9310 -#endif - -#undef CONFIG_BOARD_VERSION_CBI -#ifdef CONFIG_PLATFORM_EC_BOARD_VERSION_CBI -#define CONFIG_BOARD_VERSION_CBI -#endif - -#undef CONFIG_BOARD_VERSION_GPIO -#ifdef CONFIG_PLATFORM_EC_BOARD_VERSION_GPIO -#define CONFIG_BOARD_VERSION_GPIO -#endif - -#undef CONFIG_CBI_EEPROM -#ifdef CONFIG_PLATFORM_EC_CBI_EEPROM -#define CONFIG_CBI_EEPROM -#define I2C_ADDR_EEPROM_FLAGS DT_REG_ADDR(DT_NODELABEL(cbi_eeprom)) -#endif - -#undef CONFIG_CBI_GPIO -#ifdef CONFIG_PLATFORM_EC_CBI_GPIO -#define CONFIG_CBI_GPIO -#endif - -#undef CONFIG_VBOOT_HASH -#ifdef CONFIG_PLATFORM_EC_VBOOT_HASH -#define CONFIG_VBOOT_HASH -#endif - -#undef CONFIG_SHA256_HW_ACCELERATE -#ifdef CONFIG_PLATFORM_EC_SHA256_HW_ACCELERATE -#define CONFIG_SHA256_HW_ACCELERATE -#endif - -#undef CONFIG_RO_HDR_MEM_OFF -#ifdef CONFIG_PLATFORM_EC_RO_HEADER_OFFSET -#define CONFIG_RO_HDR_MEM_OFF CONFIG_PLATFORM_EC_RO_HEADER_OFFSET -#else -#define CONFIG_RO_HDR_MEM_OFF 0 -#endif - -#undef CONFIG_RO_HDR_SIZE -#ifdef CONFIG_PLATFORM_EC_RO_HEADER_SIZE -#define CONFIG_RO_HDR_SIZE CONFIG_PLATFORM_EC_RO_HEADER_SIZE -#else -#define CONFIG_RO_HDR_SIZE 0 -#endif - -#undef CONFIG_SYSTEM_UNLOCKED -#ifdef CONFIG_PLATFORM_EC_SYSTEM_UNLOCKED -#define CONFIG_SYSTEM_UNLOCKED -#endif - -#undef CONFIG_BYPASS_CBI_EEPROM_WP_CHECK -#ifdef CONFIG_PLATFORM_EC_BYPASS_CBI_EEPROM_WP_CHECK -#define CONFIG_BYPASS_CBI_EEPROM_WP_CHECK -#endif - -#undef CONFIG_SPI_FLASH_REGS -#ifdef CONFIG_PLATFORM_EC_SPI_FLASH_REGS -#define CONFIG_SPI_FLASH_REGS -#endif - -#undef CONFIG_CMD_CHARGEN -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGEN -#define CONFIG_CMD_CHARGEN -#endif - -#undef CONFIG_DEBUG_ASSERT -#ifdef CONFIG_PLATFORM_EC_DEBUG_ASSERT -#define CONFIG_DEBUG_ASSERT -#endif - -#undef CONFIG_DEBUG_ASSERT_BRIEF -#ifdef CONFIG_PLATFORM_EC_DEBUG_ASSERT_BRIEF -#define CONFIG_DEBUG_ASSERT_BRIEF -#endif - -#undef CONFIG_DEBUG_ASSERT_REBOOTS -#ifdef CONFIG_PLATFORM_EC_DEBUG_ASSERT_REBOOTS -#define CONFIG_DEBUG_ASSERT_REBOOTS -#endif - -#undef CONFIG_MPU -#ifdef CONFIG_PLATFORM_EC_MPU -#define CONFIG_MPU -#endif - -#undef CONFIG_CMD_SYSINFO -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSINFO -#define CONFIG_CMD_SYSINFO -#endif - -#undef CONFIG_CMD_SCRATCHPAD -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_SCRATCHPAD -#define CONFIG_CMD_SCRATCHPAD -#endif - -#undef CONFIG_CMD_SYSJUMP -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_SYSJUMP -#define CONFIG_CMD_SYSJUMP -#endif - -#undef CONFIG_WATCHDOG_PERIOD_MS -#ifdef CONFIG_PLATFORM_EC_WATCHDOG_PERIOD_MS -#define CONFIG_WATCHDOG_PERIOD_MS CONFIG_PLATFORM_EC_WATCHDOG_PERIOD_MS -#endif - -#undef CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS -#if defined(CONFIG_PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS) || \ - defined(CONFIG_WDT_NPCX_DELAY_CYCLES) || \ - defined(CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS) -/* - * Note: - * NPCX wdt driver uses CONFIG_WDT_NPCX_DELAY_CYCLES to set the leading - * time of the watchdog warning timer. - * IT8XXX2 WDT driver uses CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS period - * between watchdog warning and reset. - */ -#ifdef CONFIG_WDT_NPCX_DELAY_CYCLES -#define CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS \ - (CONFIG_WDT_NPCX_DELAY_CYCLES * 31) -#elif CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS -#define CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS \ - CONFIG_WDT_ITE_WARNING_LEADING_TIME_MS -#else -#define CONFIG_WATCHDOG_WARNING_LEADING_TIME_MS \ - CONFIG_PLATFORM_EC_WATCHDOG_WARNING_LEADING_TIME_MS -#endif -#endif - -#undef CONFIG_VBOOT_EFS -#undef CONFIG_VBOOT_EFS2 -#ifdef CONFIG_PLATFORM_EC_VBOOT_EFS2 -#define CONFIG_VBOOT_EFS2 -#endif - -#undef CONFIG_USB_PD_TCPC_VCONN -#ifdef CONFIG_PLATFORM_EC_USB_PD_TCPC_VCONN -#define CONFIG_USB_PD_TCPC_VCONN -#endif - -#undef CONFIG_DPTF -#ifdef CONFIG_PLATFORM_EC_DPTF -#define CONFIG_DPTF -#endif - -#undef CONFIG_CHARGER_BQ25710 -#ifdef CONFIG_PLATFORM_EC_CHARGER_BQ25710 -#define CONFIG_CHARGER_BQ25710 -#endif - -#undef CONFIG_CHARGER_BQ25720 -#ifdef CONFIG_PLATFORM_EC_CHARGER_BQ25720 -#define CONFIG_CHARGER_BQ25720 -#endif - -#undef CONFIG_CHARGER_BQ25720_VSYS_TH2_DV -#ifdef CONFIG_PLATFORM_EC_CHARGER_BQ25720_VSYS_TH2_CUSTOM -#define CONFIG_CHARGER_BQ25720_VSYS_TH2_DV \ - CONFIG_PLATFORM_EC_CHARGER_BQ25720_VSYS_TH2_DV -#endif - -#undef CONFIG_HIBERNATE_PSL -#ifdef CONFIG_PLATFORM_EC_HIBERNATE_PSL -#define CONFIG_HIBERNATE_PSL -#endif - -#undef CONFIG_BATTERY_DEVICE_CHEMISTRY -#ifdef CONFIG_PLATFORM_EC_USE_BATTERY_DEVICE_CHEMISTRY -#define CONFIG_BATTERY_DEVICE_CHEMISTRY \ - CONFIG_PLATFORM_EC_BATTERY_DEVICE_CHEMISTRY -#endif - -#undef CONFIG_CHARGER_DISCHARGE_ON_AC -#ifdef CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC -#define CONFIG_CHARGER_DISCHARGE_ON_AC -#endif - -#undef CONFIG_CHARGER_DISCHARGE_ON_AC_CUSTOM -#ifdef CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC_CUSTOM -#define CONFIG_CHARGER_DISCHARGE_ON_AC_CUSTOM -#endif - -#undef CONFIG_CHARGER_SENSE_RESISTOR -#ifdef CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR -#define CONFIG_CHARGER_SENSE_RESISTOR \ - CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR -#endif - -#undef CONFIG_CHARGER_SENSE_RESISTOR_AC -#ifdef CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC -#define CONFIG_CHARGER_SENSE_RESISTOR_AC \ - CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC -#endif - -#undef CONFIG_CHARGER_PROFILE_OVERRIDE -#ifdef CONFIG_PLATFORM_EC_CHARGER_PROFILE_OVERRIDE -#define CONFIG_CHARGER_PROFILE_OVERRIDE -#endif - -#undef CONFIG_CHARGER_PSYS -#ifdef CONFIG_PLATFORM_EC_CHARGER_PSYS -#define CONFIG_CHARGER_PSYS -#endif - -#undef CONFIG_CHARGER_PSYS_READ -#ifdef CONFIG_PLATFORM_EC_CHARGER_PSYS_READ -#define CONFIG_CHARGER_PSYS_READ -#endif - -#undef CONFIG_CMD_CHARGER_ADC_AMON_BMON -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_CHARGER_ADC_AMON_BMON -#define CONFIG_CMD_CHARGER_ADC_AMON_BMON -#endif - -#undef CONFIG_USB_PD_ONLY_FIXED_PDOS -#ifdef CONFIG_PLATFORM_EC_USB_PD_ONLY_FIXED_PDOS -#define CONFIG_USB_PD_ONLY_FIXED_PDOS -#endif - -#undef CONFIG_MP2964 -#ifdef CONFIG_PLATFORM_EC_MP2964 -#define CONFIG_MP2964 -#endif - -#undef CONFIG_ACCELGYRO_ICM_COMM_SPI -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_ICM_COMM_SPI -#define CONFIG_ACCELGYRO_ICM_COMM_SPI -#endif - -#undef CONFIG_ACCELGYRO_ICM_COMM_I2C -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_ICM_COMM_I2C -#define CONFIG_ACCELGYRO_ICM_COMM_I2C -#endif - -#undef CONFIG_ACCELGYRO_BMI_COMM_SPI -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_SPI -#define CONFIG_ACCELGYRO_BMI_COMM_SPI -#endif - -#undef CONFIG_ACCELGYRO_BMI_COMM_I2C -#ifdef CONFIG_PLATFORM_EC_ACCELGYRO_BMI_COMM_I2C -#define CONFIG_ACCELGYRO_BMI_COMM_I2C -#endif - -#undef CONFIG_CMD_SLEEPMASK -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_SLEEPMASK -#define CONFIG_CMD_SLEEPMASK -#endif - -#undef CONFIG_CMD_SLEEPMASK_SET -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_SLEEPMASK_SET -#define CONFIG_CMD_SLEEPMASK_SET -#endif - -#undef CONFIG_LOW_POWER_IDLE -#ifdef CONFIG_PLATFORM_EC_LOW_POWER_IDLE -#define CONFIG_LOW_POWER_IDLE -#endif - -#undef CONFIG_PORT80_4_BYTE -#ifdef CONFIG_PLATFORM_EC_PORT80_4_BYTE -#define CONFIG_PORT80_4_BYTE -#endif - -#undef CONFIG_ASSERT_CCD_MODE_ON_DTS_CONNECT -#ifdef CONFIG_PLATFORM_EC_ASSERT_CCD_MODE_ON_DTS_CONNECT -#define CONFIG_ASSERT_CCD_MODE_ON_DTS_CONNECT -#endif - -#undef CONFIG_CCD_USBC_PORT_NUMBER -#ifdef CONFIG_PLATFORM_EC_CCD_USBC_PORT_NUMBER -#define CONFIG_CCD_USBC_PORT_NUMBER CONFIG_PLATFORM_EC_CCD_USBC_PORT_NUMBER -#endif - -#undef CONFIG_ACCEL_LIS2DW12 -#ifdef CONFIG_PLATFORM_EC_ACCEL_LIS2DW12 -#define CONFIG_ACCEL_LIS2DW12 -#endif - -#undef CONFIG_ACCEL_LIS2DW_AS_BASE -#ifdef CONFIG_PLATFORM_EC_ACCEL_LIS2DW12_AS_BASE -#define CONFIG_ACCEL_LIS2DW_AS_BASE -#endif - -#undef CONFIG_CONSOLE_CHANNEL -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CHANNEL -#define CONFIG_CONSOLE_CHANNEL -#endif - -#undef CONFIG_USB_PD_DP_HPD_GPIO -#ifdef CONFIG_PLATFORM_EC_USB_PD_DP_HPD_GPIO -#define CONFIG_USB_PD_DP_HPD_GPIO -#endif - -#undef CONFIG_USB_PD_DP_HPD_GPIO_CUSTOM -#ifdef CONFIG_PLATFORM_EC_USB_PD_DP_HPD_GPIO_CUSTOM -#define CONFIG_USB_PD_DP_HPD_GPIO_CUSTOM -#endif - -#undef CONSOLE_CMD_MFALLOW -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_MFALLOW -#define CONSOLE_CMD_MFALLOW -#endif - -#undef CONFIG_TEMP_SENSOR_FIRST_READ_DELAY_MS -#ifdef CONFIG_PLATFORM_EC_TEMP_SENSOR_FIRST_READ_DELAY -#define CONFIG_TEMP_SENSOR_FIRST_READ_DELAY_MS \ - CONFIG_PLATFORM_EC_TEMP_SENSOR_FIRST_READ_DELAY_MS -#endif - -#undef CONFIG_CMD_S5_TIMEOUT -#ifdef CONFIG_PLATFORM_EC_CONSOLE_CMD_S5_TIMEOUT -#define CONFIG_CMD_S5_TIMEOUT -#endif - -#undef CONFIG_FW_RESET_VECTOR -#ifdef CONFIG_PLATFORM_EC_FW_RESET_VECTOR -#define CONFIG_FW_RESET_VECTOR -#endif - -#undef CONFIG_HOSTCMD_DEBUG_MODE -#if defined(CONFIG_HCDEBUG_OFF) -#define CONFIG_HOSTCMD_DEBUG_MODE 0 -#elif defined(CONFIG_HCDEBUG_NORMAL) -#define CONFIG_HOSTCMD_DEBUG_MODE 1 -#elif defined(CONFIG_HCDEBUG_EVERY) -#define CONFIG_HOSTCMD_DEBUG_MODE 2 -#elif defined(CONFIG_HCDEBUG_PARAMS) -#define CONFIG_HOSTCMD_DEBUG_MODE 3 -#endif - -#undef CONFIG_AMD_SB_RMI -#ifdef CONFIG_PLATFORM_EC_AMD_SB_RMI -#define CONFIG_AMD_SB_RMI -#endif - -#undef CONFIG_AMD_STT -#ifdef CONFIG_PLATFORM_EC_AMD_STT -#define CONFIG_AMD_STT -#endif - -#endif /* __CROS_EC_CONFIG_CHIP_H */ diff --git a/zephyr/shim/include/cpu.h b/zephyr/shim/include/cpu.h deleted file mode 100644 index 617f644fa9..0000000000 --- a/zephyr/shim/include/cpu.h +++ /dev/null @@ -1,14 +0,0 @@ -/* 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. - */ - -#ifndef __CROS_EC_CPU_H -#define __CROS_EC_CPU_H - -/* Do nothing for Zephyr */ -static inline void cpu_init(void) -{ -} - -#endif /* __CROS_EC_CPU_H */ diff --git a/zephyr/shim/include/ec_tasks.h b/zephyr/shim/include/ec_tasks.h deleted file mode 100644 index 6f75bd577e..0000000000 --- a/zephyr/shim/include/ec_tasks.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_EC_TASKS_H -#define __CROS_EC_EC_TASKS_H - -/* - * The lowest preemptive thread priority is (CONFIG_NUM_PREEMT_PRIORITIES-1) - * while the lowest cooperative thread priority is -1. - * - * https://docs.zephyrproject.org/latest/reference/kernel/threads/index.html#thread-priorities - */ -#define LOWEST_THREAD_PRIORITY \ - COND_CODE_1(CONFIG_PREEMPT_ENABLED, \ - (CONFIG_NUM_PREEMPT_PRIORITIES - 1), (-1)) - -/** Starts all of the shimmed EC tasks. Requires CONFIG_SHIMMED_TASKS=y. */ -void start_ec_tasks(void); - -#ifdef TEST_BUILD -/** - * Set TASK_ID_TEST_RUNNER to current thread tid. Some functions that are tested - * require to run in any task context. - */ -void set_test_runner_tid(void); -#endif - -#endif /* __CROS_EC_EC_TASKS_H */ diff --git a/zephyr/shim/include/fpu.h b/zephyr/shim/include/fpu.h deleted file mode 100644 index da36f50492..0000000000 --- a/zephyr/shim/include/fpu.h +++ /dev/null @@ -1,56 +0,0 @@ -/* 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. - */ - -#ifndef __CROS_EC_FPU_H -#define __CROS_EC_FPU_H - -/* - * These functions are available in newlib but we are are using Zephyr's - * minimal library at present. - * - * This file is not called math.h to avoid a conflict with the toolchain's - * built-in version. - * - * This code is taken from core/cortex-m/include/fpu.h - */ - -#ifdef CONFIG_PLATFORM_EC_FPU - -/* Implementation for Cortex-M */ -#ifdef CONFIG_CPU_CORTEX_M -static inline float sqrtf(float v) -{ - float root; - - /* Use the CPU instruction */ - __asm__ volatile( - "fsqrts %0, %1" - : "=w" (root) - : "w" (v) - ); - - return root; -} - -static inline float fabsf(float v) -{ - float root; - - /* Use the CPU instruction */ - __asm__ volatile( - "fabss %0, %1" - : "=w" (root) - : "w" (v) - ); - - return root; -} -#else -#error "Unsupported core: please add an implementation" -#endif /* CONFIG_CPU_CORTEX_M */ - -#endif /* CONFIG_PLATFORM_EC_FPU */ - -#endif /* __CROS_EC_MATH_H */ diff --git a/zephyr/shim/include/gpio/gpio.h b/zephyr/shim/include/gpio/gpio.h deleted file mode 100644 index 18089e8a8e..0000000000 --- a/zephyr/shim/include/gpio/gpio.h +++ /dev/null @@ -1,95 +0,0 @@ -/* 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. - */ - -#ifndef ZEPHYR_SHIM_INCLUDE_GPIO_GPIO_H_ -#define ZEPHYR_SHIM_INCLUDE_GPIO_GPIO_H_ - -#include <device.h> -#include <devicetree.h> - -/* Information about each unused pin in the 'unused-pins' device tree node. */ -struct unused_pin_config { - /* Device name of a unused gpio pin */ - const char *dev_name; - /* Bit number of pin within a unused gpio pin */ - gpio_pin_t pin; - /* Config flags of unused gpio pin */ - gpio_flags_t flags; -}; - -/** - * @brief Set proper configuration for all unused pins. - * - * This function loops through all unused GPIOs in the node of "unused-gpios" - * in the device tree file to set proper configuration. If the GPIO flag is 0, - * set the GPIOs default setting for floating IOs to improve the power - * consumption. - * - * @return 0 If successful. - * @retval -ENOTSUP Not supported gpio device. - * @retval -EIO I/O error when accessing an external GPIO chip. - */ -int gpio_config_unused_pins(void) __attribute__((weak)); - -#if DT_NODE_EXISTS(DT_PATH(unused_pins)) -/** - * @brief Get a node from path '/unused-pins' which has a prop 'unused-gpios'. - * It contains unused GPIOs and chip vendor needs to configure them for - * better power consumption in the lowest power state. - * - * @return node identifier with that path. - */ -#define UNUSED_PINS_LIST DT_PATH(unused_pins) - -/** - * @brief Length of 'unused-gpios' property - * - * @return length of 'unused-gpios' prop which type is 'phandle-array' - */ -#define UNUSED_GPIOS_LIST_LEN DT_PROP_LEN(UNUSED_PINS_LIST, unused_gpios) - -/** - * @brief Construct a unused_pin_config structure from 'unused-gpios' property - * at index 'i' - * - * @param i index of 'unused-gpios' prop which type is 'phandles-array' - * @return unused_pin_config item at index 'i' - */ -#define UNUSED_GPIO_CONFIG_BY_IDX(i, _) \ - { \ - .dev_name = DT_GPIO_LABEL_BY_IDX(UNUSED_PINS_LIST, \ - unused_gpios, i), \ - .pin = DT_GPIO_PIN_BY_IDX(UNUSED_PINS_LIST, unused_gpios, i), \ - .flags = DT_GPIO_FLAGS_BY_IDX(UNUSED_PINS_LIST, unused_gpios, \ - i), \ - }, - -/** - * @brief Macro function to construct a list of unused_pin_config items by - * UTIL_LISTIFY func. - * - * Example devicetree fragment: - * / { - * unused-pins { - * compatible = "unused-gpios"; - * unused-gpios = <&gpio5 1 0>, - * <&gpiod 0 0>, - * <&gpiof 3 0>; - * }; - * - * Example usage: - * static const struct unused_pin_config unused_pin_configs[] = { - * UNUSED_GPIO_CONFIG_LIST - * }; - * - * @return a list of unused_pin_config items - */ -#define UNUSED_GPIO_CONFIG_LIST \ - UTIL_LISTIFY(UNUSED_GPIOS_LIST_LEN, UNUSED_GPIO_CONFIG_BY_IDX, _) - -#else -#define UNUSED_GPIO_CONFIG_LIST /* Nothing if no 'unused-pins' node */ -#endif /* unused_pins */ -#endif /* ZEPHYR_SHIM_INCLUDE_GPIO_GPIO_H_ */ diff --git a/zephyr/shim/include/i2c/i2c.h b/zephyr/shim/include/i2c/i2c.h deleted file mode 100644 index d945732856..0000000000 --- a/zephyr/shim/include/i2c/i2c.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef ZEPHYR_CHROME_I2C_I2C_H -#define ZEPHYR_CHROME_I2C_I2C_H - -#include <device.h> -#include <devicetree.h> - -#ifdef CONFIG_PLATFORM_EC_I2C -#if DT_NODE_EXISTS(DT_PATH(named_i2c_ports)) - -#define I2C_PORT(id) DT_STRING_UPPER_TOKEN(id, enum_name) -#define I2C_PORT_WITH_COMMA(id) I2C_PORT(id), - -enum i2c_ports { - DT_FOREACH_CHILD(DT_PATH(named_i2c_ports), I2C_PORT_WITH_COMMA) - I2C_PORT_COUNT -}; -#define NAMED_I2C(name) I2C_PORT(DT_PATH(named_i2c_ports, name)) -#endif /* named_i2c_ports */ -#endif /* CONFIG_PLATFORM_EC_I2C */ - -/** - * @brief Adaptation of platform/ec's port IDs which map a port/bus to a device. - * - * This function should be implemented per chip and should map the enum value - * defined for the chip for encoding each valid port/bus combination. For - * example, the npcx chip defines the port/bus combinations NPCX_I2C_PORT* under - * chip/npcx/registers-npcx7.h. - * - * Thus, the npcx shim should implement this function to map the enum values - * to the correct devicetree device. - * - * @param port The port to get the device for. - * @return Pointer to the device struct or {@code NULL} if none are available. - */ -const struct device *i2c_get_device_for_port(const int port); - -/** - * @brief Get a port number for a received remote port number. - * - * This function translate a received port number via the I2C_PASSTHRU host - * command to a port number used in ZephyrEC based on remote_port property in - * dts. The first port which matches the remote port number is returned. - * - * @param port The received remote port. - * @return Port number used in EC. -1 if the remote port is not defined - */ -int i2c_get_port_from_remote_port(int remote_port); - -#endif /* ZEPHYR_CHROME_I2C_I2C_H */ diff --git a/zephyr/shim/include/linker.h b/zephyr/shim/include/linker.h deleted file mode 100644 index 335f4f0f19..0000000000 --- a/zephyr/shim/include/linker.h +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_LINKER_H -#define __CROS_EC_LINKER_H - -/* Put the start of shared memory after all allocated RAM symbols */ -#define __shared_mem_buf _image_ram_end - -#endif diff --git a/zephyr/shim/include/motionsense_sensors.h b/zephyr/shim/include/motionsense_sensors.h deleted file mode 100644 index bdec8e79bd..0000000000 --- a/zephyr/shim/include/motionsense_sensors.h +++ /dev/null @@ -1,103 +0,0 @@ -/* 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. - */ - -#ifndef __CROS_EC_MOTIONSENSE_SENSORS_H -#define __CROS_EC_MOTIONSENSE_SENSORS_H - -#include <devicetree.h> - -#define SENSOR_NODE DT_PATH(motionsense_sensor) -#define SENSOR_INFO_NODE DT_PATH(motionsense_sensor_info) -#define SENSOR_ALT_NODE DT_PATH(motionsense_sensor_alt) - -#define SENSOR_ID(id) DT_CAT(SENSOR_, id) - -/* Define the SENSOR_ID if: - * DT_NODE_HAS_STATUS(id, okay) && !DT_NODE_HAS_PROP(id, alternate_for) - */ -#define SENSOR_ID_WITH_COMMA(id) \ - IF_ENABLED(DT_NODE_HAS_STATUS(id, okay), \ - (COND_CODE_0(DT_NODE_HAS_PROP(id, alternate_for), \ - (SENSOR_ID(id), ), ()))) - -enum sensor_id { -#if DT_NODE_EXISTS(SENSOR_NODE) - DT_FOREACH_CHILD(SENSOR_NODE, SENSOR_ID_WITH_COMMA) -#endif - SENSOR_COUNT, -}; - -#undef SENSOR_ID_WITH_COMMA -/* Define the SENSOR_ID if: - * DT_NODE_HAS_STATUS(id, okay) && DT_NODE_HAS_PROP(id, alternate_for) - */ -#define SENSOR_ID_WITH_COMMA(id) \ - IF_ENABLED(DT_NODE_HAS_STATUS(id, okay), \ - (COND_CODE_1(DT_NODE_HAS_PROP(id, alternate_for), \ - (SENSOR_ID(id), ), ()))) -enum sensor_alt_id { -#if DT_NODE_EXISTS(SENSOR_ALT_NODE) - DT_FOREACH_CHILD(SENSOR_ALT_NODE, SENSOR_ID_WITH_COMMA) -#endif - SENSOR_ALT_COUNT, -}; - -/* - * Find the accelerometers for lid angle calculation. - * - * The angle calculation requires two accelerometers. One is on the lid - * and the other one is on the base. So we need to specify which sensor is - * on the lid and which one is on the base. We use two labels "lid_accel" - * and "base_accel". - * - * base_accel - label for the accelerometer sensor on the base. - * lid_accel - label for the accelerometer sensor on the lid. - * - * e.g) below shows BMA255 is the accelerometer on the lid and bmi260 is - * the accelerometer on the base. - * - * motionsense-sensor { - * lid_accel: lid-accel { - * compatible = "cros-ec,bma255"; - * status = "okay"; - * : - * : - * }; - * - * base_accel: base-accel { - * compatible = "cros-ec,bmi260"; - * status = "okay"; - * : - * : - * }; - * }; - */ -#ifdef CONFIG_LID_ANGLE -#define CONFIG_LID_ANGLE_SENSOR_LID SENSOR_ID(DT_NODELABEL(lid_accel)) -#define CONFIG_LID_ANGLE_SENSOR_BASE SENSOR_ID(DT_NODELABEL(base_accel)) -#endif - -/* - * Get the sensors running in force mode from DT and create a bit mask for it. - * - * e.g) lid accel and als_clear are in accel_force_mode. The macro below finds - * the corresponding bit for each sensor in bit mask and set it. - * motionsense-sensor-info { - * compatible = "cros-ec,motionsense-sensor-info"; - * - * // list of sensors in force mode - * accel-force-mode-sensors = <&lid_accel &als_clear>; - * }; - */ -#if DT_NODE_HAS_PROP(SENSOR_INFO_NODE, accel_force_mode_sensors) -#define SENSOR_IN_FORCE_MODE(i, id) \ - | BIT(SENSOR_ID(DT_PHANDLE_BY_IDX(id, accel_force_mode_sensors, i))) -#define CONFIG_ACCEL_FORCE_MODE_MASK \ - (0 UTIL_LISTIFY(DT_PROP_LEN(SENSOR_INFO_NODE, \ - accel_force_mode_sensors), SENSOR_IN_FORCE_MODE, \ - SENSOR_INFO_NODE)) -#endif - -#endif /* __CROS_EC_MOTIONSENSE_SENSORS_H */ diff --git a/zephyr/shim/include/mpu.h b/zephyr/shim/include/mpu.h deleted file mode 100644 index 3555ef0db1..0000000000 --- a/zephyr/shim/include/mpu.h +++ /dev/null @@ -1,35 +0,0 @@ -/* 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. - */ - -#ifndef __CROS_EC_MPU_H -#define __CROS_EC_MPU_H - -/* This matches up with core/cortex-m/include/mpu.h */ - -/* Location of iram.text */ -extern char __iram_text_start; -extern char __iram_text_end; - -/** Enable MPU */ -void mpu_enable(void); - -/** - * Returns the value of MPU type register - * - * @returns 0 for now (always) - */ -uint32_t mpu_get_type(void); - -/** Protect RAM from code execution */ -int mpu_protect_data_ram(void); - -/** Protect code RAM from being overwritten */ -int mpu_protect_code_ram(void); - -/** Protect internal mapped flash memory from code execution */ -int mpu_lock_ro_flash(void); -int mpu_lock_rw_flash(void); - -#endif /* __CROS_EC_CPU_H */ diff --git a/zephyr/shim/include/pwm/pwm.h b/zephyr/shim/include/pwm/pwm.h deleted file mode 100644 index 1bf4685837..0000000000 --- a/zephyr/shim/include/pwm/pwm.h +++ /dev/null @@ -1,26 +0,0 @@ -/* 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. - */ - -#ifndef ZEPHYR_SHIM_INCLUDE_PWM_PWM_H_ -#define ZEPHYR_SHIM_INCLUDE_PWM_PWM_H_ - -#include <device.h> -#include <devicetree.h> - -#if DT_NODE_EXISTS(DT_PATH(named_pwms)) - -#define PWM_CHANNEL(id) DT_CAT(PWM_, id) -#define PWM_CHANNEL_WITH_COMMA(id) PWM_CHANNEL(id), - -enum pwm_channel { - DT_FOREACH_CHILD(DT_PATH(named_pwms), PWM_CHANNEL_WITH_COMMA) - PWM_CH_COUNT, -}; - -#define NAMED_PWM(name) PWM_CHANNEL(DT_PATH(named_pwms, name)) - -#endif /* named_pwms */ - -#endif /* ZEPHYR_SHIM_INCLUDE_PWM_PWM_H_ */ diff --git a/zephyr/shim/include/registers.h b/zephyr/shim/include/registers.h deleted file mode 100644 index b693733a21..0000000000 --- a/zephyr/shim/include/registers.h +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_REGISTERS_H -#define __CROS_EC_REGISTERS_H - -/* - * This file is left intentionally blank. It is required since many of the - * shimmed files from platform/ec/common include it. Normally, this file - * would define chip specific registers and would reside under - * platform/ec/chip/... - */ - -#endif /* __CROS_EC_REGISTERS_H */ diff --git a/zephyr/shim/include/shimmed_task_id.h b/zephyr/shim/include/shimmed_task_id.h deleted file mode 100644 index f56edf0806..0000000000 --- a/zephyr/shim/include/shimmed_task_id.h +++ /dev/null @@ -1,119 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_SHIMMED_TASK_ID_H -#define __CROS_EC_SHIMMED_TASK_ID_H - -#include "common.h" - -/* Task identifier (8 bits) */ -typedef uint8_t task_id_t; - -/* - * Highest priority on bottom -- same as in platform/ec. List of CROS_EC_TASK - * items. See CONFIG_TASK_LIST in platform/ec's config.h for more information. - * For tests that want their own custom tasks, use CONFIG_HAS_TEST_TASKS and not - * CONFIG_SHIMMED_TASKS. - */ -#ifdef CONFIG_SHIMMED_TASKS -#define CROS_EC_TASK_LIST \ - COND_CODE_1(HAS_TASK_HOOKS, \ - (CROS_EC_TASK(HOOKS, hook_task, 0, \ - CONFIG_TASK_HOOKS_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_CHG_RAMP, \ - (CROS_EC_TASK(CHG_RAMP, chg_ramp_task, 0, \ - CONFIG_TASK_CHG_RAMP_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_USB_CHG_P0, \ - (CROS_EC_TASK(USB_CHG_P0, usb_charger_task, 0, \ - CONFIG_TASK_USB_CHG_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_USB_CHG_P1, \ - (CROS_EC_TASK(USB_CHG_P1, usb_charger_task, 0, \ - CONFIG_TASK_USB_CHG_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_USB_CHG_P2, \ - (CROS_EC_TASK(USB_CHG_P2, usb_charger_task, 0, \ - CONFIG_TASK_USB_CHG_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_CHARGER, \ - (CROS_EC_TASK(CHARGER, charger_task, 0, \ - CONFIG_TASK_CHARGER_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_CHIPSET, \ - (CROS_EC_TASK(CHIPSET, chipset_task, 0, \ - CONFIG_TASK_CHIPSET_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_MOTIONSENSE, \ - (CROS_EC_TASK(MOTIONSENSE, motion_sense_task, 0, \ - CONFIG_TASK_MOTIONSENSE_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_HOSTCMD, \ - (CROS_EC_TASK(HOSTCMD, host_command_task, 0, \ - CONFIG_TASK_HOSTCMD_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_KEYPROTO, \ - (CROS_EC_TASK(KEYPROTO, keyboard_protocol_task, 0, \ - CONFIG_TASK_KEYPROTO_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_POWERBTN, \ - (CROS_EC_TASK(POWERBTN, power_button_task, 0, \ - CONFIG_TASK_POWERBTN_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_KEYSCAN, \ - (CROS_EC_TASK(KEYSCAN, keyboard_scan_task, 0, \ - CONFIG_TASK_KEYSCAN_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_PD_C0, \ - (CROS_EC_TASK(PD_C0, pd_task, 0, \ - CONFIG_TASK_PD_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_PD_C1, \ - (CROS_EC_TASK(PD_C1, pd_task, 0, \ - CONFIG_TASK_PD_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_PD_C2, \ - (CROS_EC_TASK(PD_C2, pd_task, 0, \ - CONFIG_TASK_PD_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_PD_C3, \ - (CROS_EC_TASK(PD_C3, pd_task, 0, \ - CONFIG_TASK_PD_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_PD_INT_C0, \ - (CROS_EC_TASK(PD_INT_C0, pd_interrupt_handler_task, 0, \ - CONFIG_TASK_PD_INT_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_PD_INT_C1, \ - (CROS_EC_TASK(PD_INT_C1, pd_interrupt_handler_task, 1, \ - CONFIG_TASK_PD_INT_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_PD_INT_C2, \ - (CROS_EC_TASK(PD_INT_C2, pd_interrupt_handler_task, 2, \ - CONFIG_TASK_PD_INT_STACK_SIZE)), ()) \ - COND_CODE_1(HAS_TASK_PD_INT_C3, \ - (CROS_EC_TASK(PD_INT_C3, pd_interrupt_handler_task, 3, \ - CONFIG_TASK_PD_INT_STACK_SIZE)), ()) -#elif defined(CONFIG_HAS_TEST_TASKS) -#include "shimmed_test_tasks.h" -/* - * There are two different ways to define a task list (because historical - * reasons). Applications use CROS_EC_TASK_LIST to define their tasks, while - * unit tests that need additional tasks use CONFIG_TEST_TASK_LIST. For - * shimming a unit test, define CROS_EC_TASk_LIST as whatever - * CONFIG_TEST_TASK_LIST expands to. - */ -#if defined(CONFIG_TEST_TASK_LIST) && !defined(CROS_EC_TASK_LIST) -#define CROS_EC_TASK_LIST CONFIG_TEST_TASK_LIST -#endif /* CONFIG_TEST_TASK_LIST && !CROS_EC_TASK_LIST */ -#endif /* !CONFIG_ZTEST */ - -#ifndef CROS_EC_TASK_LIST -#define CROS_EC_TASK_LIST -#endif /* CROS_EC_TASK_LIST */ - -/* - * Define the task_ids globally for all shimmed platform/ec code to use. - * Note that unit test task lists use TASK_TEST, which we can just alias - * into a regular CROS_EC_TASK. - */ -#define CROS_EC_TASK(name, ...) TASK_ID_##name, -#define TASK_TEST(name, ...) CROS_EC_TASK(name) -enum { - TASK_ID_IDLE = -1, /* We don't shim the idle task */ - CROS_EC_TASK_LIST -#ifdef TEST_BUILD - TASK_ID_TEST_RUNNER, -#endif - TASK_ID_COUNT, - TASK_ID_INVALID = 0xff, /* Unable to find the task */ -}; -#undef CROS_EC_TASK -#undef TASK_TEST - -#endif /* __CROS_EC_SHIMMED_TASK_ID_H */ diff --git a/zephyr/shim/include/shimmed_tasks.h b/zephyr/shim/include/shimmed_tasks.h deleted file mode 100644 index 631b3fcb16..0000000000 --- a/zephyr/shim/include/shimmed_tasks.h +++ /dev/null @@ -1,90 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_SHIMMED_TASKS_H -#define __CROS_EC_SHIMMED_TASKS_H - -#ifdef CONFIG_HAS_TASK_CHARGER -#define HAS_TASK_CHARGER 1 -#endif /* CONFIG_HAS_TASK_CHARGER */ - -#ifdef CONFIG_HAS_TASK_CHG_RAMP -#define HAS_TASK_CHG_RAMP 1 -#endif /* CONFIG_HAS_TASK_CHG_RAMP */ - -#ifdef CONFIG_HAS_TASK_CHIPSET -#define HAS_TASK_CHIPSET 1 -#endif /* CONFIG_HAS_TASK_CHIPSET */ - -#ifdef CONFIG_HAS_TASK_HOOKS -#define HAS_TASK_HOOKS 1 -#endif /* CONFIG_HAS_TASK_HOOKS */ - -#ifdef CONFIG_HAS_TASK_HOSTCMD -#define HAS_TASK_HOSTCMD 1 -#define CONFIG_HOSTCMD_EVENTS -#endif /* CONFIG_HAS_TASK_HOSTCMD */ - -#ifdef CONFIG_HAS_TASK_KEYSCAN -#define HAS_TASK_KEYSCAN 1 -#endif /* CONFIG_HAS_TASK_KEYSCAN */ - -#ifdef CONFIG_HAS_TASK_KEYPROTO -#define HAS_TASK_KEYPROTO 1 -#endif /* CONFIG_HAS_TASK_KEYPROTO */ - -#ifdef CONFIG_HAS_TASK_MOTIONSENSE -#define HAS_TASK_MOTIONSENSE 1 -#endif /* CONFIG_HAS_TASK_MOTIONSENSE */ - -#ifdef CONFIG_HAS_TASK_PD_C0 -#define HAS_TASK_PD_C0 1 -#endif /* CONFIG_HAS_TASK_PD_C0 */ - -#ifdef CONFIG_HAS_TASK_PD_C1 -#define HAS_TASK_PD_C1 1 -#endif /* CONFIG_HAS_TASK_PD_C1 */ - -#ifdef CONFIG_HAS_TASK_PD_C2 -#define HAS_TASK_PD_C2 1 -#endif /* CONFIG_HAS_TASK_PD_C2 */ - -#ifdef CONFIG_HAS_TASK_PD_C3 -#define HAS_TASK_PD_C3 1 -#endif /* CONFIG_HAS_TASK_PD_C3 */ - -#ifdef CONFIG_HAS_TASK_PD_INT_C0 -#define HAS_TASK_PD_INT_C0 1 -#endif /* CONFIG_HAS_TASK_PD_INT_C0 */ - -#ifdef CONFIG_HAS_TASK_PD_INT_C1 -#define HAS_TASK_PD_INT_C1 1 -#endif /* CONFIG_HAS_TASK_PD_INT_C1 */ - -#ifdef CONFIG_HAS_TASK_PD_INT_C2 -#define HAS_TASK_PD_INT_C2 1 -#endif /* CONFIG_HAS_TASK_PD_INT_C2 */ - -#ifdef CONFIG_HAS_TASK_PD_INT_C3 -#define HAS_TASK_PD_INT_C3 1 -#endif /* CONFIG_HAS_TASK_PD_INT_C3 */ - -#ifdef CONFIG_HAS_TASK_POWERBTN -#define HAS_TASK_POWERBTN 1 -#endif /* CONFIG_HAS_TASK_POWERBTN */ - -#ifdef CONFIG_HAS_TASK_USB_CHG_P0 -#define HAS_TASK_USB_CHG_P0 1 -#endif /* CONFIG_HAS_TASK_USB_CHG_P0 */ - -#ifdef CONFIG_HAS_TASK_USB_CHG_P1 -#define HAS_TASK_USB_CHG_P1 1 -#endif /* CONFIG_HAS_TASK_USB_CHG_P1 */ - -#ifdef CONFIG_HAS_TASK_USB_CHG_P2 -#define HAS_TASK_USB_CHG_P2 1 -#endif /* CONFIG_HAS_TASK_USB_CHG_P2 */ - -#endif /* __CROS_EC_SHIMMED_TASKS_H */ diff --git a/zephyr/shim/include/temp_sensor/temp_sensor.h b/zephyr/shim/include/temp_sensor/temp_sensor.h deleted file mode 100644 index b0cadd4303..0000000000 --- a/zephyr/shim/include/temp_sensor/temp_sensor.h +++ /dev/null @@ -1,28 +0,0 @@ -/* 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. - */ - -#ifndef ZEPHYR_SHIM_INCLUDE_TEMP_SENSOR_TEMP_SENSOR_H_ -#define ZEPHYR_SHIM_INCLUDE_TEMP_SENSOR_TEMP_SENSOR_H_ - -#include <devicetree.h> - -#ifdef CONFIG_PLATFORM_EC_TEMP_SENSOR - -#define ZSHIM_TEMP_SENSOR_ID(node_id) DT_STRING_UPPER_TOKEN(node_id, enum_name) -#define TEMP_SENSOR_ID_WITH_COMMA(node_id) ZSHIM_TEMP_SENSOR_ID(node_id), - -enum temp_sensor_id { -#if DT_NODE_EXISTS(DT_PATH(named_temp_sensors)) - DT_FOREACH_CHILD(DT_PATH(named_temp_sensors), - TEMP_SENSOR_ID_WITH_COMMA) -#endif /* named_temp_sensors */ - TEMP_SENSOR_COUNT -}; - -#undef TEMP_SENSOR_ID_WITH_COMMA - -#endif /* CONFIG_PLATFORM_EC_TEMP_SENSOR */ - -#endif /* ZEPHYR_SHIM_INCLUDE_TEMP_SENSOR_TEMP_SENSOR_H_ */ diff --git a/zephyr/shim/include/zephyr_adc.h b/zephyr/shim/include/zephyr_adc.h deleted file mode 100644 index 7c0f3f3232..0000000000 --- a/zephyr/shim/include/zephyr_adc.h +++ /dev/null @@ -1,41 +0,0 @@ -/* 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. - */ - -#ifndef __CROS_EC_ZEPHYR_ADC_H -#define __CROS_EC_ZEPHYR_ADC_H - -#include <drivers/adc.h> - -#ifdef CONFIG_PLATFORM_EC_ADC - -#define ZSHIM_ADC_ID(node_id) DT_STRING_UPPER_TOKEN(node_id, enum_name) -#define ADC_ID_WITH_COMMA(node_id) ZSHIM_ADC_ID(node_id), - -enum adc_channel { -#if DT_NODE_EXISTS(DT_INST(0, named_adc_channels)) - DT_FOREACH_CHILD(DT_INST(0, named_adc_channels), ADC_ID_WITH_COMMA) -#endif /* named_adc_channels */ - ADC_CH_COUNT -}; - -#undef ADC_ID_WITH_COMMA - -struct adc_t { - const char *name; - uint8_t input_ch; - int factor_mul; - int factor_div; - struct adc_channel_cfg channel_cfg; -}; - -extern const struct adc_t adc_channels[]; -#else -/* Empty declaration to avoid warnings if adc.h is included */ -enum adc_channel { - ADC_CH_COUNT -}; -#endif /* CONFIG_PLATFORM_EC_ADC */ - -#endif /* __CROS_EC_ZEPHYR_ADC_H */ diff --git a/zephyr/shim/include/zephyr_console_shim.h b/zephyr/shim/include/zephyr_console_shim.h deleted file mode 100644 index b3c1f23922..0000000000 --- a/zephyr/shim/include/zephyr_console_shim.h +++ /dev/null @@ -1,85 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_ZEPHYR_CONSOLE_SHIM_H -#define __CROS_EC_ZEPHYR_CONSOLE_SHIM_H - -#include <shell/shell.h> - -struct zephyr_console_command { - /* Handler for the command. argv[0] will be the command name. */ - int (*handler)(int argc, char **argv); -#ifdef CONFIG_SHELL_HELP - /* Description of args */ - const char *argdesc; - /* Short help for command */ - const char *help; -#endif -}; - -#ifdef CONFIG_SHELL_HELP -#define _HELP_ARGS(A, H) \ - .argdesc = A, \ - .help = H, -#else -#define _HELP_ARGS(A, H) -#endif - -/** - * zshim_run_ec_console_command() - Dispatch a CrOS EC console command - * using Zephyr's shell - * - * @command: Pointer to a struct zephyr_console_command - * @argc: The number of command line arguments. - * @argv: The NULL-terminated list of arguments. - * - * Return: the return value from the handler. - */ -int zshim_run_ec_console_command(const struct zephyr_console_command *command, - size_t argc, char **argv); - -/* Internal wrappers for DECLARE_CONSOLE_COMMAND_* macros. */ -#define _ZEPHYR_SHELL_COMMAND_SHIM_2(NAME, ROUTINE_ID, ARGDESC, HELP, \ - WRAPPER_ID, ENTRY_ID) \ - static const struct zephyr_console_command ENTRY_ID = { \ - .handler = ROUTINE_ID, \ - _HELP_ARGS(ARGDESC, HELP) \ - }; \ - static int WRAPPER_ID(const struct shell *shell, size_t argc, \ - char **argv) \ - { \ - return zshim_run_ec_console_command(&ENTRY_ID, argc, argv); \ - } \ - SHELL_CMD_ARG_REGISTER(NAME, NULL, HELP, WRAPPER_ID, 0, \ - SHELL_OPT_ARG_MAX) - -#define _ZEPHYR_SHELL_COMMAND_SHIM(NAME, ROUTINE_ID, ARGDESC, HELP) \ - _ZEPHYR_SHELL_COMMAND_SHIM_2(NAME, ROUTINE_ID, ARGDESC, HELP, \ - UTIL_CAT(zshim_wrapper_, ROUTINE_ID), \ - UTIL_CAT(zshim_entry_, ROUTINE_ID)) - -/* These macros mirror the macros provided by the CrOS EC. */ -#define DECLARE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, HELP) \ - _ZEPHYR_SHELL_COMMAND_SHIM(NAME, ROUTINE, ARGDESC, HELP) - -/* - * TODO(jrosenth): implement flags and restricted commands? We just - * discard this in the shim layer for now. - */ -#define DECLARE_CONSOLE_COMMAND_FLAGS(NAME, ROUTINE, ARGDESC, HELP, FLAGS) \ - _ZEPHYR_SHELL_COMMAND_SHIM(NAME, ROUTINE, ARGDESC, HELP) -#define DECLARE_SAFE_CONSOLE_COMMAND(NAME, ROUTINE, ARGDESC, HELP) \ - _ZEPHYR_SHELL_COMMAND_SHIM(NAME, ROUTINE, ARGDESC, HELP) - -/** - * console_buf_notify_chars() - Notify the console host command buffer - * of bytes on the console. - * - * @s: The pointer to the string. - * @len: The size of the string. - */ -void console_buf_notify_chars(const char *s, size_t len); - -#endif /* __CROS_EC_ZEPHYR_CONSOLE_SHIM_H */ diff --git a/zephyr/shim/include/zephyr_espi_shim.h b/zephyr/shim/include/zephyr_espi_shim.h deleted file mode 100644 index a7b151cec8..0000000000 --- a/zephyr/shim/include/zephyr_espi_shim.h +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright 2020 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. - */ - -#ifndef __CROS_EC_ZEPHYR_ESPI_SHIM_H -#define __CROS_EC_ZEPHYR_ESPI_SHIM_H - -#include <stdbool.h> -#include <stdint.h> - -/** - * zephyr_shim_setup_espi() - initialize eSPI device - * - * Return: 0 upon success, or <0 upon failure. - */ -int zephyr_shim_setup_espi(void); - -/** - * Check if the message is an ACPI command. - * - * @param data The full ACPI event data. - * @return True if the message is a command. - */ -bool is_acpi_command(uint32_t data); - -/** - * Get the value component of the ACPI message. - * - * @param data The full ACPI event data. - * @return The value component of the ACPI message. - */ -uint32_t get_acpi_value(uint32_t data); - -/** - * Check if the 8042 event data contains an input-buffer-full (IBF) event. - * - * @param data The full 8042 event data. - * @return True if the data contains an IBF event. - */ -bool is_8042_ibf(uint32_t data); - -/** - * Check if the 8042 event data contains an output-buffer-empty (OBE) event. - * - * @param data The full 8042 event data. - * @return True if the data contains an OBE event. - */ -bool is_8042_obe(uint32_t data); - -/** - * Get the type of 8042 message. - * - * @param data The full 8042 event data. - * @return The type component of the message. - */ -uint32_t get_8042_type(uint32_t data); - -/** - * Get the data from an 8042 message. - * - * @param data The full 8042 event data. - * @return The data component of the message. - */ -uint32_t get_8042_data(uint32_t data); - -#endif /* __CROS_EC_ZEPHYR_ESPI_SHIM_H */ diff --git a/zephyr/shim/include/zephyr_gpio_signal.h b/zephyr/shim/include/zephyr_gpio_signal.h deleted file mode 100644 index 6c90db81f4..0000000000 --- a/zephyr/shim/include/zephyr_gpio_signal.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2020 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. - */ - -#if !defined(__CROS_EC_GPIO_SIGNAL_H) || defined(__CROS_EC_ZEPHYR_GPIO_SIGNAL_H) -#error "This file must only be included from gpio_signal.h. Include gpio_signal.h directly." -#endif -#define __CROS_EC_ZEPHYR_GPIO_SIGNAL_H - -#include <devicetree.h> -#include <toolchain.h> - -#define GPIO_SIGNAL(id) DT_STRING_UPPER_TOKEN(id, enum_name) -#define GPIO_SIGNAL_WITH_COMMA(id) \ - COND_CODE_1(DT_NODE_HAS_PROP(id, enum_name), (GPIO_SIGNAL(id), ), ()) -enum gpio_signal { - GPIO_UNIMPLEMENTED = -1, -#if DT_NODE_EXISTS(DT_PATH(named_gpios)) - DT_FOREACH_CHILD(DT_PATH(named_gpios), GPIO_SIGNAL_WITH_COMMA) -#endif - GPIO_COUNT, - GPIO_LIMIT = 0x0FFF, -}; -#undef GPIO_SIGNAL_WITH_COMMA -BUILD_ASSERT(GPIO_COUNT < GPIO_LIMIT); - -/** @brief Converts a node identifier under named gpios to enum - * - * Converts the specified node identifier name, which should be nested under - * the named_gpios node, into the correct enum gpio_signal that can be used - * with platform/ec gpio API - */ -#define NAMED_GPIO(name) GPIO_SIGNAL(DT_PATH(named_gpios, name)) - -/** @brief Obtain a named gpio enum from a label and property - * - * Obtains a valid enum gpio_signal that can be used with platform/ec gpio API - * from the property of a labeled node. The property has to point to a - * named_gpios node. - */ -#define NAMED_GPIO_NODELABEL(label, prop) \ - GPIO_SIGNAL(DT_PHANDLE(DT_NODELABEL(label), prop)) - -/* - * While we don't support IO expanders at the moment, multiple - * platform/ec headers (e.g., espi.h) require some of these constants - * to be defined. Define them as a compatibility measure. - */ -enum ioex_signal { - IOEX_SIGNAL_START = GPIO_LIMIT + 1, - IOEX_SIGNAL_END = IOEX_SIGNAL_START, - IOEX_LIMIT = 0x1FFF, -}; -BUILD_ASSERT(IOEX_SIGNAL_END < IOEX_LIMIT); - -#define IOEX_COUNT (IOEX_SIGNAL_END - IOEX_SIGNAL_START) diff --git a/zephyr/shim/include/zephyr_hooks_shim.h b/zephyr/shim/include/zephyr_hooks_shim.h deleted file mode 100644 index 96dcf9d8f4..0000000000 --- a/zephyr/shim/include/zephyr_hooks_shim.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2020 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. - */ - -#if !defined(__CROS_EC_HOOKS_H) || defined(__CROS_EC_ZEPHYR_HOOKS_SHIM_H) -#error "This file must only be included from hooks.h. Include hooks.h directly." -#endif -#define __CROS_EC_ZEPHYR_HOOKS_SHIM_H - -#include <init.h> -#include <kernel.h> -#include <zephyr.h> - -#include "common.h" -#include "cros_version.h" - -/** - * The internal data structure stored for a deferred function. - */ -struct deferred_data { - struct k_work_delayable *work; -}; - -/** - * See include/hooks.h for documentation. - */ -int hook_call_deferred(const struct deferred_data *data, int us); - -#define DECLARE_DEFERRED(routine) \ - K_WORK_DELAYABLE_DEFINE(routine##_work_data, \ - (void (*)(struct k_work *))routine); \ - __maybe_unused const struct deferred_data routine##_data = { \ - .work = &routine##_work_data, \ - } - -/** - * Internal linked-list structure used to store hook lists. - */ -struct zephyr_shim_hook_list { - void (*routine)(void); - uint16_t priority; /* HOOK_PRIO_LAST = 9999 */ - enum hook_type type; - struct zephyr_shim_hook_list *next; -}; - -/** - * See include/hooks.h for documentation. - */ -#define DECLARE_HOOK(_hooktype, _routine, _priority) \ - STRUCT_SECTION_ITERABLE(zephyr_shim_hook_list, \ - _cros_hook_##_hooktype##_##_routine) = { \ - .type = _hooktype, \ - .routine = _routine, \ - .priority = _priority, \ - } diff --git a/zephyr/shim/include/zephyr_host_command.h b/zephyr/shim/include/zephyr_host_command.h deleted file mode 100644 index ae8e1f9ee3..0000000000 --- a/zephyr/shim/include/zephyr_host_command.h +++ /dev/null @@ -1,34 +0,0 @@ -/* 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. - */ - -#if !defined(__CROS_EC_HOST_COMMAND_H) || \ - defined(__CROS_EC_ZEPHYR_HOST_COMMAND_H) -#error "This file must only be included from host_command.h. " \ - "Include host_command.h directly" -#endif -#define __CROS_EC_ZEPHYR_HOST_COMMAND_H - -#include <init.h> - -#ifdef CONFIG_PLATFORM_EC_HOSTCMD - -/** - * See include/host_command.h for documentation. - */ -#define DECLARE_HOST_COMMAND(_command, _routine, _version_mask) \ - STRUCT_SECTION_ITERABLE(host_command, _cros_hcmd_##_command) = { \ - .command = _command, \ - .handler = _routine, \ - .version_mask = _version_mask, \ - } -#else /* !CONFIG_PLATFORM_EC_HOSTCMD */ -#ifdef __clang__ -#define DECLARE_HOST_COMMAND(command, routine, version_mask) -#else -#define DECLARE_HOST_COMMAND(command, routine, version_mask) \ - enum ec_status (routine)(struct host_cmd_handler_args *args) \ - __attribute__((unused)) -#endif /* __clang__ */ -#endif /* CONFIG_PLATFORM_EC_HOSTCMD */ diff --git a/zephyr/shim/include/zephyr_mkbp_event.h b/zephyr/shim/include/zephyr_mkbp_event.h deleted file mode 100644 index 159aebc8e1..0000000000 --- a/zephyr/shim/include/zephyr_mkbp_event.h +++ /dev/null @@ -1,23 +0,0 @@ -/* 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. - */ - -#if !defined(__CROS_EC_MKBP_EVENT_H) || \ - defined(__CROS_EC_ZEPHYR_MKBP_EVENT_H) -#error "This file must only be included from mkbp_event.h. " \ - "Include mkbp_event.h directly" -#endif -#define __CROS_EC_ZEPHYR_MKBP_EVENT_H - -const struct mkbp_event_source *zephyr_find_mkbp_event_source( - uint8_t event_type); - -/** - * See include/mkbp_event.h for documentation. - */ -#define DECLARE_EVENT_SOURCE(_type, _func) \ - STRUCT_SECTION_ITERABLE(mkbp_event_source, _cros_evtsrc_##_func) = { \ - .event_type = _type, \ - .get_data = _func, \ - } |