From d9530449fd75650a53d2ee8d9cfdc8ef063781b5 Mon Sep 17 00:00:00 2001 From: Randall Spangler Date: Fri, 18 Oct 2013 10:38:07 -0700 Subject: cleanup: Consolidate power interrupts Every chipset had its own header file just to declare a GPIO interrupt handler. Since this seems to be a common feature of the power interface, make a standard power_interrupt() API provided by chipset.h. This lets us get rid of 4 include files, and makes it easier to add more chipsets in the future. BUG=chrome-os-partner:18343 BRANCH=none TEST=build all boards; pass unit tests Change-Id: I1fc5612d42625ea46e0a8e16a83085b66d476664 Signed-off-by: Randall Spangler Reviewed-on: https://chromium-review.googlesource.com/173745 --- board/bolt/board.c | 4 ++-- board/bolt/board.h | 2 -- board/bolt/power_sequence.c | 2 +- board/daisy/board.c | 10 +++++----- board/falco/board.c | 1 - board/kirby/board.c | 7 +++---- board/link/board.c | 4 ++-- board/nyan/board.c | 8 ++++---- board/peppy/board.c | 4 ++-- board/pit/board.c | 10 +++++----- board/puppy/board.c | 10 +++++----- board/rambi/board.c | 1 - board/samus/board.c | 1 - board/slippy/board.c | 4 ++-- board/snow/board.c | 9 ++++----- board/spring/board.c | 9 ++++----- 16 files changed, 39 insertions(+), 47 deletions(-) (limited to 'board') diff --git a/board/bolt/board.c b/board/bolt/board.c index 2b770e4db5..714918ebd0 100644 --- a/board/bolt/board.c +++ b/board/bolt/board.c @@ -8,7 +8,7 @@ #include "board.h" #include "backlight.h" #include "chip_temp_sensor.h" -#include "chipset_haswell.h" +#include "chipset.h" #include "chipset_x86_common.h" #include "common.h" #include "ec_commands.h" @@ -61,7 +61,7 @@ const struct gpio_info gpio_list[] = { {"VCORE_PGOOD", LM4_GPIO_C, (1<<6), GPIO_INT_BOTH, x86_interrupt}, {"PCH_EDP_VDD_EN", LM4_GPIO_J, (1<<1), GPIO_INT_BOTH, - bolt_interrupt}, + power_interrupt}, {"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH, switch_interrupt}, {"WP", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, diff --git a/board/bolt/board.h b/board/bolt/board.h index a1e4fe661a..ca4862f912 100644 --- a/board/bolt/board.h +++ b/board/bolt/board.h @@ -216,8 +216,6 @@ enum board_version { #define WIRELESS_GPIO_WWAN GPIO_PP3300_LTE_EN #define WIRELESS_GPIO_WLAN_POWER GPIO_PP3300_WLAN_EN -void bolt_interrupt(enum gpio_signal signal); - #endif /* !__ASSEMBLER__ */ #endif /* __BOARD_H */ diff --git a/board/bolt/power_sequence.c b/board/bolt/power_sequence.c index a778f26700..78468211df 100644 --- a/board/bolt/power_sequence.c +++ b/board/bolt/power_sequence.c @@ -383,7 +383,7 @@ enum x86_state x86_handle_state(enum x86_state state) return state; } -void bolt_interrupt(enum gpio_signal signal) +void power_interrupt(enum gpio_signal signal) { /* Pass through eDP VDD enable from PCH */ gpio_set_level(GPIO_EC_EDP_VDD_EN, gpio_get_level(GPIO_PCH_EDP_VDD_EN)); diff --git a/board/daisy/board.c b/board/daisy/board.c index be42ffcbd8..f6803950df 100644 --- a/board/daisy/board.c +++ b/board/daisy/board.c @@ -5,8 +5,8 @@ /* Daisy board-specific configuration */ #include "battery.h" +#include "chipset.h" #include "common.h" -#include "gaia_power.h" #include "gpio.h" #include "i2c.h" #include "keyboard_raw.h" @@ -37,12 +37,12 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, gaia_power_event}, - {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, gaia_power_event}, - {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_RISING, gaia_power_event}, + {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, power_interrupt}, + {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, power_interrupt}, + {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_RISING, power_interrupt}, {"CHARGER_INT_L", GPIO_C, (1<<4), GPIO_INT_FALLING, NULL}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt}, - {"SUSPEND_L", GPIO_A, (1<<7), GPIO_INT_BOTH, gaia_suspend_event}, + {"SUSPEND_L", GPIO_A, (1<<7), GPIO_INT_BOTH, power_interrupt}, {"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt}, {"KB_IN01", GPIO_C, (1<<9), GPIO_KB_INPUT, diff --git a/board/falco/board.c b/board/falco/board.c index 1200060db0..41de41d920 100644 --- a/board/falco/board.c +++ b/board/falco/board.c @@ -9,7 +9,6 @@ #include "board.h" #include "charger_bq24738.h" #include "chip_temp_sensor.h" -#include "chipset_haswell.h" #include "chipset_x86_common.h" #include "common.h" #include "ec_commands.h" diff --git a/board/kirby/board.c b/board/kirby/board.c index ca88e1416f..3b3464e3f8 100644 --- a/board/kirby/board.c +++ b/board/kirby/board.c @@ -8,7 +8,6 @@ #include "common.h" #include "chipset.h" #include "extpower.h" -#include "gaia_power.h" #include "gpio.h" #include "hooks.h" #include "i2c.h" @@ -28,8 +27,8 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"KB_PWR_ON_L", GPIO_A, (1<<0), GPIO_INT_BOTH, gaia_power_event}, - {"XPSHOLD", GPIO_E, (1<<5), GPIO_INT_RISING, gaia_power_event}, + {"KB_PWR_ON_L", GPIO_A, (1<<0), GPIO_INT_BOTH, power_interrupt}, + {"XPSHOLD", GPIO_E, (1<<5), GPIO_INT_RISING, power_interrupt}, {"CHARGER_INT_L", GPIO_E, (1<<2), GPIO_INT_FALLING, NULL /*pmu_irq_handler*/}, {"USB_CHG_INT", GPIO_E, (1<<15), GPIO_INT_FALLING, @@ -37,7 +36,7 @@ const struct gpio_info gpio_list[] = { {"USBPD_INT_L", GPIO_E, (1<<1), GPIO_INT_FALLING, NULL /*extpower_interrupt*/}, {"LID_OPEN", GPIO_E, (1<<6), GPIO_INT_BOTH, lid_interrupt}, - {"SUSPEND_L", GPIO_E, (1<<3), GPIO_INT_BOTH, gaia_suspend_event}, + {"SUSPEND_L", GPIO_E, (1<<3), GPIO_INT_BOTH, power_interrupt}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_INT_BOTH | GPIO_PULL_UP, spi_event}, {"AC_PRESENT_L", GPIO_A, (1<<1), GPIO_INT_BOTH, extpower_interrupt}, diff --git a/board/link/board.c b/board/link/board.c index 4d6edbb2ed..5d05392c5f 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -7,7 +7,7 @@ #include "adc.h" #include "backlight.h" #include "chip_temp_sensor.h" -#include "chipset_ivybridge.h" +#include "chipset.h" #include "chipset_x86_common.h" #include "common.h" #include "ec_commands.h" @@ -59,7 +59,7 @@ const struct gpio_info gpio_list[] = { {"PCH_SLP_SUS_L", LM4_GPIO_G, (1<<3), GPIO_INT_BOTH, x86_interrupt}, {"PCH_SUSWARN_L", LM4_GPIO_G, (1<<2), GPIO_INT_BOTH, - ivybridge_interrupt}, + power_interrupt}, {"PGOOD_1_5V_DDR", LM4_GPIO_K, (1<<0), GPIO_INT_BOTH, x86_interrupt}, {"PGOOD_1_5V_PCH", LM4_GPIO_K, (1<<1), GPIO_INT_BOTH, diff --git a/board/nyan/board.c b/board/nyan/board.c index ff052d5644..caa8ca188b 100644 --- a/board/nyan/board.c +++ b/board/nyan/board.c @@ -5,9 +5,9 @@ /* Nyan board-specific configuration */ #include "battery.h" +#include "chipset.h" #include "common.h" #include "extpower.h" -#include "tegra_power.h" #include "gpio.h" #include "i2c.h" #include "keyboard_raw.h" @@ -27,11 +27,11 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, tegra_power_event}, - {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, tegra_power_event}, + {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, power_interrupt}, + {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, power_interrupt}, {"CHARGER_INT", GPIO_C, (1<<6), GPIO_INT_RISING, NULL}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt}, - {"SUSPEND_L", GPIO_C, (1<<7), GPIO_KB_INPUT, tegra_suspend_event}, + {"SUSPEND_L", GPIO_C, (1<<7), GPIO_KB_INPUT, power_interrupt}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_INT_BOTH | GPIO_PULL_UP, spi_event}, {"AC_PRESENT", GPIO_A, (1<<0), GPIO_INT_BOTH, extpower_interrupt}, diff --git a/board/peppy/board.c b/board/peppy/board.c index a60316552b..0c53cb74e4 100644 --- a/board/peppy/board.c +++ b/board/peppy/board.c @@ -7,7 +7,7 @@ #include "adc.h" #include "backlight.h" #include "chip_temp_sensor.h" -#include "chipset_haswell.h" +#include "chipset.h" #include "chipset_x86_common.h" #include "common.h" #include "ec_commands.h" @@ -58,7 +58,7 @@ const struct gpio_info gpio_list[] = { {"VCORE_PGOOD", LM4_GPIO_C, (1<<6), GPIO_INT_BOTH, x86_interrupt}, {"PCH_EDP_VDD_EN", LM4_GPIO_J, (1<<1), GPIO_INT_BOTH, - haswell_interrupt}, + power_interrupt}, {"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH, switch_interrupt}, {"WP_L", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, diff --git a/board/pit/board.c b/board/pit/board.c index ba9fb7252d..b4c5cc0d6e 100644 --- a/board/pit/board.c +++ b/board/pit/board.c @@ -5,9 +5,9 @@ /* Pit board-specific configuration */ #include "battery.h" +#include "chipset.h" #include "common.h" #include "extpower.h" -#include "gaia_power.h" #include "gpio.h" #include "i2c.h" #include "keyboard_scan.h" @@ -28,12 +28,12 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, gaia_power_event}, - {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, gaia_power_event}, - {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_RISING, gaia_power_event}, + {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, power_interrupt}, + {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, power_interrupt}, + {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_RISING, power_interrupt}, {"CHARGER_INT_L", GPIO_C, (1<<6), GPIO_INT_FALLING, pmu_irq_handler}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt}, - {"SUSPEND_L", GPIO_C, (1<<7), GPIO_INT_BOTH, gaia_suspend_event}, + {"SUSPEND_L", GPIO_C, (1<<7), GPIO_INT_BOTH, power_interrupt}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_INT_BOTH | GPIO_PULL_UP, spi_event}, {"AC_PRESENT", GPIO_A, (1<<0), GPIO_INT_BOTH, extpower_interrupt}, diff --git a/board/puppy/board.c b/board/puppy/board.c index db275818ab..970ecc6b8a 100644 --- a/board/puppy/board.c +++ b/board/puppy/board.c @@ -5,9 +5,9 @@ /* Puppy board-specific configuration */ #include "battery.h" +#include "chipset.h" #include "common.h" #include "extpower.h" -#include "gaia_power.h" #include "gpio.h" #include "i2c.h" #include "keyboard_raw.h" @@ -26,12 +26,12 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, gaia_power_event}, - {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, gaia_power_event}, - {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, gaia_power_event}, + {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, power_interrupt}, + {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, power_interrupt}, + {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, power_interrupt}, {"CHARGER_INT_L", GPIO_C, (1<<6), GPIO_INT_FALLING, pmu_irq_handler}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt}, - {"SUSPEND_L", GPIO_C, (1<<7), GPIO_KB_INPUT, gaia_suspend_event}, + {"SUSPEND_L", GPIO_C, (1<<7), GPIO_KB_INPUT, power_interrupt}, {"SPI1_NSS", GPIO_A, (1<<4), GPIO_INT_BOTH | GPIO_PULL_UP, spi_event}, {"AC_PRESENT", GPIO_A, (1<<0), GPIO_INT_BOTH, extpower_interrupt}, diff --git a/board/rambi/board.c b/board/rambi/board.c index f99f4874c1..fbe32dd924 100644 --- a/board/rambi/board.c +++ b/board/rambi/board.c @@ -7,7 +7,6 @@ #include "adc.h" #include "backlight.h" #include "chip_temp_sensor.h" -#include "chipset_haswell.h" #include "chipset_x86_common.h" #include "common.h" #include "ec_commands.h" diff --git a/board/samus/board.c b/board/samus/board.c index 183e7bbe62..5961a937c9 100644 --- a/board/samus/board.c +++ b/board/samus/board.c @@ -8,7 +8,6 @@ #include "board.h" #include "backlight.h" #include "chip_temp_sensor.h" -#include "chipset_haswell.h" #include "chipset_x86_common.h" #include "common.h" #include "ec_commands.h" diff --git a/board/slippy/board.c b/board/slippy/board.c index 680b021a84..ff1a71e06f 100644 --- a/board/slippy/board.c +++ b/board/slippy/board.c @@ -7,7 +7,7 @@ #include "adc.h" #include "backlight.h" #include "chip_temp_sensor.h" -#include "chipset_haswell.h" +#include "chipset.h" #include "chipset_x86_common.h" #include "common.h" #include "ec_commands.h" @@ -58,7 +58,7 @@ const struct gpio_info gpio_list[] = { {"VCORE_PGOOD", LM4_GPIO_C, (1<<6), GPIO_INT_BOTH, x86_interrupt}, {"PCH_EDP_VDD_EN", LM4_GPIO_J, (1<<1), GPIO_INT_BOTH, - haswell_interrupt}, + power_interrupt}, {"RECOVERY_L", LM4_GPIO_A, (1<<5), GPIO_PULL_UP|GPIO_INT_BOTH, switch_interrupt}, {"WP_L", LM4_GPIO_A, (1<<4), GPIO_INT_BOTH, diff --git a/board/snow/board.c b/board/snow/board.c index cf09e189e9..8db32d31c1 100644 --- a/board/snow/board.c +++ b/board/snow/board.c @@ -9,7 +9,6 @@ #include "chipset.h" #include "common.h" #include "console.h" -#include "gaia_power.h" #include "gpio.h" #include "hooks.h" #include "i2c.h" @@ -34,12 +33,12 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, gaia_power_event}, - {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, gaia_power_event}, - {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, gaia_power_event}, + {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, power_interrupt}, + {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, power_interrupt}, + {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, power_interrupt}, {"CHARGER_INT_L", GPIO_C, (1<<4), GPIO_INT_FALLING, pmu_irq_handler}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt}, - {"SUSPEND_L", GPIO_A, (1<<7), INT_BOTH_FLOATING, gaia_suspend_event}, + {"SUSPEND_L", GPIO_A, (1<<7), INT_BOTH_FLOATING, power_interrupt}, {"WP_L", GPIO_B, (1<<4), GPIO_INPUT, NULL}, {"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt}, diff --git a/board/spring/board.c b/board/spring/board.c index 09e943d8f7..30269b27d8 100644 --- a/board/spring/board.c +++ b/board/spring/board.c @@ -10,7 +10,6 @@ #include "common.h" #include "console.h" #include "extpower.h" -#include "gaia_power.h" #include "gpio.h" #include "hooks.h" #include "host_command.h" @@ -34,12 +33,12 @@ /* GPIO signal list. Must match order from enum gpio_signal. */ const struct gpio_info gpio_list[] = { /* Inputs with interrupt handlers are first for efficiency */ - {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, gaia_power_event}, - {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, gaia_power_event}, - {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, gaia_power_event}, + {"KB_PWR_ON_L", GPIO_B, (1<<5), GPIO_INT_BOTH, power_interrupt}, + {"PP1800_LDO2", GPIO_A, (1<<1), GPIO_INT_BOTH, power_interrupt}, + {"XPSHOLD", GPIO_A, (1<<3), GPIO_INT_BOTH, power_interrupt}, {"CHARGER_INT_L", GPIO_C, (1<<4), GPIO_INT_FALLING, pmu_irq_handler}, {"LID_OPEN", GPIO_C, (1<<13), GPIO_INT_BOTH, lid_interrupt}, - {"SUSPEND_L", GPIO_A, (1<<7), INT_BOTH_FLOATING, gaia_suspend_event}, + {"SUSPEND_L", GPIO_A, (1<<7), INT_BOTH_FLOATING, power_interrupt}, {"WP_L", GPIO_A, (1<<13), GPIO_INPUT, NULL}, {"KB_IN00", GPIO_C, (1<<8), GPIO_KB_INPUT, keyboard_raw_gpio_interrupt}, -- cgit v1.2.1