diff options
| author | Josh Tsai <josh_tsai@compal.corp-partner.google.com> | 2019-12-11 05:23:51 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-12-13 04:18:46 +0000 |
| commit | 4b0723c43c44d37eb3f5aff307a97cbdafdd28b5 (patch) | |
| tree | 6adab5e8f7146ca456ca62c5d1198adb13a04669 | |
| parent | 8c3f625e104a9ae8fd44f42974f256690cf28f7f (diff) | |
| download | chrome-ec-4b0723c43c44d37eb3f5aff307a97cbdafdd28b5.tar.gz | |
Revert "hatch: refactor PD_MAX_VOLTAGE/PD_MAX_CURRENT/PD_MAX_POWER/PD_OPERATING_POWER/"
This reverts commit 89197aceaf26ccf33b143c7a5e95eb07ba4c7464.
Reason for revert: It is not necessary to change the PD setting, so revert it.
Original change's description:
> hatch: refactor PD_MAX_VOLTAGE/PD_MAX_CURRENT/PD_MAX_POWER/PD_OPERATING_POWER/
>
> 1) The four config is determined by board, move it into board.h.
> 2) Update the config variables above for stryke.
>
> BUG=b:145257655
> BRANCH=hatch
> TEST=make buildall
>
> Change-Id: I1dd6a4f2a78b5196006821bc5d2686f68206c2e1
> Signed-off-by: Josh Tsai <josh_tsai@compal.corp-partner.google.com>
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1950270
> Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Bug: b:145257655
Change-Id: Ib2cb2db51b15f0974d2b22ef8e0e3e6d4e6b60d6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1958299
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Josh Tsai <josh_tsai@compal.corp-partner.google.com>
Commit-Queue: Josh Tsai <josh_tsai@compal.corp-partner.google.com>
Tested-by: Josh Tsai <josh_tsai@compal.corp-partner.google.com>
| -rw-r--r-- | baseboard/hatch/baseboard.h | 6 | ||||
| -rw-r--r-- | board/akemi/board.h | 5 | ||||
| -rw-r--r-- | board/dratini/board.h | 6 | ||||
| -rw-r--r-- | board/hatch/board.h | 6 | ||||
| -rw-r--r-- | board/helios/board.h | 6 | ||||
| -rw-r--r-- | board/jinlon/board.h | 6 | ||||
| -rw-r--r-- | board/kindred/board.h | 6 | ||||
| -rw-r--r-- | board/kohaku/board.h | 5 | ||||
| -rw-r--r-- | board/stryke/board.h | 5 |
9 files changed, 6 insertions, 45 deletions
diff --git a/baseboard/hatch/baseboard.h b/baseboard/hatch/baseboard.h index 3c3096a86d..ffe104c7bf 100644 --- a/baseboard/hatch/baseboard.h +++ b/baseboard/hatch/baseboard.h @@ -156,6 +156,12 @@ #define PD_POWER_SUPPLY_TURN_OFF_DELAY 250000 /* us */ #define PD_VCONN_SWAP_DELAY 5000 /* us */ +/* TODO(b/122273953): Use correct PD power values */ +#define PD_OPERATING_POWER_MW 15000 +#define PD_MAX_POWER_MW 60000 +#define PD_MAX_CURRENT_MA 3000 +#define PD_MAX_VOLTAGE_MV 20000 + /* I2C Bus Configuration */ #define CONFIG_I2C #define CONFIG_I2C_MASTER diff --git a/board/akemi/board.h b/board/akemi/board.h index 389112da51..4dbcb1aaa7 100644 --- a/board/akemi/board.h +++ b/board/akemi/board.h @@ -157,11 +157,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/dratini/board.h b/board/dratini/board.h index 31b188aa56..89db610c63 100644 --- a/board/dratini/board.h +++ b/board/dratini/board.h @@ -172,12 +172,6 @@ extern const int keyboard_factory_scan_pins[][2]; extern const int keyboard_factory_scan_pins_used; #endif - -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/hatch/board.h b/board/hatch/board.h index dca25f6cf9..a2d0533a38 100644 --- a/board/hatch/board.h +++ b/board/hatch/board.h @@ -173,12 +173,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; - -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/helios/board.h b/board/helios/board.h index b039bdb43a..e1445394c3 100644 --- a/board/helios/board.h +++ b/board/helios/board.h @@ -150,12 +150,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; - -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/jinlon/board.h b/board/jinlon/board.h index db87e9e952..1cfb471bc3 100644 --- a/board/jinlon/board.h +++ b/board/jinlon/board.h @@ -171,12 +171,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; - -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - #ifdef CONFIG_KEYBOARD_FACTORY_TEST extern const int keyboard_factory_scan_pins[][2]; extern const int keyboard_factory_scan_pins_used; diff --git a/board/kindred/board.h b/board/kindred/board.h index 93406c245f..79156ccf01 100644 --- a/board/kindred/board.h +++ b/board/kindred/board.h @@ -174,12 +174,6 @@ enum battery_type { extern const int keyboard_factory_scan_pins[][2]; extern const int keyboard_factory_scan_pins_used; - -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/kohaku/board.h b/board/kohaku/board.h index 62e32d95d4..135ad10dbe 100644 --- a/board/kohaku/board.h +++ b/board/kohaku/board.h @@ -189,11 +189,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; -#define PD_OPERATING_POWER_MW 15000 -#define PD_MAX_POWER_MW 60000 -#define PD_MAX_CURRENT_MA 3000 -#define PD_MAX_VOLTAGE_MV 20000 - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ diff --git a/board/stryke/board.h b/board/stryke/board.h index 876e19f466..e1b7ce7414 100644 --- a/board/stryke/board.h +++ b/board/stryke/board.h @@ -173,11 +173,6 @@ enum battery_type { BATTERY_TYPE_COUNT, }; -#define PD_OPERATING_POWER_MW 27000 -#define PD_MAX_POWER_MW 65000 -#define PD_MAX_CURRENT_MA 3250 -#define PD_MAX_VOLTAGE_MV 20000 - #endif /* !__ASSEMBLER__ */ #endif /* __CROS_EC_BOARD_H */ |