diff options
| -rw-r--r-- | zephyr/program/skyrim/crystaldrift/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | zephyr/program/skyrim/crystaldrift/project.conf | 4 | ||||
| -rw-r--r-- | zephyr/program/skyrim/crystaldrift/project.overlay | 31 | ||||
| -rw-r--r-- | zephyr/program/skyrim/crystaldrift/src/alt_charger.c | 37 | ||||
| -rw-r--r-- | zephyr/test/skyrim/testcase.yaml | 11 |
5 files changed, 21 insertions, 63 deletions
diff --git a/zephyr/program/skyrim/crystaldrift/CMakeLists.txt b/zephyr/program/skyrim/crystaldrift/CMakeLists.txt index f097c85c9b..2ba70f5e25 100644 --- a/zephyr/program/skyrim/crystaldrift/CMakeLists.txt +++ b/zephyr/program/skyrim/crystaldrift/CMakeLists.txt @@ -7,7 +7,6 @@ zephyr_library_sources( "src/usb_mux_config.c" "src/ppc_config.c" "src/form_factor.c" - "src/alt_charger.c" "src/keyboard.c" ) zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_FAN "src/fan.c") diff --git a/zephyr/program/skyrim/crystaldrift/project.conf b/zephyr/program/skyrim/crystaldrift/project.conf index 18f57a7671..158006436c 100644 --- a/zephyr/program/skyrim/crystaldrift/project.conf +++ b/zephyr/program/skyrim/crystaldrift/project.conf @@ -19,3 +19,7 @@ CONFIG_PLATFORM_EC_CHARGER_ISL9238C=y # Battery CONFIG_PLATFORM_EC_BATTERY_PRESENT_GPIO=y +# Get the vbus voltage from TCPC +CONFIG_PLATFORM_EC_CHARGER_ISL9241=n +CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_CHARGER=n +CONFIG_PLATFORM_EC_USB_PD_VBUS_MEASURE_TCPC=y diff --git a/zephyr/program/skyrim/crystaldrift/project.overlay b/zephyr/program/skyrim/crystaldrift/project.overlay index e39c18c5a6..43ac319063 100644 --- a/zephyr/program/skyrim/crystaldrift/project.overlay +++ b/zephyr/program/skyrim/crystaldrift/project.overlay @@ -115,23 +115,6 @@ }; }; - charger-option { - enum-name = "FW_CHARGER"; - start = <11>; - size = <2>; - - charger-option-isl9241 { - compatible = "cros-ec,cbi-fw-config-value"; - enum-name = "FW_CHARGER_ISL9241"; - value = <0>; - default; - }; - charger-option-isl9538 { - compatible = "cros-ec,cbi-fw-config-value"; - enum-name = "FW_CHARGER_ISL9538"; - value = <1>; - }; - }; }; /* Rotation matrices for motion sensors. */ @@ -167,6 +150,20 @@ /delete-node/ nx20p348x@71; /delete-node/ anx7483@3e; }; +&i2c4_1 { + /delete-node/ isl9241@9; + /delete-node/ isl9538@9; + charger: isl9238@9 { + compatible = "intersil,isl923x"; + status = "okay"; + reg = <0x9>; + }; +}; + +/* usbc overrides */ +&usbc_port0 { + /delete-property/ chg_alt; +}; &amd_fp6_port0 { board-set = "board_c0_amd_fp6_mux_set"; }; diff --git a/zephyr/program/skyrim/crystaldrift/src/alt_charger.c b/zephyr/program/skyrim/crystaldrift/src/alt_charger.c deleted file mode 100644 index 83e827ca5f..0000000000 --- a/zephyr/program/skyrim/crystaldrift/src/alt_charger.c +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2022 The ChromiumOS Authors - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#include "charger_chips.h" -#include "common.h" -#include "cros_board_info.h" -#include "cros_cbi.h" -#include "hooks.h" - -#include <zephyr/devicetree.h> -#include <zephyr/logging/log.h> - -#ifdef CONFIG_ZTEST -#undef CHG_ENABLE_ALTERNATE -void chg_enable_alternate_test(int port); -#define CHG_ENABLE_ALTERNATE(x) chg_enable_alternate_test(x) -#endif /* CONFIG_ZTEST */ - -LOG_MODULE_DECLARE(crystaldrift, CONFIG_SKYRIM_LOG_LEVEL); - -test_export_static void alt_charger_init(void) -{ - int ret; - uint32_t val; - - ret = cros_cbi_get_fw_config(FW_CHARGER, &val); - if (ret != 0) { - LOG_ERR("Error retrieving CBI FW_CONFIG field %d", FW_CHARGER); - return; - } - - if (val == FW_CHARGER_ISL9538) - CHG_ENABLE_ALTERNATE(0); -} -DECLARE_HOOK(HOOK_INIT, alt_charger_init, HOOK_PRIO_POST_FIRST); diff --git a/zephyr/test/skyrim/testcase.yaml b/zephyr/test/skyrim/testcase.yaml index c718e888d7..a940d45eae 100644 --- a/zephyr/test/skyrim/testcase.yaml +++ b/zephyr/test/skyrim/testcase.yaml @@ -26,11 +26,6 @@ tests: extra_configs: - CONFIG_TEST_BOARD_CRYSTALDRIFT=y - skyrim.crystaldrift.alt_charger: - extra_configs: - - CONFIG_TEST_BOARD_CRYSTALDRIFT=y - - CONFIG_TEST_BOARD_ALT_CHARGER=y - skyrim.crystaldrift.fan: extra_configs: - CONFIG_TEST_BOARD_CRYSTALDRIFT=y @@ -52,9 +47,9 @@ tests: - CONFIG_TEST_BOARD_PPC_CONFIG=y skyrim.frostflow.usb_mux_config: - extra_configs: - - CONFIG_TEST_BOARD_FROSTFLOW=y - - CONFIG_TEST_BOARD_USB_MUX_CONFIG_CUSTOM=y + extra_configs: + - CONFIG_TEST_BOARD_FROSTFLOW=y + - CONFIG_TEST_BOARD_USB_MUX_CONFIG_CUSTOM=y # Markarth tests skyrim.markarth: |