diff options
| -rw-r--r-- | board/nautilus/board.c | 29 | ||||
| -rw-r--r-- | board/nautilus/usb_pd_policy.c | 26 |
2 files changed, 6 insertions, 49 deletions
diff --git a/board/nautilus/board.c b/board/nautilus/board.c index 834496cb99..6372ec43ee 100644 --- a/board/nautilus/board.c +++ b/board/nautilus/board.c @@ -73,12 +73,8 @@ static void tcpc_alert_event(enum gpio_signal signal) /* Set PD discharge whenever VBUS detection is high (i.e. below threshold). */ static void vbus_discharge_handler(void) { - if (system_get_board_version() >= 2) { - pd_set_vbus_discharge(0, - gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L)); - pd_set_vbus_discharge(1, - gpio_get_level(GPIO_USB_C1_VBUS_WAKE_L)); - } + pd_set_vbus_discharge(0, gpio_get_level(GPIO_USB_C0_VBUS_WAKE_L)); + pd_set_vbus_discharge(1, gpio_get_level(GPIO_USB_C1_VBUS_WAKE_L)); } DECLARE_DEFERRED(vbus_discharge_handler); @@ -433,15 +429,6 @@ static void board_init(void) gpio_enable_interrupt(GPIO_USB_C0_BC12_INT_L); gpio_enable_interrupt(GPIO_USB_C1_BC12_INT_L); - /* Level of sensor's I2C and interrupt are 3.3V on proto board */ - if(system_get_board_version() < 2) { - /* ACCELGYRO3_INT_L */ - gpio_set_flags(GPIO_ACCELGYRO3_INT_L, GPIO_INT_FALLING); - /* I2C3_SCL / I2C3_SDA */ - gpio_set_flags(GPIO_I2C3_SCL, GPIO_INPUT); - gpio_set_flags(GPIO_I2C3_SDA, GPIO_INPUT); - } - /* Enable Gyro interrupts */ gpio_enable_interrupt(GPIO_ACCELGYRO3_INT_L); @@ -762,18 +749,6 @@ static void board_chipset_shutdown(void) } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); -int board_has_working_reset_flags(void) -{ - int version = system_get_board_version(); - - /* Boards Rev1, Rev2 and Rev3 will lose reset flags on power cycle. */ - if ((version == 1) || (version == 2) || (version == 3)) - return 0; - - /* All other board versions should have working reset flags */ - return 1; -} - /* * I2C callbacks to ensure bus free time for battery I2C transactions is at * least 5ms. diff --git a/board/nautilus/usb_pd_policy.c b/board/nautilus/usb_pd_policy.c index f30882f475..3da3e00084 100644 --- a/board/nautilus/usb_pd_policy.c +++ b/board/nautilus/usb_pd_policy.c @@ -69,31 +69,14 @@ static void board_vbus_update_source_current(int port) enum gpio_signal gpio_3a_en = port ? GPIO_USB_C1_3A_EN : GPIO_USB_C0_3A_EN; - if (system_get_board_version() >= 1) { /* * For rev1 and beyond, 1.5 vs 3.0 A limit is controlled by a * dedicated gpio where high = 3.0A and low = 1.5A. VBUS on/off * is controlled by GPIO_USB_C0/1_5V_EN. Both of these signals * can remain outputs. */ - gpio_set_level(gpio_3a_en, vbus_rp[port] == TYPEC_RP_3A0 ? - 1 : 0); - gpio_set_level(gpio_5v_en, vbus_en[port]); - } else { - /* - * Driving USB_Cx_5V_EN high, actually put a 16.5k resistance - * (2x 33k in parallel) on the NX5P3290 load switch ILIM pin, - * setting a minimum OCP current of 3186 mA. - * Putting an internal pull-up on USB_Cx_5V_EN, effectively put - * a 33k resistor on ILIM, setting a minimum OCP current of - * 1505 mA. - */ - int flags = (vbus_rp[port] == TYPEC_RP_1A5 && vbus_en[port]) ? - (GPIO_INPUT | GPIO_PULL_UP) : - (GPIO_OUTPUT | GPIO_PULL_UP); - gpio_set_level(gpio_5v_en, vbus_en[port]); - gpio_set_flags(gpio_5v_en, flags); - } + gpio_set_level(gpio_3a_en, vbus_rp[port] == TYPEC_RP_3A0 ? 1 : 0); + gpio_set_level(gpio_5v_en, vbus_en[port]); } void typec_set_source_current_limit(int port, int rp) @@ -117,8 +100,7 @@ int pd_set_power_supply_ready(int port) vbus_en[port] = 1; board_vbus_update_source_current(port); - if (system_get_board_version() >= 2) - pd_set_vbus_discharge(port, 0); + pd_set_vbus_discharge(port, 0); /* notify host of power info change */ pd_send_host_event(PD_EVENT_POWER_CHANGE); @@ -137,7 +119,7 @@ void pd_power_supply_reset(int port) board_vbus_update_source_current(port); /* Enable discharge if we were previously sourcing 5V */ - if (system_get_board_version() >= 2 && prev_en) + if (prev_en) pd_set_vbus_discharge(port, 1); /* Give back the current quota we are no longer using */ |