diff options
Diffstat (limited to 'chip/mec1322/system.c')
| -rw-r--r-- | chip/mec1322/system.c | 175 |
1 files changed, 24 insertions, 151 deletions
diff --git a/chip/mec1322/system.c b/chip/mec1322/system.c index d97f5b0c4e..967d8eb03b 100644 --- a/chip/mec1322/system.c +++ b/chip/mec1322/system.c @@ -186,101 +186,9 @@ uint32_t system_get_scratchpad(void) return MEC1322_VBAT_RAM(HIBDATA_INDEX_SCRATCHPAD); } -/* Returns desired GPIO state in hibernate, or 0 to skip reconfiguration */ -static uint32_t system_get_gpio_hibernate_state(uint32_t port, uint32_t pin) -{ - int i; - const int skip[][2] = { - /* - * Leave USB-C charging enabled in hibernate, in order to - * allow wake-on-plug. 5V enable must be pulled low. - */ -#ifdef CONFIG_USB_PD_PORT_COUNT -#if CONFIG_USB_PD_PORT_COUNT > 0 - GPIO_TO_PORT_MASK_PAIR(GPIO_USB_C0_5V_EN), - GPIO_TO_PORT_MASK_PAIR(GPIO_USB_C0_CHARGE_EN_L), -#endif -#if CONFIG_USB_PD_PORT_COUNT > 1 - GPIO_TO_PORT_MASK_PAIR(GPIO_USB_C1_5V_EN), - GPIO_TO_PORT_MASK_PAIR(GPIO_USB_C1_CHARGE_EN_L), -#endif -#endif /* CONFIG_USB_PD_PORT_COUNT */ - - /* - * MEC1322 datasheet, sec. 20.6: VCC1_RST# cannot be used - * as a GPIO pin. - */ - {13, 1}, - /* GPIO 205 doesn't exist. */ - {20, 5}, - }; - - for (i = 0; i < ARRAY_SIZE(skip); ++i) - if (port == skip[i][0] && pin == skip[i][1]) - return 0; - - if (board_get_gpio_hibernate_state) - return board_get_gpio_hibernate_state(port, pin); - else - return GPIO_INPUT | GPIO_PULL_UP; -} - -static void system_set_gpio_power(int enabled, uint32_t *backup_gpio_ctl) -{ - int i, j; - uint32_t port, flags; - - const int pins[][2] = { - {0, 7}, {1, 7}, {2, 7}, {3, 6}, {4, 7}, {5, 7}, - {6, 7}, {10, 7}, {11, 7}, {12, 7}, {13, 6}, - {14, 7}, {15, 7}, {16, 5}, {20, 6}, {21, 1} - }; - - for (i = 0; i < ARRAY_SIZE(pins); ++i) { - port = pins[i][0]; - for (j = 0; j <= pins[i][1]; ++j) { - flags = system_get_gpio_hibernate_state(port, j); - if (flags == 0) - continue; - - if (enabled) { - MEC1322_GPIO_CTL(port, j) = - backup_gpio_ctl[i * 8 + j]; - } else { - if (backup_gpio_ctl != NULL) - backup_gpio_ctl[i * 8 + j] = - MEC1322_GPIO_CTL(port, j); - gpio_set_flags_by_mask(port, 1 << j, flags); - gpio_set_alternate_function(port, 1 << j, -1); - } - } - } - -#ifdef CONFIG_USB_PD_PORT_COUNT - if (!enabled) { - /* - * Leave USB-C charging enabled in hibernate, in order to - * allow wake-on-plug. 5V enable must be pulled low. - */ -#if CONFIG_USB_PD_PORT_COUNT > 0 - gpio_set_flags(GPIO_USB_C0_5V_EN, GPIO_PULL_DOWN | GPIO_INPUT); - gpio_set_level(GPIO_USB_C0_CHARGE_EN_L, 0); -#endif -#if CONFIG_USB_PD_PORT_COUNT > 1 - gpio_set_flags(GPIO_USB_C1_5V_EN, GPIO_PULL_DOWN | GPIO_INPUT); - gpio_set_level(GPIO_USB_C1_CHARGE_EN_L, 0); -#endif - } -#endif /* CONFIG_USB_PD_PORT_COUNT */ -} - void system_hibernate(uint32_t seconds, uint32_t microseconds) { int i; - uint32_t int_status[16]; - uint32_t int_block_status; - uint32_t nvic_status[3]; - char *backup_gpio_ctl; #ifdef CONFIG_HOSTCMD_PD /* Inform the PD MCU that we are going to hibernate. */ @@ -293,18 +201,14 @@ void system_hibernate(uint32_t seconds, uint32_t microseconds) /* Disable interrupts */ interrupt_disable(); - for (i = 0; i < 3; ++i) - nvic_status[i] = CPU_NVIC_EN(i); for (i = 0; i <= 92; ++i) { task_disable_irq(i); task_clear_pending_irq(i); } - for (i = 8; i <= 23; ++i) { - int_status[i - 8] = MEC1322_INT_ENABLE(i); + for (i = 8; i <= 23; ++i) MEC1322_INT_DISABLE(i) = 0xffffffff; - } - int_block_status = MEC1322_INT_BLK_EN; + MEC1322_INT_BLK_DIS |= 0xffff00; /* Power down ADC VREF */ @@ -345,12 +249,24 @@ void system_hibernate(uint32_t seconds, uint32_t microseconds) MEC1322_PCR_SYS_SLP_CTL = (MEC1322_PCR_SYS_SLP_CTL & ~0x7) | 0x2; CPU_SCB_SYSCTRL |= 0x4; - /* Attempt to backup GPIO states if we need to restore them on wake. */ -#ifndef CONFIG_HIBERNATE_RESET_ON_WAKE - if (shared_mem_acquire(512, &backup_gpio_ctl) != EC_SUCCESS) + /* Setup GPIOs for hibernate */ + if (board_set_gpio_hibernate_state) + board_set_gpio_hibernate_state(); + +#ifdef CONFIG_USB_PD_PORT_COUNT + /* + * Leave USB-C charging enabled in hibernate, in order to + * allow wake-on-plug. 5V enable must be pulled low. + */ +#if CONFIG_USB_PD_PORT_COUNT > 0 + gpio_set_flags(GPIO_USB_C0_5V_EN, GPIO_PULL_DOWN | GPIO_INPUT); + gpio_set_level(GPIO_USB_C0_CHARGE_EN_L, 0); #endif - backup_gpio_ctl = NULL; - system_set_gpio_power(0, (uint32_t *)backup_gpio_ctl); +#if CONFIG_USB_PD_PORT_COUNT > 1 + gpio_set_flags(GPIO_USB_C1_5V_EN, GPIO_PULL_DOWN | GPIO_INPUT); + gpio_set_level(GPIO_USB_C1_CHARGE_EN_L, 0); +#endif +#endif /* CONFIG_USB_PD_PORT_COUNT */ if (hibernate_wake_pins_used > 0) { for (i = 0; i < hibernate_wake_pins_used; ++i) { @@ -393,55 +309,12 @@ void system_hibernate(uint32_t seconds, uint32_t microseconds) /* Use 48MHz clock to speed through wake-up */ MEC1322_PCR_PROC_CLK_CTL = 1; - /* If we didn't back up GPIO status, just reboot. */ - if (backup_gpio_ctl == NULL) - _system_reset(0, 1); - - system_set_gpio_power(1, (uint32_t *)backup_gpio_ctl); - shared_mem_release(backup_gpio_ctl); + /* Reboot */ + _system_reset(0, 1); - /* Enable blocks */ - MEC1322_PCR_SLOW_CLK_CTL |= 0x1e0; - MEC1322_PCR_CHIP_SLP_EN &= ~0x3; - MEC1322_PCR_EC_SLP_EN &= MEC1322_PCR_EC_SLP_EN_WAKE; - MEC1322_PCR_HOST_SLP_EN &= MEC1322_PCR_HOST_SLP_EN_WAKE; - MEC1322_PCR_EC_SLP_EN2 &= MEC1322_PCR_EC_SLP_EN2_WAKE; - - /* Enable timer */ - MEC1322_TMR32_CTL(0) |= 1; - MEC1322_TMR32_CTL(1) |= 1; - MEC1322_TMR16_CTL(0) |= 1; - - /* Enable watchdog */ - MEC1322_WDG_CTL |= 1; - - /* Enable 32KHz clock */ - MEC1322_VBAT_CE |= 0x2; - - /* Enable JTAG */ - MEC1322_EC_JTAG_EN |= 1; - - /* Enable UART */ - MEC1322_LPC_ACT |= 1; - MEC1322_UART_ACT |= 1; - - /* Deassert nSIO_RESET */ - MEC1322_PCR_PWR_RST_CTL &= ~1; - - /* Enable ADC */ - MEC1322_EC_ADC_VREF_PD &= ~1; - MEC1322_ADC_CTRL |= 1 << 0; - - /* Restore interrupts */ - for (i = 8; i <= 23; ++i) - MEC1322_INT_ENABLE(i) = int_status[i - 8]; - MEC1322_INT_BLK_EN = int_block_status; - - for (i = 0; i < 3; ++i) - CPU_NVIC_EN(i) = nvic_status[i]; - - /* Restore processor clock */ - MEC1322_PCR_PROC_CLK_CTL = 4; + /* We should never get here. */ + while (1) + ; } void htimer_interrupt(void) |