From 4e27a42ff9d2b7bb566b6bc455404657a3250c91 Mon Sep 17 00:00:00 2001 From: Louis Yung-Chieh Lo Date: Thu, 2 Jan 2014 16:45:38 -0800 Subject: [PATCH] x86: generalize power state machine for all platforms (1/2) Renaming file names is the first step. Please see issue tracker for more details. BUG=chrome-os-partner:24832 BRANCH=link,falco,samus,rambi,peppy TEST=build all x86 boards. make clean BOARD=link && make -j32 BOARD=link && \ make clean BOARD=falco && make -j32 BOARD=falco && \ make clean BOARD=samus && make -j32 BOARD=samus && \ make clean BOARD=rambi && make -j32 BOARD=rambi && \ make clean BOARD=peppy && make -j32 BOARD=peppy Change-Id: I3a296a0c14f6bebefa858438b1320061ac71dd38 Signed-off-by: Louis Yung-Chieh Lo Reviewed-on: https://chromium-review.googlesource.com/181400 Reviewed-by: Randall Spangler --- board/falco/board.c | 2 +- board/link/board.c | 2 +- board/peppy/board.c | 2 +- board/rambi/board.c | 2 +- board/samus/board.c | 2 +- board/samus/power_sequence.c | 2 +- include/{chipset_x86_common.h => power.h} | 0 power/baytrail.c | 2 +- power/build.mk | 2 +- power/{x86_common.c => common.c} | 2 +- power/haswell.c | 2 +- power/ivybridge.c | 2 +- test/adapter.c | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename include/{chipset_x86_common.h => power.h} (100%) rename power/{x86_common.c => common.c} (99%) diff --git a/board/falco/board.c b/board/falco/board.c index bfec566608..b343261ebc 100644 --- a/board/falco/board.c +++ b/board/falco/board.c @@ -8,7 +8,7 @@ #include "adc_chip.h" #include "backlight.h" #include "board.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "driver/charger/bq24738.h" #include "driver/temp_sensor/g781.h" diff --git a/board/link/board.c b/board/link/board.c index a080345764..95694b25ea 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -8,7 +8,7 @@ #include "adc_chip.h" #include "backlight.h" #include "chipset.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "driver/temp_sensor/tmp006.h" #include "extpower.h" diff --git a/board/peppy/board.c b/board/peppy/board.c index 35f7d5002b..5c85ead4d4 100644 --- a/board/peppy/board.c +++ b/board/peppy/board.c @@ -8,7 +8,7 @@ #include "adc_chip.h" #include "backlight.h" #include "chipset.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "driver/temp_sensor/g781.h" #include "extpower.h" diff --git a/board/rambi/board.c b/board/rambi/board.c index d71e74d063..5b1b295de7 100644 --- a/board/rambi/board.c +++ b/board/rambi/board.c @@ -7,7 +7,7 @@ #include "adc.h" #include "adc_chip.h" #include "backlight.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "driver/temp_sensor/tmp432.h" #include "extpower.h" diff --git a/board/samus/board.c b/board/samus/board.c index bca84b61c7..96139a5b0c 100644 --- a/board/samus/board.c +++ b/board/samus/board.c @@ -8,7 +8,7 @@ #include "adc.h" #include "adc_chip.h" #include "backlight.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "driver/temp_sensor/tmp006.h" #include "driver/als_isl29035.h" diff --git a/board/samus/power_sequence.c b/board/samus/power_sequence.c index f9ccd6de01..efd367ccb4 100644 --- a/board/samus/power_sequence.c +++ b/board/samus/power_sequence.c @@ -6,7 +6,7 @@ /* X86 chipset power control module for Chrome EC */ #include "chipset.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "console.h" #include "gpio.h" diff --git a/include/chipset_x86_common.h b/include/power.h similarity index 100% rename from include/chipset_x86_common.h rename to include/power.h diff --git a/power/baytrail.c b/power/baytrail.c index 203c63707b..fff9ae33ca 100644 --- a/power/baytrail.c +++ b/power/baytrail.c @@ -6,7 +6,7 @@ /* X86 chipset power control module for Chrome EC */ #include "chipset.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "console.h" #include "ec_commands.h" diff --git a/power/build.mk b/power/build.mk index b2cd14fe66..2042cdee34 100644 --- a/power/build.mk +++ b/power/build.mk @@ -11,4 +11,4 @@ power-$(CONFIG_CHIPSET_GAIA)+=gaia.o power-$(CONFIG_CHIPSET_HASWELL)+=haswell.o power-$(CONFIG_CHIPSET_IVYBRIDGE)+=ivybridge.o power-$(CONFIG_CHIPSET_TEGRA)+=tegra.o -power-$(CONFIG_CHIPSET_X86)+=x86_common.o +power-$(CONFIG_CHIPSET_X86)+=common.o diff --git a/power/x86_common.c b/power/common.c similarity index 99% rename from power/x86_common.c rename to power/common.c index d0b1088845..8ddabcf962 100644 --- a/power/x86_common.c +++ b/power/common.c @@ -6,7 +6,7 @@ /* Common functionality across x86 chipsets */ #include "chipset.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "console.h" #include "extpower.h" diff --git a/power/haswell.c b/power/haswell.c index cd00300f25..f9ee85d0c9 100644 --- a/power/haswell.c +++ b/power/haswell.c @@ -6,7 +6,7 @@ /* X86 chipset power control module for Chrome EC */ #include "chipset.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "console.h" #include "ec_commands.h" diff --git a/power/ivybridge.c b/power/ivybridge.c index 3a3c344223..5b61c04eef 100644 --- a/power/ivybridge.c +++ b/power/ivybridge.c @@ -6,7 +6,7 @@ /* X86 chipset power control module for Chrome EC */ #include "chipset.h" -#include "chipset_x86_common.h" +#include "power.h" #include "common.h" #include "console.h" #include "gpio.h" diff --git a/test/adapter.c b/test/adapter.c index 5ce9733b4b..f64197b387 100644 --- a/test/adapter.c +++ b/test/adapter.c @@ -16,7 +16,7 @@ #include "timer.h" #include "util.h" #include "chipset.h" -#include "chipset_x86_common.h" +#include "power.h" /* Normally private stuff from the modules we're going to test */ #include "adapter_externs.h"