summaryrefslogtreecommitdiff
path: root/board/rambi
diff options
context:
space:
mode:
authorLouis Yung-Chieh Lo <yjlou@chromium.org>2014-01-07 11:30:45 -0800
committerchrome-internal-fetch <chrome-internal-fetch@google.com>2014-01-09 05:30:49 +0000
commit9867f8379a09d60b3df8c62c269627714e97b2ac (patch)
treed9fb36a41b576fc4766a68b48a76c4e7b0a2724c /board/rambi
parent28de8c96b92815139d8589a5c2cf145c4a5785ee (diff)
downloadchrome-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/rambi')
-rw-r--r--board/rambi/board.c22
-rw-r--r--board/rambi/board.h6
2 files changed, 14 insertions, 14 deletions
diff --git a/board/rambi/board.c b/board/rambi/board.c
index bbd9f46120..2ad37debdf 100644
--- a/board/rambi/board.c
+++ b/board/rambi/board.c
@@ -7,7 +7,6 @@
#include "adc.h"
#include "adc_chip.h"
#include "backlight.h"
-#include "power.h"
#include "common.h"
#include "driver/temp_sensor/tmp432.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"
@@ -41,20 +41,20 @@ const struct gpio_info gpio_list[] = {
extpower_interrupt},
{"PCH_SLP_S3_L", LM4_GPIO_G, (1<<7), GPIO_INT_BOTH_DSLEEP |
GPIO_PULL_UP,
- x86_interrupt},
+ power_signal_interrupt},
{"PCH_SLP_S4_L", LM4_GPIO_H, (1<<1), GPIO_INT_BOTH_DSLEEP |
GPIO_PULL_UP,
- x86_interrupt},
+ power_signal_interrupt},
{"PP1050_PGOOD", LM4_GPIO_H, (1<<4), GPIO_INT_BOTH,
- x86_interrupt},
+ power_signal_interrupt},
{"PP3300_PCH_PGOOD", LM4_GPIO_C, (1<<4), GPIO_INT_BOTH,
- x86_interrupt},
+ power_signal_interrupt},
{"PP5000_PGOOD", LM4_GPIO_N, (1<<0), GPIO_INT_BOTH,
- x86_interrupt},
+ power_signal_interrupt},
{"S5_PGOOD", LM4_GPIO_G, (1<<0), GPIO_INT_BOTH,
- x86_interrupt},
+ power_signal_interrupt},
{"VCORE_PGOOD", LM4_GPIO_C, (1<<6), GPIO_INT_BOTH,
- x86_interrupt},
+ power_signal_interrupt},
{"WP_L", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH,
switch_interrupt},
{"JTAG_TCK", LM4_GPIO_C, (1<<0), GPIO_DEFAULT,
@@ -124,8 +124,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_PP1050_PGOOD, 1, "PGOOD_PP1050"},
{GPIO_PP3300_PCH_PGOOD, 1, "PGOOD_PP3300_PCH"},
{GPIO_PP5000_PGOOD, 1, "PGOOD_PP5000"},
@@ -138,7 +138,7 @@ const struct x86_signal_info x86_signal_list[] = {
{GPIO_PCH_SUS_STAT_L, 0, "SUS_STAT#_ASSERTED"},
{GPIO_PCH_SUSPWRDNACK, 1, "SUSPWRDNACK_ASSERTED"},
};
-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/rambi/board.h b/board/rambi/board.h
index 71feaa2c6b..1cde39f89b 100644
--- a/board/rambi/board.h
+++ b/board/rambi/board.h
@@ -128,8 +128,8 @@ enum gpio_signal {
GPIO_COUNT
};
-/* x86 signal definitions */
-enum x86_signal {
+/* power signal definitions */
+enum power_signal {
X86_PGOOD_PP1050 = 0,
X86_PGOOD_PP3300_PCH,
X86_PGOOD_PP5000,
@@ -143,7 +143,7 @@ enum x86_signal {
X86_SUSPWRDNACK_ASSERTED,
/* Number of X86 signals */
- X86_SIGNAL_COUNT
+ POWER_SIGNAL_COUNT
};
enum adc_channel {