diff options
| author | Louis Yung-Chieh Lo <yjlou@chromium.org> | 2014-01-07 11:30:45 -0800 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-01-09 05:30:49 +0000 |
| commit | 9867f8379a09d60b3df8c62c269627714e97b2ac (patch) | |
| tree | d9fb36a41b576fc4766a68b48a76c4e7b0a2724c /board/link | |
| parent | 28de8c96b92815139d8589a5c2cf145c4a5785ee (diff) | |
| download | chrome-ec-9867f8379a09d60b3df8c62c269627714e97b2ac.tar.gz | |
x86: generalize power state machine for all platforms (2/2)
Rename x86_* to power_signal_* and X86_* to POWER_*.
BUG=chrome-os-partner:24832
BRANCH=link,falco,samus,rambi,peppy,squawks,snow,spring,nyan
TEST=make -j buildall run_tests
Change-Id: Ifaa06391da5a483851ff56eca91fbf6d038dff0a
Signed-off-by: Louis Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/181719
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Diffstat (limited to 'board/link')
| -rw-r--r-- | board/link/board.c | 36 | ||||
| -rw-r--r-- | board/link/board.h | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/board/link/board.c b/board/link/board.c index 95694b25ea..9faadcbfce 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -8,7 +8,6 @@ #include "adc_chip.h" #include "backlight.h" #include "chipset.h" -#include "power.h" #include "common.h" #include "driver/temp_sensor/tmp006.h" #include "extpower.h" @@ -18,6 +17,7 @@ #include "keyboard_scan.h" #include "lid_switch.h" #include "peci.h" +#include "power.h" #include "power_button.h" #include "pwm.h" #include "pwm_chip.h" @@ -47,35 +47,35 @@ const struct gpio_info gpio_list[] = { {"PCH_BKLTEN", LM4_GPIO_J, (1<<3), GPIO_INT_BOTH, backlight_interrupt}, {"PCH_SLP_A_L", LM4_GPIO_G, (1<<5), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PCH_SLP_ME_CSW_DEV_L", LM4_GPIO_G, (1<<4), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PCH_SLP_S3_L", LM4_GPIO_J, (1<<0), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PCH_SLP_S4_L", LM4_GPIO_J, (1<<1), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PCH_SLP_S5_L", LM4_GPIO_J, (1<<2), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PCH_SLP_SUS_L", LM4_GPIO_G, (1<<3), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PCH_SUSWARN_L", LM4_GPIO_G, (1<<2), GPIO_INT_BOTH, power_interrupt}, {"PGOOD_1_5V_DDR", LM4_GPIO_K, (1<<0), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PGOOD_1_5V_PCH", LM4_GPIO_K, (1<<1), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PGOOD_1_8VS", LM4_GPIO_K, (1<<3), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PGOOD_5VALW", LM4_GPIO_H, (1<<0), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PGOOD_CPU_CORE", LM4_GPIO_M, (1<<3), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PGOOD_VCCP", LM4_GPIO_K, (1<<2), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PGOOD_VCCSA", LM4_GPIO_H, (1<<1), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"PGOOD_VGFX_CORE", LM4_GPIO_D, (1<<2), GPIO_INT_BOTH, - x86_interrupt}, + power_signal_interrupt}, {"RECOVERY_L", LM4_GPIO_H, (1<<7), GPIO_INT_BOTH, switch_interrupt}, {"USB1_STATUS_L", LM4_GPIO_E, (1<<7), GPIO_INPUT, NULL}, @@ -146,8 +146,8 @@ const struct gpio_alt_func gpio_alt_funcs[] = { }; const int gpio_alt_funcs_count = ARRAY_SIZE(gpio_alt_funcs); -/* x86 signal list. Must match order of enum x86_signal. */ -const struct x86_signal_info x86_signal_list[] = { +/* power signal list. Must match order of enum power_signal. */ +const struct power_signal_info power_signal_list[] = { {GPIO_PGOOD_5VALW, 1, "PGOOD_5VALW"}, {GPIO_PGOOD_1_5V_DDR, 1, "PGOOD_1_5V_DDR"}, {GPIO_PGOOD_1_5V_PCH, 1, "PGOOD_1_5V_PCH"}, @@ -163,7 +163,7 @@ const struct x86_signal_info x86_signal_list[] = { {GPIO_PCH_SLP_SUS_L, 1, "SLP_SUS#_DEASSERTED"}, {GPIO_PCH_SLP_ME_CSW_DEV_L, 1, "SLP_ME#_DEASSERTED"}, }; -BUILD_ASSERT(ARRAY_SIZE(x86_signal_list) == X86_SIGNAL_COUNT); +BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT); /* ADC channels. Must be in the exactly same order as in enum adc_channel. */ const struct adc_t adc_channels[] = { diff --git a/board/link/board.h b/board/link/board.h index 64aee14198..743f77a72c 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -174,7 +174,7 @@ enum x86_signal { X86_SLP_ME_DEASSERTED, /* Number of X86 signals */ - X86_SIGNAL_COUNT + POWER_SIGNAL_COUNT }; enum temp_sensor_id { |