diff options
| author | Ting Shen <phoenixshen@google.com> | 2021-12-15 18:47:19 +0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-12-21 08:50:14 +0000 |
| commit | bc7eed5755f7f24fff51f5818bc5582934d217a7 (patch) | |
| tree | f09b6eec02ce0538eb13f5265632c517edd076f4 | |
| parent | 5b2c97d3bc3c7d49ae483a96b9bdf8cf7a14df15 (diff) | |
| download | chrome-ec-stabilize-14411.B-main.tar.gz | |
krabby: configure adcstabilize-14411.B-main
Configure ADC channels correctly, and also remove the unused isl9238c
code to make this CL compilable.
BUG=b:210754899
TEST=run `adc` command, verify vbus value looks reasonable
BRANCH=main
Signed-off-by: Ting Shen <phoenixshen@google.com>
Change-Id: If29ffce4f626e11062cc406322480e1f34aed6f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3341474
Reviewed-by: Eric Yilun Lin <yllin@google.com>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
| -rw-r--r-- | zephyr/projects/corsola/adc_krabby.dts | 19 | ||||
| -rw-r--r-- | zephyr/projects/corsola/gpio_krabby.dts | 4 | ||||
| -rw-r--r-- | zephyr/projects/corsola/prj_krabby.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/corsola/src/krabby/usbc_config.c | 5 |
4 files changed, 6 insertions, 23 deletions
diff --git a/zephyr/projects/corsola/adc_krabby.dts b/zephyr/projects/corsola/adc_krabby.dts index 7f308c04f9..fc466b51ab 100644 --- a/zephyr/projects/corsola/adc_krabby.dts +++ b/zephyr/projects/corsola/adc_krabby.dts @@ -23,29 +23,12 @@ enum-name = "ADC_BOARD_ID_1"; channel = <2>; }; - adc_charger_amon_r { - label = "ADC_AMON_BMON"; - enum-name = "ADC_AMON_BMON"; - channel = <3>; - mul = <1000>; - div = <18>; - }; adc_vbus_c1 { label = "ADC_VBUS_C1"; enum-name = "ADC_VBUS_C1"; - channel = <5>; + channel = <7>; mul = <10>; }; - adc_charger_pmon { - label = "ADC_PMON"; - enum-name = "ADC_PMON"; - channel = <6>; - }; - adc-psys { - label = "ADC_PSYS"; - enum-name = "ADC_PSYS"; - channel = <6>; - }; }; }; diff --git a/zephyr/projects/corsola/gpio_krabby.dts b/zephyr/projects/corsola/gpio_krabby.dts index 8dfb9779df..a8c78ddc03 100644 --- a/zephyr/projects/corsola/gpio_krabby.dts +++ b/zephyr/projects/corsola/gpio_krabby.dts @@ -345,7 +345,9 @@ <&gpiof 1 (GPIO_INPUT | GPIO_PULL_DOWN)>, <&gpioh 0 (GPIO_INPUT | GPIO_PULL_DOWN)>, <&gpioh 6 (GPIO_INPUT | GPIO_PULL_DOWN)>, - <&gpioi 7 (GPIO_INPUT | GPIO_PULL_DOWN)>, + <&gpioi 3 (GPIO_INPUT | GPIO_PULL_DOWN)>, + <&gpioi 5 (GPIO_INPUT | GPIO_PULL_DOWN)>, + <&gpioi 6 (GPIO_INPUT | GPIO_PULL_DOWN)>, <&gpiom 6 (GPIO_INPUT | GPIO_PULL_DOWN)>, /* spi_clk_gpg6 */ <&gpiog 6 (GPIO_INPUT | GPIO_PULL_UP)>, diff --git a/zephyr/projects/corsola/prj_krabby.conf b/zephyr/projects/corsola/prj_krabby.conf index bc92bdc094..ba650f8d9b 100644 --- a/zephyr/projects/corsola/prj_krabby.conf +++ b/zephyr/projects/corsola/prj_krabby.conf @@ -42,7 +42,6 @@ CONFIG_PLATFORM_EC_CHARGE_MANAGER=y CONFIG_PLATFORM_EC_CHARGE_RAMP_HW=y CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC_CHARGER=y -CONFIG_PLATFORM_EC_CHARGER_ISL9238C=y CONFIG_PLATFORM_EC_CHARGER_MAINTAIN_VBAT=y CONFIG_PLATFORM_EC_CHARGER_OTG=y CONFIG_PLATFORM_EC_CHARGER_PSYS=y diff --git a/zephyr/projects/corsola/src/krabby/usbc_config.c b/zephyr/projects/corsola/src/krabby/usbc_config.c index 2b5ec7204a..578881a8ba 100644 --- a/zephyr/projects/corsola/src/krabby/usbc_config.c +++ b/zephyr/projects/corsola/src/krabby/usbc_config.c @@ -10,7 +10,6 @@ #include "bc12/pi3usb9201_public.h" #include "charge_manager.h" #include "charger.h" -#include "charger/isl923x_public.h" #include "console.h" #include "driver/tcpm/it83xx_pd.h" #include "driver/usb_mux/ps8743.h" @@ -29,8 +28,8 @@ const struct charger_config_t chg_chips[] = { { .i2c_port = I2C_PORT_CHARGER, - .i2c_addr_flags = ISL923X_ADDR_FLAGS, - .drv = &isl923x_drv, + .i2c_addr_flags = 0, + .drv = NULL, }, }; |