diff options
-rw-r--r-- | board/yorp/board.c | 72 | ||||
-rw-r--r-- | board/yorp/board.h | 10 | ||||
-rw-r--r-- | board/yorp/gpio.inc | 46 |
3 files changed, 28 insertions, 100 deletions
diff --git a/board/yorp/board.c b/board/yorp/board.c index 77eb5cd5f1..d3cf15cd55 100644 --- a/board/yorp/board.c +++ b/board/yorp/board.c @@ -43,6 +43,8 @@ #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ## args) #define CPRINTFUSB(format, args...) cprintf(CC_USBCHARGE, format, ## args) +#define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args) + static void tcpc_alert_event(enum gpio_signal signal) { if ((signal == GPIO_USB_C1_MUX_INT_ODL) && @@ -231,71 +233,23 @@ void lid_angle_peripheral_enable(int enable) keyboard_scan_enable(enable, KB_SCAN_DISABLE_LID_ANGLE); } -#endif -/* Sets the gpio flags correct taking into account warm resets */ -static void reset_gpio_flags(enum gpio_signal signal, int flags) -{ - /* - * If the system was already on, we cannot set the value otherwise we - * may change the value from the previous image which could cause a - * brownout. - */ - if (system_is_reboot_warm() || system_jumped_to_this_image()) - flags &= ~(GPIO_LOW | GPIO_HIGH); - gpio_set_flags(signal, flags); -} - -/* Runtime GPIO defaults */ -enum gpio_signal gpio_sys_reset_l_runtime = GPIO_SYS_RESET_L_V1; -enum gpio_signal gpio_entering_rw_runtime = GPIO_ENTERING_RW_V1; -enum gpio_signal gpio_usb2_otg_id_runtime = GPIO_USB2_OTG_ID_V1; - -static void update_drivers_from_board_id(void) +static void post_old_board_warning(void) { uint32_t board_id = 0; - /* Errors will count as board_id 0 */ cbi_get_board_version(&board_id); - if (board_id == 0) { - /* EC drives C1 PPC for proto 1. b/78896495 */ - reset_gpio_flags(GPIO_WFCAM_VSYNC, GPIO_OUT_LOW); - reset_gpio_flags(GPIO_C1_EN_SNK_V0, GPIO_OUT_LOW); - ppc_chips[1].flags = PPC_CFG_FLAGS_GPIO_CONTROL; - ppc_chips[1].snk_gpio = GPIO_C1_EN_SNK_V0; /* GPIO40 */ - ppc_chips[1].src_gpio = GPIO_WFCAM_VSYNC; /* GPIO03 */ - - /* - * We don't have to worry about changing USB-A port count from - * 2 -> 1 since GPIO_EN_USB_A1_5V on V0 board just drives the - * EC_BRD_ID_EN signal (which will burn ~ 400uW of power) - */ - - /* Move the runtime GPIOS */ - reset_gpio_flags(GPIO_SYS_RESET_L_V0, GPIO_ODR_HIGH); - gpio_sys_reset_l_runtime = GPIO_SYS_RESET_L_V0; /* GPIO02 */ - - reset_gpio_flags(GPIO_ENTERING_RW_V0, GPIO_OUT_LOW); - gpio_entering_rw_runtime = GPIO_ENTERING_RW_V0; /* GPIO80 */ - - reset_gpio_flags(GPIO_USB_A1_CHARGE_EN_L, GPIO_OUT_LOW); - gpio_usb2_otg_id_runtime = GPIO_USB_A1_CHARGE_EN_L; /* GPIOA0 */ - } - if (board_id >= 1) { - /* Reset flags to correct state instead of GPIO_DEFAULT */ - reset_gpio_flags(GPIO_SYS_RESET_L_V1, GPIO_ODR_HIGH); - reset_gpio_flags(GPIO_ENTERING_RW_V1, GPIO_OUT_LOW); - reset_gpio_flags(GPIO_USB_A1_CHARGE_EN_L, GPIO_OUT_HIGH); - reset_gpio_flags(GPIO_USB2_OTG_ID_V1, GPIO_OUT_LOW); - reset_gpio_flags(GPIO_WFCAM_VSYNC, GPIO_INPUT); + if (board_id != 0) + return; - /* - * Configure alternate mode to enable PWM3 that is required for - * KB_BL_PWM. - */ - gpio_set_alternate_function(GPIO_8, 0x1, 0); - } + /* + * BOARD ID 0 is officially deprecated. Indicate this by posting a + * warning. + */ + CPRINTS("\n\n\n ***** BOARD ID 0 is not officially supported!!! *****" + "\n\n\n"); } -DECLARE_HOOK(HOOK_INIT, update_drivers_from_board_id, HOOK_PRIO_INIT_I2C + 1); +DECLARE_HOOK(HOOK_INIT, post_old_board_warning, HOOK_PRIO_INIT_I2C + 1); +#endif diff --git a/board/yorp/board.h b/board/yorp/board.h index e92366b292..9528a9d178 100644 --- a/board/yorp/board.h +++ b/board/yorp/board.h @@ -62,16 +62,6 @@ #include "gpio_signal.h" #include "registers.h" -/* GPIO signals updated base on board version. */ -#define GPIO_SYS_RESET_L gpio_sys_reset_l_runtime -extern enum gpio_signal gpio_sys_reset_l_runtime; - -#define GPIO_ENTERING_RW gpio_entering_rw_runtime -extern enum gpio_signal gpio_entering_rw_runtime; - -#define GPIO_USB2_OTG_ID gpio_usb2_otg_id_runtime -extern enum gpio_signal gpio_usb2_otg_id_runtime; - enum adc_channel { ADC_TEMP_SENSOR_AMB, /* ADC0 */ ADC_TEMP_SENSOR_CHARGER, /* ADC1 */ diff --git a/board/yorp/gpio.inc b/board/yorp/gpio.inc index 042f623d6f..5d5c5e40a8 100644 --- a/board/yorp/gpio.inc +++ b/board/yorp/gpio.inc @@ -12,7 +12,7 @@ GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt) GPIO_INT(POWER_BUTTON_L, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt) /* MECH_PWR_BTN_ODL */ -GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | +GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt) /* ACOK_OD */ /* USB-C interrupts */ @@ -48,11 +48,9 @@ GPIO(PCH_SLP_S0_L, PIN(A, 4), GPIO_INPUT) /* SLP_S0_L */ * only for debugging purposes. */ GPIO(PLT_RST_L, PIN(C, 7), GPIO_INPUT) /* Platform Reset from SoC */ -/* Must be GPIO_DEFAULT since pin is changed based on board version */ -GPIO(SYS_RESET_L_V1, PIN(3, 4), GPIO_DEFAULT) /* SYS_RST_ODL */ +GPIO(SYS_RESET_L, PIN(3, 4), GPIO_ODR_HIGH) /* SYS_RST_ODL */ -/* Must be GPIO_DEFAULT since pin is changed based on board version */ -GPIO(ENTERING_RW_V1, PIN(E, 1), GPIO_DEFAULT) /* EC_ENTERING_RW */ +GPIO(ENTERING_RW, PIN(E, 1), GPIO_OUT_LOW) /* EC_ENTERING_RW */ GPIO(PCH_WAKE_L, PIN(7, 4), GPIO_ODR_HIGH) /* EC_PCH_WAKE_ODL */ GPIO(PCH_PWRBTN_L, PIN(C, 1), GPIO_ODR_HIGH) /* EC_PCH_PWR_BTN_ODL */ @@ -69,7 +67,7 @@ GPIO(ENABLE_BACKLIGHT, PIN(D, 3), GPIO_ODR_HIGH | GPIO_SEL_1P8V) /* EC_BL_EN_OD */ GPIO(EN_P3300_TRACKPAD_ODL, PIN(3, 3), GPIO_ODR_HIGH) -GPIO(EC_BATT_PRES_L, PIN(E, 5), GPIO_INPUT) +GPIO(EC_BATT_PRES_L, PIN(E, 5), GPIO_INPUT) /* * PCH_PROCHOT_ODL is primarily for monitoring the PROCHOT# signal which is @@ -98,8 +96,7 @@ GPIO(I2C7_SDA, PIN(B, 2), GPIO_INPUT | GPIO(EN_USB_A0_5V, PIN(6, 7), GPIO_OUT_LOW) /* Enable A0 5V Charging */ GPIO(EN_USB_A1_5V, PIN(9, 6), GPIO_OUT_LOW) /* Enable A1 5V Charging */ GPIO(USB_A0_CHARGE_EN_L, PIN(A, 2), GPIO_OUT_HIGH) /* Enable A0 1.5A Charging */ -/* Must be GPIO_DEFAULT since pin is changed based on board version */ -GPIO(USB_A1_CHARGE_EN_L, PIN(A, 0), GPIO_DEFAULT) /* Enable A1 1.5A Charging */ +GPIO(USB_A1_CHARGE_EN_L, PIN(A, 0), GPIO_OUT_HIGH) /* Enable A1 1.5A Charging */ GPIO(USB_C0_BC12_VBUS_ON, PIN(6, 3), GPIO_OUT_LOW) /* C0 BC1.2 Power */ GPIO(USB_C0_BC12_CHG_DET_L, PIN(9, 5), GPIO_INPUT) /* C0 BC1.2 Detect */ GPIO(USB_C0_HPD_1V8_ODL, PIN(C, 5), GPIO_INPUT | /* C0 DP Hotplug Detect */ @@ -109,8 +106,13 @@ GPIO(USB_C1_BC12_VBUS_ON, PIN(B, 1), GPIO_OUT_LOW) /* C1 BC1.2 Power */ GPIO(USB_C1_BC12_CHG_DET_L, PIN(E, 4), GPIO_INPUT) /* C1 BC1.2 Detect */ GPIO(USB_C1_HPD_1V8_ODL, PIN(C, 6), GPIO_INPUT | /* C1 DP Hotplug Detect */ GPIO_SEL_1P8V) -/* Must be GPIO_DEFAULT since pin is changed based on board version */ -GPIO(USB2_OTG_ID_V1, PIN(8, 3), GPIO_DEFAULT) /* OTG ID */ + +/* + * USB2_OTG_ID is 1.8V pin on the SoC side with an internal pull-up. However, it + * 3.3V on the EC side. So, configure it as ODR so that the EC never drives it + * high. + */ +GPIO(USB2_OTG_ID, PIN(8, 3), GPIO_ODR_LOW) /* OTG ID */ /* LED */ GPIO(BAT_LED_ORANGE_L, PIN(C, 3), GPIO_OUT_HIGH) /* LED_1_L */ @@ -118,22 +120,10 @@ GPIO(BAT_LED_BLUE_L, PIN(C, 4), GPIO_OUT_HIGH) /* LED_2_L */ GPIO(LED_3_L, PIN(D, 7), GPIO_OUT_HIGH) /* Keyboard Backlight */ -GPIO(KB_BL_PWR_EN, PIN(6, 2), GPIO_OUT_LOW) +GPIO(KB_BL_PWR_EN, PIN(6, 2), GPIO_OUT_LOW) /* Camera */ -/* Must be GPIO_DEFAULT since this pin is changed based on board version */ -GPIO(WFCAM_VSYNC, PIN(0, 3), GPIO_DEFAULT) /* TP only */ - -/* - * Only used for Version 0 - * - * Note: GPIO_DEFAULT is important because - * 1) it is a low power state - * 2) the gpio code will not touch the GPIO settings after a sysjump - */ -GPIO(C1_EN_SNK_V0, PIN(4, 0), GPIO_DEFAULT) /* C1: EN_SNK */ -GPIO(SYS_RESET_L_V0, PIN(0, 2), GPIO_DEFAULT) /* SYS_RESET_L */ -GPIO(ENTERING_RW_V0, PIN(8, 0), GPIO_DEFAULT) /* ENTERING_RW */ +GPIO(WFCAM_VSYNC, PIN(0, 3), GPIO_INPUT) /* TP only */ /* Overcurrent event to host */ GPIO(USB_C_OC, PIN(3, 6), GPIO_ODR_HIGH | GPIO_SEL_1P8V) @@ -160,10 +150,4 @@ ALTERNATE(PIN_MASK(D, 0x03), 0, MODULE_I2C, 0) /* I2C3 */ ALTERNATE(PIN_MASK(F, 0x0C), 0, MODULE_I2C, 0) /* I2C4 */ ALTERNATE(PIN_MASK(B, 0x0C), 0, MODULE_I2C, (GPIO_INPUT | GPIO_SEL_1P8V)) /* 1.8V I2C7 */ ALTERNATE(PIN_MASK(4, 0x30), 0, MODULE_ADC, 0) /* ADC0-1 */ - -/* - * PWM3 needs to be configured for KB_BL_PWM on board versions >= 1. However, on - * version 0, GPIO80 is used for ENTERING_RW signal and PWM alternate function - * should be configured depending upon the board version. Hence, it is done in - * update_drivers_from_board_id() in board.c file. - */ +ALTERNATE(PIN_MASK(8, 0x01), 0, MODULE_PWM, 0) /* KB_BL_PWM */ |