scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-28 10:45:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86 & tegra: add CONFIG_POWER_COMMON.

Browse Source 
For the better naming for power/common.h, we rename CONFIG_CHIPSET_X86
to CONFIG_POWER_COMMON (no one is actually using it). But keep
CONFIG_CHIPSER_TEGRA for power/build.mk.

BUG=chrome-os-partner:25068
BRANCH=nyan,falco,link,peppy,rambi,samus,squawks
TEST=build only

Change-Id: Ibf1a4c24088dfddac39b38a95b3b887c195152d5
Signed-off-by: Yung-Chieh Lo <yjlou@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/182732
This commit is contained in:
Yung-Chieh Lo
2014-01-15 15:52:13 -08:00
committed by chrome-internal-fetch
parent 064624cc2d
commit 8d3136f6b7
10 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
board/falco/board.h
View File

@@ -17,7 +17,7 @@
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHIPSET_CAN_THROTTLE
#define CONFIG_CHIPSET_HASWELL
#define CONFIG_CHIPSET_X86
#define CONFIG_POWER_COMMON
#define CONFIG_CMD_GSV
#define CONFIG_EXTPOWER_FALCO
#define CONFIG_EXTPOWER_GPIO

2
board/link/board.h
View File

@@ -20,7 +20,7 @@
#define CONFIG_CHARGER_BQ24725
#define CONFIG_CHIPSET_CAN_THROTTLE
#define CONFIG_CHIPSET_IVYBRIDGE
#define CONFIG_CHIPSET_X86
#define CONFIG_POWER_COMMON
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_FANS 1
#define CONFIG_I2C_PASSTHRU_RESTRICTED

1
board/nyan/board.h
View File

@@ -14,6 +14,7 @@
#define CONFIG_CHARGER
#define CONFIG_CHARGER_BQ24725
#define CONFIG_CHIPSET_TEGRA
#define CONFIG_POWER_COMMON
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_HOST_COMMAND_STATUS
#define CONFIG_I2C

2
board/peppy/board.h
View File

@@ -19,7 +19,7 @@
#define CONFIG_CHARGER_DISCHARGE_ON_AC
#define CONFIG_CHIPSET_CAN_THROTTLE
#define CONFIG_CHIPSET_HASWELL
#define CONFIG_CHIPSET_X86
#define CONFIG_POWER_COMMON
#define CONFIG_CMD_GSV
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_FANS 1

2
board/rambi/board.h
View File

@@ -21,7 +21,7 @@
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input senso resistor, mOhm */
#define CONFIG_CHIPSET_BAYTRAIL
#define CONFIG_CHIPSET_CAN_THROTTLE
#define CONFIG_CHIPSET_X86
#define CONFIG_POWER_COMMON
#define CONFIG_CMD_GSV
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_KEYBOARD_COL2_INVERTED

2
board/samus/board.h
View File

@@ -18,7 +18,7 @@
#define CONFIG_ALS
#define CONFIG_ALS_ISL29035
#define CONFIG_BOARD_VERSION
#define CONFIG_CHIPSET_X86
#define CONFIG_POWER_COMMON
#define CONFIG_CHIPSET_CAN_THROTTLE
#define CONFIG_KEYBOARD_BOARD_CONFIG
#define CONFIG_KEYBOARD_PROTOCOL_8042

2
board/squawks/board.h
View File

@@ -21,7 +21,7 @@
#define CONFIG_CHARGER_SENSE_RESISTOR_AC 10 /* Input senso resistor, mOhm */
#define CONFIG_CHIPSET_BAYTRAIL
#define CONFIG_CHIPSET_CAN_THROTTLE
#define CONFIG_CHIPSET_X86
#define CONFIG_POWER_COMMON
#define CONFIG_CMD_GSV
#define CONFIG_EXTPOWER_GPIO
#define CONFIG_KEYBOARD_COL2_INVERTED

12
include/config.h
View File

@@ -189,13 +189,10 @@
/* AP chipset support; pick at most one */
#undef CONFIG_CHIPSET_BAYTRAIL /* Intel Bay Trail (x86) */
#undef CONFIG_CHIPSET_GAIA /* Gaia and Ares (ARM) */
#undef CONFIG_CHIPSET_GAIA /* Gaia and Ares (ARM) */
#undef CONFIG_CHIPSET_HASWELL /* Intel Haswell (x86) */
#undef CONFIG_CHIPSET_IVYBRIDGE /* Intel Ivy Bridge (x86) */
#undef CONFIG_CHIPSET_TEGRA /* Tegra */
/* Compile common x86 chipset infrastructure. Required for x86 chips. */
#undef CONFIG_CHIPSET_X86
#undef CONFIG_CHIPSET_TEGRA /* nVidia Tegra 5 */
/* Support power rail control */
#define CONFIG_CHIPSET_HAS_PP1350
@@ -574,6 +571,9 @@
/* Support sending the power button signal to x86 chipsets */
#undef CONFIG_POWER_BUTTON_X86
/* Compile common code for AP power state machine */
#undef CONFIG_POWER_COMMON
/*
* The EC stores persistent state information for flash write protect in a
* block of flash. If this option is defined, the information is in the last
@@ -819,8 +819,8 @@
#undef CONFIG_CHIPSET_GAIA
#undef CONFIG_CHIPSET_HASWELL
#undef CONFIG_CHIPSET_IVYBRIDGE
#undef CONFIG_CHIPSET_X86
#undef CONFIG_CHIPSET_TEGRA
#undef CONFIG_POWER_COMMON
#endif
#ifndef HAS_TASK_KEYPROTO

4
include/power.h
View File

@@ -88,9 +88,9 @@ enum power_state power_chipset_init(void);
enum power_state power_handle_state(enum power_state state);
/**
* Interrupt handler for chipset GPIOs.
* Interrupt handler for power signal GPIOs.
*/
#if defined(CONFIG_CHIPSET_X86) || defined(CONFIG_CHIPSET_TEGRA)
#ifdef HAS_TASK_CHIPSET
void power_signal_interrupt(enum gpio_signal signal);
#else
#define power_signal_interrupt NULL

4
power/build.mk
View File

@@ -10,5 +10,5 @@ power-$(CONFIG_CHIPSET_BAYTRAIL)+=baytrail.o
power-$(CONFIG_CHIPSET_GAIA)+=gaia.o
power-$(CONFIG_CHIPSET_HASWELL)+=haswell.o
power-$(CONFIG_CHIPSET_IVYBRIDGE)+=ivybridge.o
power-$(CONFIG_CHIPSET_TEGRA)+=tegra.o common.o
power-$(CONFIG_CHIPSET_X86)+=common.o
power-$(CONFIG_CHIPSET_TEGRA)+=tegra.o
power-$(CONFIG_POWER_COMMON)+=common.o