diff options
author | Randall Spangler <rspangler@chromium.org> | 2013-07-03 11:52:21 -0700 |
---|---|---|
committer | ChromeBot <chrome-bot@google.com> | 2013-07-08 11:30:38 -0700 |
commit | e6ad2a6ab5c545c0cf9ec2b1f4d59765a5eeeb69 (patch) | |
tree | 047c534623fbcbf5781414cc87ff135906b888ae /board | |
parent | 6321de981146d2da32466c0aa335a89e85aba521 (diff) | |
download | chrome-ec-e6ad2a6ab5c545c0cf9ec2b1f4d59765a5eeeb69.tar.gz |
Rename files in common/ to be more consistent
This gets rid of mystery files like "ir357x" and "lp5562". All chip
names are now prefixed with their module type (e.g. "chipset_",
"led_driver_", etc.)
No functional changes; renaming files and CONFIG constants only.
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms
Change-Id: I3227fb0f6b0243bb08a13577cdb0f6def0e15d54
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/60922
Diffstat (limited to 'board')
-rw-r--r-- | board/falco/board.h | 2 | ||||
-rw-r--r-- | board/link/board.c | 6 | ||||
-rw-r--r-- | board/link/board.h | 4 | ||||
-rw-r--r-- | board/peppy/board.h | 2 | ||||
-rw-r--r-- | board/slippy/board.h | 2 | ||||
-rw-r--r-- | board/spring/board.h | 4 |
6 files changed, 7 insertions, 13 deletions
diff --git a/board/falco/board.h b/board/falco/board.h index 8498cc0468..58828c0e7c 100644 --- a/board/falco/board.h +++ b/board/falco/board.h @@ -20,7 +20,7 @@ #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24738 #ifdef HAS_TASK_CHIPSET -#define CONFIG_CHIPSET_X86_HASWELL +#define CONFIG_CHIPSET_HASWELL #endif #define CONFIG_CUSTOM_KEYSCAN #define CONFIG_EXTPOWER_GPIO diff --git a/board/link/board.c b/board/link/board.c index 1fa2bdfed2..29cefeea4f 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -158,7 +158,6 @@ const struct i2c_port_t i2c_ports[I2C_PORTS_USED] = { /* Temperature sensors data; must be in same order as enum temp_sensor_id. */ const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = { -#ifdef CONFIG_TMP006 {"I2C-USB C-Die", TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 0, 7}, {"I2C-USB C-Object", TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 1, 7}, {"I2C-PCH D-Die", TEMP_SENSOR_TYPE_BOARD, tmp006_get_val, 2, 7}, @@ -167,13 +166,8 @@ const struct temp_sensor_t temp_sensors[TEMP_SENSOR_COUNT] = { {"I2C-Hinge C-Object", TEMP_SENSOR_TYPE_IGNORED, tmp006_get_val, 5, 7}, {"I2C-Charger D-Die", TEMP_SENSOR_TYPE_BOARD, tmp006_get_val, 6, 7}, {"I2C-Charger D-Object", TEMP_SENSOR_TYPE_CASE, tmp006_get_val, 7, 7}, -#endif -#ifdef CONFIG_ADC {"ECInternal", TEMP_SENSOR_TYPE_BOARD, chip_temp_sensor_get_val, 0, 4}, -#endif -#ifdef CONFIG_PECI {"PECI", TEMP_SENSOR_TYPE_CPU, peci_temp_sensor_get_val, 0, 2}, -#endif }; const struct tmp006_t tmp006_sensors[TMP006_COUNT] = { diff --git a/board/link/board.h b/board/link/board.h index 7d5e406134..6da09f61e5 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -20,7 +20,7 @@ #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24725 #ifdef HAS_TASK_CHIPSET -#define CONFIG_CHIPSET_X86_IVYBRIDGE +#define CONFIG_CHIPSET_IVYBRIDGE #endif #define CONFIG_CUSTOM_KEYSCAN #define CONFIG_EXTPOWER_GPIO @@ -39,7 +39,7 @@ #define CONFIG_PWM_FAN #define CONFIG_PWM_KBLIGHT #define CONFIG_TEMP_SENSOR -#define CONFIG_TMP006 +#define CONFIG_TEMP_SENSOR_TMP006 #define CONFIG_USB_PORT_POWER_SMART #define CONFIG_WP_ACTIVE_HIGH diff --git a/board/peppy/board.h b/board/peppy/board.h index 4d3af9837b..f69effda35 100644 --- a/board/peppy/board.h +++ b/board/peppy/board.h @@ -20,7 +20,7 @@ #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24707A #ifdef HAS_TASK_CHIPSET -#define CONFIG_CHIPSET_X86_HASWELL +#define CONFIG_CHIPSET_HASWELL #endif #define CONFIG_CUSTOM_KEYSCAN #define CONFIG_EXTPOWER_GPIO diff --git a/board/slippy/board.h b/board/slippy/board.h index 6b87496bdf..89b69ca2e1 100644 --- a/board/slippy/board.h +++ b/board/slippy/board.h @@ -20,7 +20,7 @@ #define CONFIG_CHARGER #define CONFIG_CHARGER_BQ24707A #ifdef HAS_TASK_CHIPSET -#define CONFIG_CHIPSET_X86_HASWELL +#define CONFIG_CHIPSET_HASWELL #endif #define CONFIG_CUSTOM_KEYSCAN #define CONFIG_EXTPOWER_GPIO diff --git a/board/spring/board.h b/board/spring/board.h index 4938c90a72..7c2693adf2 100644 --- a/board/spring/board.h +++ b/board/spring/board.h @@ -38,13 +38,13 @@ #define CONFIG_KEYBOARD_PROTOCOL_MKBP #define CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE /* Use STOP mode when we have nothing to do */ -#define CONFIG_LP5562 +#define CONFIG_LED_DRIVER_LP5562 #define CONFIG_PMU_BOARD_INIT #define CONFIG_PMU_FORCE_FET /* Always enable 3G modem power rail */ #define CONFIG_PMU_HARD_RESET #define CONFIG_PMU_TPS65090 #define CONFIG_SMART_BATTERY -#define CONFIG_TSU6721 +#define CONFIG_USB_SWITCH_TSU6721 #ifndef __ASSEMBLER__ |