diff options
| author | Andrew McRae <amcrae@google.com> | 2022-07-20 14:10:34 +1000 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-07-20 05:59:43 +0000 |
| commit | ab4f747e6b682e3816dbc2f4bd18ceff7d966ad4 (patch) | |
| tree | 82d9a21634e04bd653d81ab084d0e4c5742b650c | |
| parent | 5117c0b574c000d8aefbbd3a4e4c33dd6addff5f (diff) | |
| download | chrome-ec-ab4f747e6b682e3816dbc2f4bd18ceff7d966ad4.tar.gz | |
nissa: Allow setting OCPC per-project
Some boards may not have multiple type-C ports, so
allow setting OCPC on a per-project basis.
BUG=b:239506664
TEST=zmake testall
BRANCH=none
Signed-off-by: Andrew McRae <amcrae@google.com>
Change-Id: Iedb212b1540502c7d0c05d30fbe15a97415fc3bd
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3775784
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
| -rw-r--r-- | zephyr/projects/nissa/craask/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/nissa/joxer/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/nissa/nereid/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/nissa/nivviks/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/nissa/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/nissa/pujjo/prj.conf | 1 | ||||
| -rw-r--r-- | zephyr/projects/nissa/xivu/prj.conf | 1 |
7 files changed, 6 insertions, 1 deletions
diff --git a/zephyr/projects/nissa/craask/prj.conf b/zephyr/projects/nissa/craask/prj.conf index bc0ac84307..8e68048e35 100644 --- a/zephyr/projects/nissa/craask/prj.conf +++ b/zephyr/projects/nissa/craask/prj.conf @@ -30,6 +30,7 @@ CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y # Charger driver and configuration +CONFIG_PLATFORM_EC_OCPC=y CONFIG_PLATFORM_EC_CHARGER_RAA489000=y CONFIG_PLATFORM_EC_OCPC_DEF_RBATT_MOHMS=22 diff --git a/zephyr/projects/nissa/joxer/prj.conf b/zephyr/projects/nissa/joxer/prj.conf index 03cccf3113..d3c4b3e1c9 100644 --- a/zephyr/projects/nissa/joxer/prj.conf +++ b/zephyr/projects/nissa/joxer/prj.conf @@ -49,6 +49,7 @@ CONFIG_PLATFORM_EC_USB_PD_DISCHARGE=n CONFIG_PLATFORM_EC_USB_PD_STARTUP_DELAY_MS=2000 # Charger driver and configuration +CONFIG_PLATFORM_EC_OCPC=y CONFIG_PLATFORM_EC_CHARGER_SM5803=y CONFIG_PLATFORM_EC_OCPC_DEF_RBATT_MOHMS=21 diff --git a/zephyr/projects/nissa/nereid/prj.conf b/zephyr/projects/nissa/nereid/prj.conf index c5913a5cdf..973342ebfa 100644 --- a/zephyr/projects/nissa/nereid/prj.conf +++ b/zephyr/projects/nissa/nereid/prj.conf @@ -48,6 +48,7 @@ CONFIG_PLATFORM_EC_USB_PD_DISCHARGE=n CONFIG_PLATFORM_EC_USB_PD_STARTUP_DELAY_MS=2000 # Charger driver and configuration +CONFIG_PLATFORM_EC_OCPC=y CONFIG_PLATFORM_EC_CHARGER_SM5803=y CONFIG_PLATFORM_EC_OCPC_DEF_RBATT_MOHMS=21 diff --git a/zephyr/projects/nissa/nivviks/prj.conf b/zephyr/projects/nissa/nivviks/prj.conf index 1c474823d9..b6b026e571 100644 --- a/zephyr/projects/nissa/nivviks/prj.conf +++ b/zephyr/projects/nissa/nivviks/prj.conf @@ -31,6 +31,7 @@ CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y # Charger driver and configuration +CONFIG_PLATFORM_EC_OCPC=y CONFIG_PLATFORM_EC_CHARGER_RAA489000=y CONFIG_PLATFORM_EC_OCPC_DEF_RBATT_MOHMS=22 diff --git a/zephyr/projects/nissa/prj.conf b/zephyr/projects/nissa/prj.conf index 930db794b5..510a1bdad1 100644 --- a/zephyr/projects/nissa/prj.conf +++ b/zephyr/projects/nissa/prj.conf @@ -145,7 +145,6 @@ CONFIG_PLATFORM_EC_BATTERY_REVIVE_DISCONNECT=y # Charger support CONFIG_PLATFORM_EC_CHARGER=y -CONFIG_PLATFORM_EC_OCPC=y CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR=10 CONFIG_PLATFORM_EC_CHARGER_SENSE_RESISTOR_AC=10 CONFIG_PLATFORM_EC_CHARGER_DISCHARGE_ON_AC=y diff --git a/zephyr/projects/nissa/pujjo/prj.conf b/zephyr/projects/nissa/pujjo/prj.conf index 5ad45f7773..8b3ae50b55 100644 --- a/zephyr/projects/nissa/pujjo/prj.conf +++ b/zephyr/projects/nissa/pujjo/prj.conf @@ -32,6 +32,7 @@ CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y # Charger driver and configuration +CONFIG_PLATFORM_EC_OCPC=y CONFIG_PLATFORM_EC_CHARGER_RAA489000=y CONFIG_PLATFORM_EC_OCPC_DEF_RBATT_MOHMS=22 diff --git a/zephyr/projects/nissa/xivu/prj.conf b/zephyr/projects/nissa/xivu/prj.conf index 4211fc8215..767a1621a7 100644 --- a/zephyr/projects/nissa/xivu/prj.conf +++ b/zephyr/projects/nissa/xivu/prj.conf @@ -30,6 +30,7 @@ CONFIG_PLATFORM_EC_USB_PD_5V_EN_CUSTOM=y CONFIG_PLATFORM_EC_USBC_RETIMER_ANX7483=y # Charger driver and configuration +CONFIG_PLATFORM_EC_OCPC=y CONFIG_PLATFORM_EC_CHARGER_RAA489000=y CONFIG_PLATFORM_EC_OCPC_DEF_RBATT_MOHMS=22 |