diff options
author | Ting Shen <phoenixshen@google.com> | 2019-11-22 19:45:21 +0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-11-29 10:36:40 +0000 |
commit | 81d2e72bf6f6d726e49d6683eb40980471dc3052 (patch) | |
tree | 1ee0085396a237676e7b82cb60daf1c82dbdd235 /baseboard | |
parent | c4fabbe69e7133dcee44930e2743d5cef203bad1 (diff) | |
download | chrome-ec-81d2e72bf6f6d726e49d6683eb40980471dc3052.tar.gz |
kukui: refactor PD_MAX_VOLTAGE/PD_OPERATING_POWER
1) PD_MAX_VOLTAGE_MV is determined by charger, move it into the ifdef
VARIANT_KUKUI_CHARGER_* clause.
2) PD_OPERATING_POWER_MW is determined by board, move it into board.h.
3) update the two config variables above for jacuzzi family.
BUG=None
TEST=make buildall
BRANCH=kukui
Change-Id: I6f14a71a34e2c81a5030ff5809996ddf74a4ad12
Signed-off-by: Ting Shen <phoenixshen@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1930521
Reviewed-by: Eric Yilun Lin <yllin@chromium.org>
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Tested-by: Ting Shen <phoenixshen@chromium.org>
Diffstat (limited to 'baseboard')
-rw-r--r-- | baseboard/kukui/baseboard.h | 13 | ||||
-rw-r--r-- | baseboard/kukui/usb_pd_policy.c | 14 |
2 files changed, 14 insertions, 13 deletions
diff --git a/baseboard/kukui/baseboard.h b/baseboard/kukui/baseboard.h index af95ebba35..a055e7d548 100644 --- a/baseboard/kukui/baseboard.h +++ b/baseboard/kukui/baseboard.h @@ -47,12 +47,18 @@ #define CONFIG_USB_PD_TCPC_LOW_POWER #define CONFIG_USB_PD_DISCHARGE_TCPC #define CONFIG_USB_PD_DUAL_ROLE_AUTO_TOGGLE +/* + * The Maximum input voltage is 13.5V, need another 5% tolerance. + * 12.85V * 1.05 = 13.5V + */ +#define PD_MAX_VOLTAGE_MV 12850 #elif defined(VARIANT_KUKUI_CHARGER_ISL9238) #define CONFIG_CHARGER_ISL9238 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 /* BOARD_RS1 */ #define CONFIG_CHARGER_SENSE_RESISTOR 10 /* BOARD_RS2 */ #define CONFIG_CHARGER_OTG #define CONFIG_CHARGE_RAMP_HW +#define PD_MAX_VOLTAGE_MV 20000 #else #error Must define a VARIANT_KUKUI_CHARGER #endif /* VARIANT_KUKUI_CHARGER */ @@ -192,16 +198,9 @@ #define CONFIG_BATTERY_PRESENT_CUSTOM #define CONFIG_BATTERY_REVIVE_DISCONNECT -#define PD_OPERATING_POWER_MW 15000 #define PD_MAX_POWER_MW ((PD_MAX_VOLTAGE_MV * PD_MAX_CURRENT_MA) / 1000) #define PD_MAX_CURRENT_MA 3000 -/* - * The Maximum input voltage is 13.5V, need another 5% tolerance. - * 12.85V * 1.05 = 13.5V - */ -#define PD_MAX_VOLTAGE_MV 12850 - #define PD_POWER_SUPPLY_TURN_ON_DELAY 30000 /* us */ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 50000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ diff --git a/baseboard/kukui/usb_pd_policy.c b/baseboard/kukui/usb_pd_policy.c index 260cff54cc..e87f7f3f69 100644 --- a/baseboard/kukui/usb_pd_policy.c +++ b/baseboard/kukui/usb_pd_policy.c @@ -24,14 +24,16 @@ const uint32_t pd_src_pdo[] = { }; const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo); +#ifdef VARIANT_KUKUI_CHARGER_MT6370 +#define MAX_VOLTAGE (int)(PD_MAX_VOLTAGE_MV * 1.05) +#else +#define MAX_VOLTAGE PD_MAX_VOLTAGE_MV +#endif + const uint32_t pd_snk_pdo[] = { PDO_FIXED(5000, 500, PDO_FIXED_FLAGS), - PDO_BATT(4750, - (int)(PD_MAX_VOLTAGE_MV * 1.05), - PD_OPERATING_POWER_MW), - PDO_VAR(4750, - (int)(PD_MAX_VOLTAGE_MV * 1.05), - PD_MAX_CURRENT_MA), + PDO_BATT(4750, MAX_VOLTAGE, PD_OPERATING_POWER_MW), + PDO_VAR(4750, MAX_VOLTAGE, PD_MAX_CURRENT_MA), }; const int pd_snk_pdo_cnt = ARRAY_SIZE(pd_snk_pdo); |