mirror of
https://github.com/Telecominfraproject/OpenCellular.git
synced 2026-01-08 16:41:55 +00:00
pd: remove redundant 5V source PDOs
Remove redundant 5V source PDOs in source cap packet. We only need one 5V advertisement with the maximum current that we can provide. BUG=none BRANCH=samus TEST=make buildall Change-Id: I94a01813787eb92fafbf600dcbbc8a2f0aa69e2b Signed-off-by: Alec Berg <alecaberg@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/227392 Reviewed-by: Vincent Palatin <vpalatin@chromium.org> Reviewed-by: Todd Broch <tbroch@chromium.org>
This commit is contained in:
committed by
chrome-internal-fetch
parent
aa4f720363
commit
bbe9a877ec
@@ -18,7 +18,6 @@
|
||||
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
|
||||
|
||||
const uint32_t pd_src_pdo[] = {
|
||||
PDO_FIXED(5000, 500, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(5000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(12000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(20000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
|
||||
@@ -12,8 +12,7 @@
|
||||
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
|
||||
|
||||
const uint32_t pd_src_pdo[] = {
|
||||
PDO_FIXED(5000, 500, PDO_FIXED_EXTERNAL),
|
||||
PDO_FIXED(5000, 900, 0),
|
||||
PDO_FIXED(5000, 900, PDO_FIXED_EXTERNAL),
|
||||
};
|
||||
const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo);
|
||||
|
||||
|
||||
@@ -23,7 +23,6 @@
|
||||
|
||||
/* Source PDOs */
|
||||
const uint32_t pd_src_pdo[] = {
|
||||
PDO_FIXED(5000, 500, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(5000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(12000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(20000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
|
||||
|
||||
const uint32_t pd_src_pdo[] = {
|
||||
PDO_FIXED(5000, 500, PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(5000, 900, PDO_FIXED_DUAL_ROLE),
|
||||
};
|
||||
const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo);
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
|
||||
|
||||
const uint32_t pd_src_pdo[] = {
|
||||
PDO_FIXED(5000, 500, PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(5000, 900, PDO_FIXED_DUAL_ROLE),
|
||||
};
|
||||
const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo);
|
||||
|
||||
@@ -20,7 +20,6 @@
|
||||
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
|
||||
|
||||
const uint32_t pd_src_pdo[] = {
|
||||
PDO_FIXED(5000, 500, PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(5000, 900, PDO_FIXED_DUAL_ROLE),
|
||||
};
|
||||
const int pd_src_pdo_cnt = ARRAY_SIZE(pd_src_pdo);
|
||||
|
||||
@@ -18,7 +18,6 @@
|
||||
#define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
|
||||
|
||||
const uint32_t pd_src_pdo[] = {
|
||||
PDO_FIXED(5000, 500, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(5000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(12000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
PDO_FIXED(20000, 3000, PDO_FIXED_EXTERNAL|PDO_FIXED_DUAL_ROLE),
|
||||
|
||||
@@ -148,7 +148,6 @@ static void discharge_voltage(int target_volt)
|
||||
|
||||
/* Power Delivery Objects */
|
||||
const uint32_t pd_src_pdo[] = {
|
||||
PDO_FIXED(5000, 500, PDO_FIXED_EXTERNAL),
|
||||
PDO_FIXED(5000, RATED_CURRENT, PDO_FIXED_EXTERNAL),
|
||||
PDO_FIXED(12000, RATED_CURRENT, PDO_FIXED_EXTERNAL),
|
||||
PDO_FIXED(20000, RATED_CURRENT, PDO_FIXED_EXTERNAL),
|
||||
@@ -162,7 +161,6 @@ static const struct {
|
||||
int ovp; /* over-voltage limit in mV */
|
||||
int ovp_rec;/* over-voltage recovery threshold in mV */
|
||||
} voltages[ARRAY_SIZE(pd_src_pdo)] = {
|
||||
{VO_5V, UVP_MV(5000), OVP_MV(5000), OVP_REC_MV(5000)},
|
||||
{VO_5V, UVP_MV(5000), OVP_MV(5000), OVP_REC_MV(5000)},
|
||||
{VO_12V, UVP_MV(12000), OVP_MV(12000), OVP_REC_MV(12000)},
|
||||
{VO_20V, UVP_MV(20000), OVP_MV(20000), OVP_REC_MV(20000)},
|
||||
@@ -238,7 +236,7 @@ int pd_set_power_supply_ready(int port)
|
||||
|
||||
void pd_power_supply_reset(int port)
|
||||
{
|
||||
int need_discharge = (volt_idx > 1) || discharge_is_enabled();
|
||||
int need_discharge = (volt_idx > 0) || discharge_is_enabled();
|
||||
|
||||
output_disable();
|
||||
volt_idx = 0;
|
||||
|
||||
@@ -165,7 +165,7 @@ static int test_request(void)
|
||||
TEST_ASSERT(pd_test_tx_msg_verify_short(0,
|
||||
PD_HEADER(PD_DATA_REQUEST, PD_ROLE_SINK, PD_ROLE_UFP,
|
||||
pd_port[0].msg_tx_id, 1)));
|
||||
TEST_ASSERT(pd_test_tx_msg_verify_word(0, RDO_FIXED(2, 450, 900, 0)));
|
||||
TEST_ASSERT(pd_test_tx_msg_verify_word(0, RDO_FIXED(1, 450, 900, 0)));
|
||||
TEST_ASSERT(pd_test_tx_msg_verify_crc(0));
|
||||
TEST_ASSERT(pd_test_tx_msg_verify_eop(0));
|
||||
inc_tx_id(0);
|
||||
|
||||
Reference in New Issue
Block a user