Revert "servo_v4p1: Add driver for power management"

This reverts commit 4f8c2db072fb4a8a99ccdc9fa557f122582f8173.

servo_v4p1 uses charge_manager, however currently this is done
improperly. Instead of HOST and ALT ports, CHG and DUT ports are
registered withing framework, even though they are not used for charging
servo platform itself.

In order to implement power management, the most convenient (and clean)
solution is to use charge_manager API. The plan is to make use of it,
however first we need to address charge_manager problem mentioned above.
This way we will avoid code duplication and custom drivers which
duplicate existing generic implementation.

For the time being, revert custom power management. After fix for
charge_manager on servo_v4p1 is applied, will get back to this issue and
re-apply power management features in new form.

BUG=b:144776402
BRANCH=main
TEST=build and flash servo_v4p1. After it boots, issue `ina 2` command.
By default the Alert limit should be equal to 0, which means that now
power restrictions are applied.

Signed-off-by: Jan Dabros <jsd@semihalf.com>
Change-Id: I8aea351331dd380fc13c5c6c43ea7dc3a29bd918
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2697070
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>

1 files changed, 0 insertions, 30 deletions

diff --git a/board/servo_v4p1/usb_tc_snk_sm.c b/board/servo_v4p1/usb_tc_snk_sm.c
index 0889d05db6..f9a3966434 100644
--- a/board/servo_v4p1/usb_tc_snk_sm.c
+++ b/board/servo_v4p1/usb_tc_snk_sm.c
@@ -7,15 +7,12 @@
 #include "console.h"
 #include "fusb302b.h"
 #include "ioexpanders.h"
-#include "pwr_defs.h"
-#include "power_mgmt.h"
 #include "system.h"
 #include "task.h"
 #include "usb_common.h"
 #include "usb_pd.h"
 #include "usb_sm.h"
 #include "usb_tc_sm.h"
-#include "usb_tc_snk_sm.h"
 
 #define EVT_TIMEOUT_NEVER  (-1)
 #define EVT_TIMEOUT_5MS    (5 * MSEC)
@@ -88,28 +85,6 @@ static void restart_tc_sm(enum usb_tc_state start_state)
 	tc.evt_timeout = EVT_TIMEOUT_NEVER;
 }
 
-int get_alternate_port_pwr(struct pwr_con_t *pwr)
-{
-	enum tcpc_cc_voltage_status cc;
-
-	cc = tc.polarity ? tc.cc2 : tc.cc1;
-
-	pwr->volts = 5;
-
-	if (cc == TYPEC_CC_VOLT_RP_1_5) {
-		pwr->milli_amps = 1500;
-	} else if (cc == TYPEC_CC_VOLT_RP_3_0) {
-		pwr->milli_amps = 3000;
-	} else if (cc == TYPEC_CC_VOLT_RP_DEF) {
-		pwr->milli_amps = 900;
-	} else {
-		pwr->milli_amps = 0;
-		return -1;
-	}
-
-	return 0;
-}
-
 /*
  * Private Functions
  */
@@ -170,9 +145,6 @@ static void sink_power_sub_states(void)
 
 	tc.cc_debounce = 0;
 	print_alt_power();
-
-	/* Update board power configuration */
-	evaluate_input_power();
 }
 
 /*
@@ -247,8 +219,6 @@ static void tc_attach_wait_snk_run(int port)
 static void tc_attached_snk_entry(int port)
 {
 	print_alt_power();
-	/* Update board power configuration */
-	evaluate_input_power();
 
 	tc.evt_timeout = EVT_TIMEOUT_NEVER;
 	tc.cc_debounce = 0;