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>

9 files changed, 3 insertions, 12 deletions

diff --git a/board/fruitpie/usb_pd_policy.c b/board/fruitpie/usb_pd_policy.c
index ee630c138f..422a371266 100644
--- a/board/fruitpie/usb_pd_policy.c
+++ b/board/fruitpie/usb_pd_policy.c
@@ -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),
diff --git a/board/host/usb_pd_policy.c b/board/host/usb_pd_policy.c
index 97eaf2e18c..782f3ab34c 100644
--- a/board/host/usb_pd_policy.c
+++ b/board/host/usb_pd_policy.c
@@ -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);
 
diff --git a/board/plankton/usb_pd_policy.c b/board/plankton/usb_pd_policy.c
index 528a02cff0..1fb945ad7b 100644
--- a/board/plankton/usb_pd_policy.c
+++ b/board/plankton/usb_pd_policy.c
@@ -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),
diff --git a/board/ryu/usb_pd_policy.c b/board/ryu/usb_pd_policy.c
index 5bad35f80c..754e3ae009 100644
--- a/board/ryu/usb_pd_policy.c
+++ b/board/ryu/usb_pd_policy.c
@@ -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);
diff --git a/board/ryu_p2/usb_pd_policy.c b/board/ryu_p2/usb_pd_policy.c
index eeb7ebb656..b1c7aef27d 100644
--- a/board/ryu_p2/usb_pd_policy.c
+++ b/board/ryu_p2/usb_pd_policy.c
@@ -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);
diff --git a/board/samus_pd/usb_pd_policy.c b/board/samus_pd/usb_pd_policy.c
index cd2cb068c8..c6b1ff87e2 100644
--- a/board/samus_pd/usb_pd_policy.c
+++ b/board/samus_pd/usb_pd_policy.c
@@ -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);
diff --git a/board/twinkie/usb_pd_policy.c b/board/twinkie/usb_pd_policy.c
index 4ef8ae05a5..2781d9efaa 100644
--- a/board/twinkie/usb_pd_policy.c
+++ b/board/twinkie/usb_pd_policy.c
@@ -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),
diff --git a/board/zinger/usb_pd_policy.c b/board/zinger/usb_pd_policy.c
index 96713e1d18..c520a10d5b 100644
--- a/board/zinger/usb_pd_policy.c
+++ b/board/zinger/usb_pd_policy.c
@@ -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),
@@ -163,7 +162,6 @@ static const struct {
 	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;
diff --git a/test/usb_pd.c b/test/usb_pd.c
index f7b6500686..e3486488e8 100644
--- a/test/usb_pd.c
+++ b/test/usb_pd.c
@@ -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);