Skip to content

Commit 458090b

Browse files
authored
Merge pull request #437 from FrameworkComputer/hx30_dvt2_sequence
[modify] change gpio setting for DVT2 HW design
2 parents e70dc26 + 9f02690 commit 458090b

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

board/hx30/gpio.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ GPIO(EC_ACC_INT_L, PIN(060), GPIO_INPUT) /* ACC interrupt */
6464
GPIO(EC_ON, PIN(0250), GPIO_INPUT | GPIO_OUT_HIGH) /* keep +3VL_EC to power on */
6565
GPIO(PBTN_OUT_L, PIN(0243), GPIO_INPUT | GPIO_OUT_LOW)
6666
GPIO(AC_PRESENT_OUT, PIN(0240), GPIO_INPUT | GPIO_ODR_LOW)
67-
GPIO(PCH_DPWROK, PIN(0142), GPIO_INPUT | GPIO_ODR_LOW)
68-
GPIO(PCH_PWR_EN, PIN(0244), GPIO_INPUT | GPIO_ODR_LOW)
67+
GPIO(PCH_DPWROK, PIN(0142), GPIO_INPUT | GPIO_OUT_LOW)
68+
GPIO(PCH_PWR_EN, PIN(0244), GPIO_INPUT | GPIO_OUT_LOW)
6969
GPIO(SYSON, PIN(0206), GPIO_INPUT | GPIO_OUT_LOW)
7070
GPIO(SUSP_L, PIN(034), GPIO_INPUT | GPIO_OUT_LOW)
7171
GPIO(EC_VCCST_PG, PIN(023), GPIO_INPUT | GPIO_ODR_LOW)

board/hx30/power_sequence.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,16 @@ void s5_power_up_control(int control)
153153

154154
static void chipset_force_g3(void)
155155
{
156-
gpio_set_level(GPIO_SUSP_L, 0);
157-
gpio_set_level(GPIO_EC_VCCST_PG, 0);
158156
gpio_set_level(GPIO_VR_ON, 0);
157+
gpio_set_level(GPIO_EC_VCCST_PG, 0);
158+
gpio_set_level(GPIO_SUSP_L, 0);
159159
gpio_set_level(GPIO_PCH_PWROK, 0);
160160
gpio_set_level(GPIO_SYS_PWROK, 0);
161161
gpio_set_level(GPIO_SYSON, 0);
162162
/* keep pch power for wake source or vpro type */
163163
if (!keep_pch_power() || me_change) {
164164

165-
166165
gpio_set_level(GPIO_PCH_RSMRST_L, 0);
167-
168166
gpio_set_level(GPIO_PCH_PWR_EN, 0);
169167
gpio_set_level(GPIO_PCH_DPWROK, 0);
170168
gpio_set_level(GPIO_PCH_PWRBTN_L, 0);
@@ -230,7 +228,8 @@ int board_chipset_power_on(void)
230228
/* Deassert RSMRST# */
231229
gpio_set_level(GPIO_PCH_RSMRST_L, 1);
232230

233-
gpio_set_level(GPIO_AC_PRESENT_OUT, 1);
231+
if (extpower_is_present())
232+
gpio_set_level(GPIO_AC_PRESENT_OUT, 1);
234233

235234
if (want_boot_ap_at_g3 || rtc_reset_tries) {
236235
CPRINTS("Assert the power button signal to power on system!");

0 commit comments

Comments
 (0)