diff options
| author | Divya Sasidharan <divya.s.sasidharan@intel.com> | 2021-09-30 16:50:05 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-10-12 21:29:01 +0000 |
| commit | 12342a67a4d2761324ef8d62ad1d5051d0abf637 (patch) | |
| tree | c5ac3252a45e3c58a02472db00b2582c2ea99d16 /power | |
| parent | af15326d86c6060aa5aaabb6d6a4ec3ae9e259bb (diff) | |
| download | chrome-ec-12342a67a4d2761324ef8d62ad1d5051d0abf637.tar.gz | |
board: Rename RSMRST_L_PGOOD as PG_EC_RSMRST_ODLfirmware-chameleon-14280.B-main
GPIO_RSMRST_L_PGOOD is also used as GPIO_PG_EC_RSMRST_ODL
creating redundancy. Removing it will help need for
redefinitions for zephyr.
Remove reference to GPIO_RSMRST_L_PGOOD in zephyr
BUG=b:200975143
BRANCH=main
TEST=make buildall -j, boot up on brya
Change-Id: Iff46595174c54db347b69cff3ad9e266ba9fd535
Signed-off-by: Divya Sasidharan <divya.s.sasidharan@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3180808
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/apollolake.c | 4 | ||||
| -rw-r--r-- | power/cometlake.c | 2 | ||||
| -rw-r--r-- | power/intel_x86.c | 6 | ||||
| -rw-r--r-- | power/skylake.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/power/apollolake.c b/power/apollolake.c index 2aaf7fc533..3bc03af626 100644 --- a/power/apollolake.c +++ b/power/apollolake.c @@ -51,7 +51,7 @@ const struct power_signal_info power_signal_list[] = { "ALL_SYS_PGOOD", }, [X86_RSMRST_N] = { - GPIO_RSMRST_L_PGOOD, + GPIO_PG_EC_RSMRST_ODL, POWER_SIGNAL_ACTIVE_HIGH, "RSMRST_L", }, @@ -178,6 +178,6 @@ int chipset_pltrst_is_valid(void) * Invalid PLTRST# from SOC unless RSMRST# * from PMIC through EC to soc is deasserted. */ - return (gpio_get_level(GPIO_RSMRST_L_PGOOD) && + return (gpio_get_level(GPIO_PG_EC_RSMRST_ODL) && gpio_get_level(GPIO_PCH_RSMRST_L)); } diff --git a/power/cometlake.c b/power/cometlake.c index 1b73bcc296..3c127b0c03 100644 --- a/power/cometlake.c +++ b/power/cometlake.c @@ -36,7 +36,7 @@ const struct power_signal_info power_signal_list[] = { .name = "SLP_S4_DEASSERTED", }, [X86_RSMRST_L_PGOOD] = { - .gpio = GPIO_RSMRST_L_PGOOD, + .gpio = GPIO_PG_EC_RSMRST_ODL, .flags = POWER_SIGNAL_ACTIVE_HIGH, .name = "RSMRST_L_PGOOD", }, diff --git a/power/intel_x86.c b/power/intel_x86.c index c4aae9db81..a982ff03c0 100644 --- a/power/intel_x86.c +++ b/power/intel_x86.c @@ -487,7 +487,7 @@ enum power_state common_intel_x86_power_handle_state(enum power_state state) void intel_x86_rsmrst_signal_interrupt(enum gpio_signal signal) { - int rsmrst_in = gpio_get_level(GPIO_RSMRST_L_PGOOD); + int rsmrst_in = gpio_get_level(GPIO_PG_EC_RSMRST_ODL); int rsmrst_out = gpio_get_level(GPIO_PCH_RSMRST_L); /* @@ -518,7 +518,7 @@ void common_intel_x86_handle_rsmrst(enum power_state state) * Pass through RSMRST asynchronously, as PCH may not react * immediately to power changes. */ - int rsmrst_in = gpio_get_level(GPIO_RSMRST_L_PGOOD); + int rsmrst_in = gpio_get_level(GPIO_PG_EC_RSMRST_ODL); int rsmrst_out = gpio_get_level(GPIO_PCH_RSMRST_L); /* Nothing to do. */ @@ -542,7 +542,7 @@ void common_intel_x86_handle_rsmrst(enum power_state state) gpio_set_level(GPIO_PCH_RSMRST_L, rsmrst_in); - CPRINTS("Pass through GPIO_RSMRST_L_PGOOD: %d", rsmrst_in); + CPRINTS("Pass through GPIO_PG_EC_RSMRST_ODL: %d", rsmrst_in); board_after_rsmrst(rsmrst_in); } diff --git a/power/skylake.c b/power/skylake.c index a4cb649fd5..c68035e099 100644 --- a/power/skylake.c +++ b/power/skylake.c @@ -46,7 +46,7 @@ const struct power_signal_info power_signal_list[] = { "SLP_SUS_DEASSERTED", }, [X86_RSMRST_L_PWRGD] = { - GPIO_RSMRST_L_PGOOD, + GPIO_PG_EC_RSMRST_ODL, POWER_SIGNAL_ACTIVE_HIGH, "RSMRST_N_PWRGD", }, |