summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
Diffstat (limited to 'board')
-rw-r--r--board/coral/board.c15
-rw-r--r--board/coral/usb_pd_policy.c2
-rw-r--r--board/eve/board.c15
-rw-r--r--board/eve/usb_pd_policy.c2
-rw-r--r--board/kevin/board.c17
-rw-r--r--board/kevin/usb_pd_policy.c2
-rw-r--r--board/nefario/board.c17
-rw-r--r--board/nefario/usb_pd_policy.c2
-rw-r--r--board/reef/board.c15
-rw-r--r--board/reef/usb_pd_policy.c2
-rw-r--r--board/reef_it8320/board.c15
-rw-r--r--board/reef_it8320/usb_pd_policy.c2
12 files changed, 26 insertions, 80 deletions
diff --git a/board/coral/board.c b/board/coral/board.c
index a862541c1b..43ea4fca91 100644
--- a/board/coral/board.c
+++ b/board/coral/board.c
@@ -566,19 +566,10 @@ DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_FIRST);
int pd_snk_is_vbus_provided(int port)
{
- enum bd9995x_charge_port bd9995x_port;
-
- switch (port) {
- case USB_PD_PORT_ANX74XX:
- case USB_PD_PORT_PS8751:
- bd9995x_port = bd9995x_pd_port_to_chg_port(port);
- break;
- default:
+ if (port != 0 && port != 1)
panic("Invalid charge port\n");
- break;
- }
- return bd9995x_is_vbus_provided(bd9995x_port);
+ return bd9995x_is_vbus_provided(port);
}
/**
@@ -601,7 +592,7 @@ int board_set_active_charge_port(int charge_port)
if (board_vbus_source_enabled(charge_port))
return -1;
- bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port);
+ bd9995x_port = charge_port;
break;
case CHARGE_PORT_NONE:
bd9995x_port_select = 0;
diff --git a/board/coral/usb_pd_policy.c b/board/coral/usb_pd_policy.c
index b6c3f07328..20286af0a0 100644
--- a/board/coral/usb_pd_policy.c
+++ b/board/coral/usb_pd_policy.c
@@ -92,7 +92,7 @@ void typec_set_source_current_limit(int port, int rp)
int pd_set_power_supply_ready(int port)
{
/* Ensure we're not charging from this port */
- bd9995x_select_input_port(bd9995x_pd_port_to_chg_port(port), 0);
+ bd9995x_select_input_port(port, 0);
/* Ensure we advertise the proper available current quota */
charge_manager_source_port(port, 1);
diff --git a/board/eve/board.c b/board/eve/board.c
index d6b4d87c38..f580c30651 100644
--- a/board/eve/board.c
+++ b/board/eve/board.c
@@ -445,19 +445,10 @@ DECLARE_HOOK(HOOK_AC_CHANGE, board_extpower, HOOK_PRIO_DEFAULT);
int pd_snk_is_vbus_provided(int port)
{
- enum bd9995x_charge_port bd9995x_port;
-
- switch (port) {
- case 0:
- case 1:
- bd9995x_port = bd9995x_pd_port_to_chg_port(port);
- break;
- default:
+ if (port != 0 && port != 1)
panic("Invalid charge port\n");
- break;
- }
- return bd9995x_is_vbus_provided(bd9995x_port);
+ return bd9995x_is_vbus_provided(port);
}
/**
@@ -480,7 +471,7 @@ int board_set_active_charge_port(int charge_port)
if (board_vbus_source_enabled(charge_port))
return -1;
- bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port);
+ bd9995x_port = charge_port;
break;
case CHARGE_PORT_NONE:
bd9995x_port_select = 0;
diff --git a/board/eve/usb_pd_policy.c b/board/eve/usb_pd_policy.c
index 62664d95ae..73cb23aa85 100644
--- a/board/eve/usb_pd_policy.c
+++ b/board/eve/usb_pd_policy.c
@@ -112,7 +112,7 @@ void typec_set_source_current_limit(int port, int rp)
int pd_set_power_supply_ready(int port)
{
/* Ensure we're not charging from this port */
- bd9995x_select_input_port(bd9995x_pd_port_to_chg_port(port), 0);
+ bd9995x_select_input_port(port, 0);
/* Ensure we advertise the proper available current quota */
charge_manager_source_port(port, 1);
diff --git a/board/kevin/board.c b/board/kevin/board.c
index 41d987597d..a15fd63bea 100644
--- a/board/kevin/board.c
+++ b/board/kevin/board.c
@@ -215,7 +215,7 @@ int board_set_active_charge_port(int charge_port)
if (board_vbus_source_enabled(charge_port))
return -1;
- bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port);
+ bd9995x_port = charge_port;
break;
case CHARGE_PORT_NONE:
bd9995x_port_select = 0;
@@ -253,26 +253,17 @@ int extpower_is_present(void)
else if (!p0_src && !p1_src)
port = BD9995X_CHARGE_PORT_BOTH;
else
- port = bd9995x_pd_port_to_chg_port(p0_src);
+ port = p0_src;
return bd9995x_is_vbus_provided(port);
}
int pd_snk_is_vbus_provided(int port)
{
- enum bd9995x_charge_port bd9995x_port;
-
- switch (port) {
- case 0:
- case 1:
- bd9995x_port = bd9995x_pd_port_to_chg_port(port);
- break;
- default:
+ if (port != 0 && port != 1)
panic("Invalid charge port\n");
- break;
- }
- return bd9995x_is_vbus_provided(bd9995x_port);
+ return bd9995x_is_vbus_provided(port);
}
static void board_spi_enable(void)
diff --git a/board/kevin/usb_pd_policy.c b/board/kevin/usb_pd_policy.c
index 8e1c8da7a8..b8a4766984 100644
--- a/board/kevin/usb_pd_policy.c
+++ b/board/kevin/usb_pd_policy.c
@@ -90,7 +90,7 @@ static void board_vbus_update_source_current(int port)
int pd_set_power_supply_ready(int port)
{
/* Ensure we're not charging from this port */
- bd9995x_select_input_port(bd9995x_pd_port_to_chg_port(port), 0);
+ bd9995x_select_input_port(port, 0);
/* Ensure we advertise the proper available current quota */
charge_manager_source_port(port, 1);
diff --git a/board/nefario/board.c b/board/nefario/board.c
index 9016198162..cd85bd35bf 100644
--- a/board/nefario/board.c
+++ b/board/nefario/board.c
@@ -199,7 +199,7 @@ int board_set_active_charge_port(int charge_port)
if (board_vbus_source_enabled(charge_port))
return -1;
- bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port);
+ bd9995x_port = charge_port;
break;
case CHARGE_PORT_NONE:
bd9995x_port_select = 0;
@@ -235,26 +235,17 @@ int extpower_is_present(void)
else if (!p0_src && !p1_src)
port = BD9995X_CHARGE_PORT_BOTH;
else
- port = bd9995x_pd_port_to_chg_port(p0_src);
+ port = p0_src;
return bd9995x_is_vbus_provided(port);
}
int pd_snk_is_vbus_provided(int port)
{
- enum bd9995x_charge_port bd9995x_port;
-
- switch (port) {
- case 0:
- case 1:
- bd9995x_port = bd9995x_pd_port_to_chg_port(port);
- break;
- default:
+ if (port != 0 && port != 1)
panic("Invalid charge port\n");
- break;
- }
- return bd9995x_is_vbus_provided(bd9995x_port);
+ return bd9995x_is_vbus_provided(port);
}
static void board_spi_enable(void)
diff --git a/board/nefario/usb_pd_policy.c b/board/nefario/usb_pd_policy.c
index fa59088ac0..6f00e4d57b 100644
--- a/board/nefario/usb_pd_policy.c
+++ b/board/nefario/usb_pd_policy.c
@@ -80,7 +80,7 @@ static void board_vbus_update_source_current(int port)
int pd_set_power_supply_ready(int port)
{
/* Ensure we're not charging from this port */
- bd9995x_select_input_port(bd9995x_pd_port_to_chg_port(port), 0);
+ bd9995x_select_input_port(port, 0);
/* Ensure we advertise the proper available current quota */
charge_manager_source_port(port, 1);
diff --git a/board/reef/board.c b/board/reef/board.c
index 4431adab25..3e0becb255 100644
--- a/board/reef/board.c
+++ b/board/reef/board.c
@@ -558,19 +558,10 @@ DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_FIRST);
int pd_snk_is_vbus_provided(int port)
{
- enum bd9995x_charge_port bd9995x_port;
-
- switch (port) {
- case USB_PD_PORT_ANX74XX:
- case USB_PD_PORT_PS8751:
- bd9995x_port = bd9995x_pd_port_to_chg_port(port);
- break;
- default:
+ if (port != 0 && port != 1)
panic("Invalid charge port\n");
- break;
- }
- return bd9995x_is_vbus_provided(bd9995x_port);
+ return bd9995x_is_vbus_provided(port);
}
/**
@@ -593,7 +584,7 @@ int board_set_active_charge_port(int charge_port)
if (board_vbus_source_enabled(charge_port))
return -1;
- bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port);
+ bd9995x_port = charge_port;
break;
case CHARGE_PORT_NONE:
bd9995x_port_select = 0;
diff --git a/board/reef/usb_pd_policy.c b/board/reef/usb_pd_policy.c
index b6c3f07328..20286af0a0 100644
--- a/board/reef/usb_pd_policy.c
+++ b/board/reef/usb_pd_policy.c
@@ -92,7 +92,7 @@ void typec_set_source_current_limit(int port, int rp)
int pd_set_power_supply_ready(int port)
{
/* Ensure we're not charging from this port */
- bd9995x_select_input_port(bd9995x_pd_port_to_chg_port(port), 0);
+ bd9995x_select_input_port(port, 0);
/* Ensure we advertise the proper available current quota */
charge_manager_source_port(port, 1);
diff --git a/board/reef_it8320/board.c b/board/reef_it8320/board.c
index 8256cd1a3e..c8eeb2b8ef 100644
--- a/board/reef_it8320/board.c
+++ b/board/reef_it8320/board.c
@@ -343,19 +343,10 @@ DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_INIT_I2C + 1);
int pd_snk_is_vbus_provided(int port)
{
- enum bd9995x_charge_port bd9995x_port = 0;
-
- switch (port) {
- case 0:
- case 1:
- bd9995x_port = bd9995x_pd_port_to_chg_port(port);
- break;
- default:
+ if (port != 0 && port != 1)
panic("Invalid charge port\n");
- break;
- }
- return bd9995x_is_vbus_provided(bd9995x_port);
+ return bd9995x_is_vbus_provided(port);
}
/**
@@ -378,7 +369,7 @@ int board_set_active_charge_port(int charge_port)
if (board_vbus_source_enabled(charge_port))
return -1;
- bd9995x_port = bd9995x_pd_port_to_chg_port(charge_port);
+ bd9995x_port = charge_port;
break;
case CHARGE_PORT_NONE:
bd9995x_port_select = 0;
diff --git a/board/reef_it8320/usb_pd_policy.c b/board/reef_it8320/usb_pd_policy.c
index 48211441be..09afde1f40 100644
--- a/board/reef_it8320/usb_pd_policy.c
+++ b/board/reef_it8320/usb_pd_policy.c
@@ -85,7 +85,7 @@ void typec_set_source_current_limit(int port, int rp)
int pd_set_power_supply_ready(int port)
{
/* Ensure we're not charging from this port */
- bd9995x_select_input_port(bd9995x_pd_port_to_chg_port(port), 0);
+ bd9995x_select_input_port(port, 0);
/* Ensure we advertise the proper available current quota */
charge_manager_source_port(port, 1);
View Lorry Controller Status