diff options
Diffstat (limited to 'board')
-rw-r--r-- | board/damu/board.c | 29 | ||||
-rw-r--r-- | board/damu/board.h | 3 | ||||
-rw-r--r-- | board/damu/gpio.inc | 2 | ||||
-rw-r--r-- | board/jacuzzi/board.c | 29 | ||||
-rw-r--r-- | board/jacuzzi/board.h | 5 | ||||
-rw-r--r-- | board/jacuzzi/gpio.inc | 8 | ||||
-rw-r--r-- | board/kappa/board.c | 29 | ||||
-rw-r--r-- | board/kappa/board.h | 3 | ||||
-rw-r--r-- | board/kappa/gpio.inc | 2 |
9 files changed, 20 insertions, 90 deletions
diff --git a/board/damu/board.c b/board/damu/board.c index 7360fd41b4..546fbda4bf 100644 --- a/board/damu/board.c +++ b/board/damu/board.c @@ -253,42 +253,13 @@ static void board_chipset_startup(void) } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_chipset_startup, HOOK_PRIO_DEFAULT); -static void disable_pp1800_s5_deferred(void); -DECLARE_DEFERRED(disable_pp1800_s5_deferred); - -static void disable_pp1800_s5_deferred(void) -{ - if (power_get_state() == POWER_G3) - gpio_set_level(GPIO_EN_PP1800_S5_L, 1); - else if (power_get_state() == POWER_S5G3 || - power_get_state() == POWER_S3S5 || - power_get_state() == POWER_S5) - /* pmic is still on, wait a few seconds and try again */ - hook_call_deferred(&disable_pp1800_s5_deferred_data, - SECOND); -} - /* Called on AP S3 -> S5 transition */ static void board_chipset_shutdown(void) { gpio_set_level(GPIO_EN_USBA_5V, 0); - if (board_get_version() >= 1) - /* - * use deferred to make sure pp1800_s5 is turned off after pmic - * off. - */ - hook_call_deferred(&disable_pp1800_s5_deferred_data, - SECOND); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); -void board_chipset_pre_init(void) -{ - if (board_get_version() >= 1) - gpio_set_level(GPIO_EN_PP1800_S5_L, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_PRE_INIT, board_chipset_pre_init, HOOK_PRIO_DEFAULT); - int board_get_charger_i2c(void) { /* TODO(b:138415463): confirm the bus allocation for future builds */ diff --git a/board/damu/board.h b/board/damu/board.h index 02a5e28506..fed9012e43 100644 --- a/board/damu/board.h +++ b/board/damu/board.h @@ -17,6 +17,9 @@ #include "baseboard.h" +#undef CONFIG_CHIPSET_POWER_SEQ_VERSION +#define CONFIG_CHIPSET_POWER_SEQ_VERSION 1 + /* TODO(b:135086465) led implementation */ #undef CONFIG_LED_COMMON diff --git a/board/damu/gpio.inc b/board/damu/gpio.inc index 7b4754678e..1e9b815067 100644 --- a/board/damu/gpio.inc +++ b/board/damu/gpio.inc @@ -76,7 +76,7 @@ GPIO(EC_INT_L, PIN(C, 7), GPIO_ODR_HIGH) /* EC_AP_INT_ODL */ GPIO(EC_BOARD_ID_EN_L, PIN(C, 15), GPIO_ODR_HIGH) /* EC_BOARD_ID_EN_ODL */ GPIO(USB_C0_HPD_OD, PIN(F, 1), GPIO_ODR_LOW) GPIO(BOOTBLOCK_EN_L, PIN(C, 1), GPIO_ODR_HIGH) -GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_HIGH) +GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_LOW) GPIO(USB_C0_DISCHARGE, PIN(B, 6), GPIO_OUT_LOW) /* diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index f0cb4d9ddf..ec03ec7c5f 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -273,42 +273,13 @@ static void board_chipset_startup(void) } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_chipset_startup, HOOK_PRIO_DEFAULT); -static void disable_pp1800_s5_deferred(void); -DECLARE_DEFERRED(disable_pp1800_s5_deferred); - -static void disable_pp1800_s5_deferred(void) -{ - if (power_get_state() == POWER_G3) - gpio_set_level(GPIO_EN_PP1800_S5_L, 1); - else if (power_get_state() == POWER_S5G3 || - power_get_state() == POWER_S3S5 || - power_get_state() == POWER_S5) - /* pmic is still on, wait a few seconds and try again */ - hook_call_deferred(&disable_pp1800_s5_deferred_data, - SECOND); -} - /* Called on AP S3 -> S5 transition */ static void board_chipset_shutdown(void) { gpio_set_level(GPIO_EN_USBA_5V, 0); - if (board_get_version() >= 1) - /* - * use deferred to make sure pp1800_s5 is turned off after pmic - * off. - */ - hook_call_deferred(&disable_pp1800_s5_deferred_data, - SECOND); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); -void board_chipset_pre_init(void) -{ - if (board_get_version() >= 1) - gpio_set_level(GPIO_EN_PP1800_S5_L, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_PRE_INIT, board_chipset_pre_init, HOOK_PRIO_DEFAULT); - int board_get_charger_i2c(void) { /* TODO(b:138415463): confirm the bus allocation for future builds */ diff --git a/board/jacuzzi/board.h b/board/jacuzzi/board.h index d964c8e576..e9bf5b8a79 100644 --- a/board/jacuzzi/board.h +++ b/board/jacuzzi/board.h @@ -17,6 +17,11 @@ #include "baseboard.h" +#ifdef BOARD_JUNIPER +#undef CONFIG_CHIPSET_POWER_SEQ_VERSION +#define CONFIG_CHIPSET_POWER_SEQ_VERSION 1 +#endif + /* TODO(b:135086465) led implementation */ #undef CONFIG_LED_COMMON diff --git a/board/jacuzzi/gpio.inc b/board/jacuzzi/gpio.inc index 10957c5328..fed96eda51 100644 --- a/board/jacuzzi/gpio.inc +++ b/board/jacuzzi/gpio.inc @@ -77,9 +77,15 @@ GPIO(EC_INT_L, PIN(C, 7), GPIO_ODR_HIGH) /* EC_AP_INT_ODL */ GPIO(EC_BOARD_ID_EN_L, PIN(C, 15), GPIO_ODR_HIGH) /* EC_BOARD_ID_EN_ODL */ GPIO(USB_C0_HPD_OD, PIN(F, 1), GPIO_ODR_LOW) GPIO(BOOTBLOCK_EN_L, PIN(C, 1), GPIO_ODR_HIGH) -GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_HIGH) GPIO(USB_C0_DISCHARGE, PIN(B, 6), GPIO_OUT_LOW) +#ifdef BOARD_JACUZZI +GPIO(LID_ACCEL_INT_ODL, PIN(A, 14), GPIO_INPUT) +/* Jacuzzi doesn't have EN_PP1800_S5_L. */ +UNIMPLEMENTED(EN_PP1800_S5_L) +#else +GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_LOW) +#endif /* * TODO(b:138352732): On IT88801 expander, To be readded once IT8801 driver and * gpio expander framework has landed. diff --git a/board/kappa/board.c b/board/kappa/board.c index fd1b1f90cc..0c73590d1e 100644 --- a/board/kappa/board.c +++ b/board/kappa/board.c @@ -253,42 +253,13 @@ static void board_chipset_startup(void) } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_chipset_startup, HOOK_PRIO_DEFAULT); -static void disable_pp1800_s5_deferred(void); -DECLARE_DEFERRED(disable_pp1800_s5_deferred); - -static void disable_pp1800_s5_deferred(void) -{ - if (power_get_state() == POWER_G3) - gpio_set_level(GPIO_EN_PP1800_S5_L, 1); - else if (power_get_state() == POWER_S5G3 || - power_get_state() == POWER_S3S5 || - power_get_state() == POWER_S5) - /* pmic is still on, wait a few seconds and try again */ - hook_call_deferred(&disable_pp1800_s5_deferred_data, - SECOND); -} - /* Called on AP S3 -> S5 transition */ static void board_chipset_shutdown(void) { gpio_set_level(GPIO_EN_USBA_5V, 0); - if (board_get_version() >= 1) - /* - * use deferred to make sure pp1800_s5 is turned off after pmic - * off. - */ - hook_call_deferred(&disable_pp1800_s5_deferred_data, - SECOND); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); -void board_chipset_pre_init(void) -{ - if (board_get_version() >= 1) - gpio_set_level(GPIO_EN_PP1800_S5_L, 0); -} -DECLARE_HOOK(HOOK_CHIPSET_PRE_INIT, board_chipset_pre_init, HOOK_PRIO_DEFAULT); - int board_get_charger_i2c(void) { /* TODO(b:138415463): confirm the bus allocation for future builds */ diff --git a/board/kappa/board.h b/board/kappa/board.h index 7812a71973..420d27af72 100644 --- a/board/kappa/board.h +++ b/board/kappa/board.h @@ -17,6 +17,9 @@ #include "baseboard.h" +#undef CONFIG_CHIPSET_POWER_SEQ_VERSION +#define CONFIG_CHIPSET_POWER_SEQ_VERSION 1 + /* TODO(b:135086465) led implementation */ #undef CONFIG_LED_COMMON diff --git a/board/kappa/gpio.inc b/board/kappa/gpio.inc index 7b4754678e..1e9b815067 100644 --- a/board/kappa/gpio.inc +++ b/board/kappa/gpio.inc @@ -76,7 +76,7 @@ GPIO(EC_INT_L, PIN(C, 7), GPIO_ODR_HIGH) /* EC_AP_INT_ODL */ GPIO(EC_BOARD_ID_EN_L, PIN(C, 15), GPIO_ODR_HIGH) /* EC_BOARD_ID_EN_ODL */ GPIO(USB_C0_HPD_OD, PIN(F, 1), GPIO_ODR_LOW) GPIO(BOOTBLOCK_EN_L, PIN(C, 1), GPIO_ODR_HIGH) -GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_HIGH) +GPIO(EN_PP1800_S5_L, PIN(A, 14), GPIO_OUT_LOW) GPIO(USB_C0_DISCHARGE, PIN(B, 6), GPIO_OUT_LOW) /* |