From 2bdc9f573acc90aafd040eaefe5ca575ae89b03a Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 5 Apr 2023 09:34:30 -0600 Subject: [PATCH] mb/system76/rpl: Switch GPP GPIOs from PWROK to RSMRST reset Change-Id: I0adc6b50600f87fe841e3dd5e2f9d8e41fc374f8 --- src/mainboard/system76/rpl/variants/addw3/gpio.c | 4 ++-- src/mainboard/system76/rpl/variants/bonw15/gpio.c | 6 +++--- src/mainboard/system76/rpl/variants/oryp11/gpio.c | 2 +- src/mainboard/system76/rpl/variants/serw13/gpio.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mainboard/system76/rpl/variants/addw3/gpio.c b/src/mainboard/system76/rpl/variants/addw3/gpio.c index 066d4d93a1..41a1dae768 100644 --- a/src/mainboard/system76/rpl/variants/addw3/gpio.c +++ b/src/mainboard/system76/rpl/variants/addw3/gpio.c @@ -55,7 +55,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPI(GPP_B15, NONE, DEEP), // PS8461_SW_PCH PAD_NC(GPP_B16, NONE), PAD_NC(GPP_B17, NONE), - PAD_CFG_NF(GPP_B18, NONE, PWROK, NF1), // PCH_PMCALERT# + PAD_CFG_NF(GPP_B18, NONE, RSMRST, NF1), // PCH_PMCALERT# PAD_CFG_GPO(GPP_B19, 1, DEEP), // PCH_WLAN_EN PAD_CFG_NF(GPP_B20, DN_20K, DEEP, NF1), _PAD_CFG_STRUCT(GPP_B21, 0x42880100, 0x0000), // GPP_B21_TBT_WAKE# @@ -244,7 +244,7 @@ static const struct pad_config gpio_table[] = { PAD_NC(GPP_K1, NONE), PAD_NC(GPP_K2, NONE), PAD_CFG_GPO(GPP_K3, 1, PLTRST), // TBT_RTD3_PWR_EN_R - PAD_CFG_GPO(GPP_K4, 1, PWROK), // TBT_FORCE_PWR_R + PAD_CFG_GPO(GPP_K4, 1, RSMRST), // TBT_FORCE_PWR_R PAD_NC(GPP_K5, NONE), PAD_CFG_NF(GPP_K6, UP_20K, DEEP, NF2), // Not in schematic PAD_CFG_NF(GPP_K7, DN_20K, DEEP, NF2), // Not in schematic diff --git a/src/mainboard/system76/rpl/variants/bonw15/gpio.c b/src/mainboard/system76/rpl/variants/bonw15/gpio.c index 90fcfca444..abbc0d4866 100644 --- a/src/mainboard/system76/rpl/variants/bonw15/gpio.c +++ b/src/mainboard/system76/rpl/variants/bonw15/gpio.c @@ -54,8 +54,8 @@ static const struct pad_config gpio_table[] = { PAD_CFG_NF(GPP_B14, NONE, DEEP, NF1), // HDA_SPKR PAD_CFG_GPO(GPP_B15, 0, DEEP), // PS8461_SW PAD_CFG_GPO(GPP_B16, 0, DEEP), - PAD_CFG_GPO(GPP_B17, 1, PWROK), // @.5G_LAN_EN - PAD_CFG_NF(GPP_B18, NONE, PWROK, NF1), // PMCALERT# + PAD_CFG_GPO(GPP_B17, 1, RSMRST), // @.5G_LAN_EN + PAD_CFG_NF(GPP_B18, NONE, RSMRST, NF1), // PMCALERT# PAD_CFG_GPO(GPP_B19, 1, DEEP), // PCH_WLAN_EN PAD_CFG_GPO(GPP_B20, 0, DEEP), PAD_CFG_GPO(GPP_B21, 0, DEEP), // GPP_B21 @@ -165,7 +165,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPO(GPP_F23, 0, DEEP), /* ------- GPIO Group GPP_G ------- */ - PAD_CFG_GPO(GPP_G0, 0, PWROK), // TBT_USB_FORCE_PWR + PAD_CFG_GPO(GPP_G0, 0, RSMRST), // TBT_USB_FORCE_PWR PAD_CFG_GPI(GPP_G1, NONE, DEEP), // GPP_G1 PAD_CFG_GPI(GPP_G2, DN_20K, DEEP), // DNX_FORCE_RELOAD PAD_CFG_GPI(GPP_G3, NONE, DEEP), // GPP_G3 diff --git a/src/mainboard/system76/rpl/variants/oryp11/gpio.c b/src/mainboard/system76/rpl/variants/oryp11/gpio.c index f8c9afe85b..74fbde85bc 100644 --- a/src/mainboard/system76/rpl/variants/oryp11/gpio.c +++ b/src/mainboard/system76/rpl/variants/oryp11/gpio.c @@ -56,7 +56,7 @@ static const struct pad_config gpio_table[] = { PAD_CFG_GPO(GPP_B8, 1, DEEP), PAD_CFG_GPO(GPP_B9, 1, DEEP), PAD_CFG_GPO(GPP_B10, 1, DEEP), - PAD_CFG_NF(GPP_B11, NONE, PWROK, NF1), // GPP_B11 + PAD_CFG_NF(GPP_B11, NONE, RSMRST, NF1), // GPP_B11 PAD_CFG_NF(GPP_B12, NONE, DEEP, NF1), // SLP_S0# PAD_CFG_NF(GPP_B13, NONE, DEEP, NF1), // SYS_RESET# PAD_CFG_NF(GPP_B14, NONE, DEEP, NF1), // GPP_B14 diff --git a/src/mainboard/system76/rpl/variants/serw13/gpio.c b/src/mainboard/system76/rpl/variants/serw13/gpio.c index 1217d77319..acdf54846b 100644 --- a/src/mainboard/system76/rpl/variants/serw13/gpio.c +++ b/src/mainboard/system76/rpl/variants/serw13/gpio.c @@ -55,7 +55,7 @@ static const struct pad_config gpio_table[] = { PAD_NC(GPP_B15, NONE), PAD_NC(GPP_B16, NONE), PAD_NC(GPP_B17, NONE), - PAD_CFG_NF(GPP_B18, NONE, PWROK, NF1), // GPP_B18_PMCALERT# + PAD_CFG_NF(GPP_B18, NONE, RSMRST, NF1), // GPP_B18_PMCALERT# PAD_NC(GPP_B19, NONE), PAD_CFG_GPO(GPP_B20, 0, DEEP), // GPIO_LANRTD3 _PAD_CFG_STRUCT(GPP_B21, 0x42880100, 0x0000), // GPP_B21_TBT_WAKE# @@ -244,7 +244,7 @@ static const struct pad_config gpio_table[] = { PAD_NC(GPP_K1, NONE), PAD_NC(GPP_K2, NONE), PAD_CFG_GPO(GPP_K3, 1, PLTRST), // TBT_RTD3_PWR_EN_R - PAD_CFG_GPO(GPP_K4, 0, PWROK), // TBT_FORCE_PWR_R + PAD_CFG_GPO(GPP_K4, 0, RSMRST), // TBT_FORCE_PWR_R PAD_NC(GPP_K5, NONE), // GPP_K6 doesn't exist // GPP_K7 doesn't exist