From 285fa08d10c2e5fce6e0db6f217a83b5a42e8004 Mon Sep 17 00:00:00 2001 From: Vincent Palatin Date: Tue, 1 May 2012 16:18:13 +0000 Subject: [PATCH] stm32: fix ADV compilation power related GPIO has been renamed, update the board definitions. Signed-off-by: Vincent Palatin BUG=None TEST=make BOARD=adv Change-Id: I2f0e1e9e93af22c1a6f64f354336bf0c30e9c5cd --- board/adv/board.c | 4 ++-- board/adv/board.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/adv/board.c b/board/adv/board.c index 1569c42c35..b0839a39e1 100644 --- a/board/adv/board.c +++ b/board/adv/board.c @@ -26,7 +26,7 @@ void gaia_power_event(enum gpio_signal signal); /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[GPIO_COUNT] = { /* Inputs with interrupt handlers are first for efficiency */ - {"EC_PWRON", GPIO_A, (1<<0), GPIO_INT_BOTH, gaia_power_event}, + {"KB_PWR_ON", GPIO_A, (1<<0), GPIO_INT_BOTH, gaia_power_event}, {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, gaia_power_event}, {"XPSHOLD", GPIO_A, (1<<11), GPIO_INT_RISING, gaia_power_event}, {"CHARGER_INT", GPIO_B, (1<<0), GPIO_INT_RISING, NULL}, @@ -44,7 +44,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { {"EN_PP1350", GPIO_A, (1<<9), GPIO_OUT_LOW, NULL}, {"EN_PP5000", GPIO_A, (1<<10), GPIO_OUT_LOW, NULL}, {"EN_PP3300", GPIO_A, (1<<8), GPIO_OUT_LOW, NULL}, - {"PMIC_ACOK", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL}, + {"PMIC_PWRON", GPIO_A, (1<<12), GPIO_OUT_HIGH, NULL}, {"ENTERING_RW", GPIO_B, (1<<1), GPIO_OUT_LOW, NULL}, {"CHARGER_EN", GPIO_B, (1<<2), GPIO_OUT_LOW, NULL}, {"EC_INT", GPIO_B, (1<<9), GPIO_OUT_LOW, NULL}, diff --git a/board/adv/board.h b/board/adv/board.h index bd3db04742..91c4509304 100644 --- a/board/adv/board.h +++ b/board/adv/board.h @@ -19,7 +19,7 @@ /* GPIO signal list */ enum gpio_signal { /* Inputs with interrupt handlers are first for efficiency */ - GPIO_EC_PWRON = 0, /* Power button */ + GPIO_KB_PWR_ON = 0, /* Power button */ GPIO_PP1800_LDO2, /* LDO2 is ON (end of PMIC sequence) */ GPIO_SOC1V8_XPSHOLD, /* App Processor ON */ GPIO_CHARGER_INT, @@ -38,7 +38,7 @@ enum gpio_signal { GPIO_EN_PP1350, /* DDR 1.35v rail enable */ GPIO_EN_PP5000, /* 5.0v rail enable */ GPIO_EN_PP3300, /* 3.3v rail enable */ - GPIO_PMIC_ACOK, /* 5v rail ready */ + GPIO_PMIC_PWRON, /* 5v rail ready */ GPIO_EC_ENTERING_RW, /* EC is R/W mode for the kbc mux */ GPIO_CHARGER_EN, GPIO_EC_INT,