diff options
author | Kevin K Wong <kevin.k.wong@intel.com> | 2015-11-13 14:32:39 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2015-11-19 02:18:09 -0800 |
commit | a45a65ce862db9661cd67f763606765b29e3d61c (patch) | |
tree | 188c3ab312f6d446dbc75b15e2015671535455f8 /board | |
parent | 2196df60704cf85f28683da89fcf35cdbbf8d720 (diff) | |
download | chrome-ec-a45a65ce862db9661cd67f763606765b29e3d61c.tar.gz |
kunimitsu: remove fab 3 related changes
BUG=chrome-os-partner:44704
BRANCH=none
TEST=verified image can boot on kunimitsu fab 4
Change-Id: Ibe0172060b95536dce4698006a764981bf342be2
Signed-off-by: Kevin K Wong <kevin.k.wong@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/312730
Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'board')
-rw-r--r-- | board/kunimitsu/board.c | 26 | ||||
-rw-r--r-- | board/kunimitsu/board.h | 44 | ||||
-rw-r--r-- | board/kunimitsu/gpio.inc | 46 | ||||
-rw-r--r-- | board/kunimitsu/usb_pd_policy.c | 16 |
4 files changed, 6 insertions, 126 deletions
diff --git a/board/kunimitsu/board.c b/board/kunimitsu/board.c index 287e4bcd91..2f09165f8a 100644 --- a/board/kunimitsu/board.c +++ b/board/kunimitsu/board.c @@ -114,19 +114,11 @@ const struct adc_t adc_channels[] = { BUILD_ASSERT(ARRAY_SIZE(adc_channels) == ADC_CH_COUNT); const struct i2c_port_t i2c_ports[] = { -#ifdef BOARD_KUNIMITSU_V3 - {"batt", MEC1322_I2C0_0, 100, GPIO_I2C0_0_SCL, GPIO_I2C0_0_SDA}, - {"muxes", MEC1322_I2C0_1, 100, GPIO_I2C0_1_SCL, GPIO_I2C0_1_SDA}, - {"pd_mcu", MEC1322_I2C1, 500, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, - {"sensors", MEC1322_I2C2, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA }, - {"pmic", MEC1322_I2C3, 400, GPIO_I2C3_SCL, GPIO_I2C3_SDA }, -#else {"pmic", MEC1322_I2C0_0, 400, GPIO_I2C0_0_SCL, GPIO_I2C0_0_SDA}, {"muxes", MEC1322_I2C0_1, 400, GPIO_I2C0_1_SCL, GPIO_I2C0_1_SDA}, {"pd_mcu", MEC1322_I2C1, 500, GPIO_I2C1_SCL, GPIO_I2C1_SDA}, {"sensors", MEC1322_I2C2, 400, GPIO_I2C2_SCL, GPIO_I2C2_SDA }, {"batt", MEC1322_I2C3, 100, GPIO_I2C3_SCL, GPIO_I2C3_SDA }, -#endif /* BOARD_KUNIMITSU_V3 */ }; const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); @@ -135,7 +127,6 @@ const struct tcpc_config_t tcpc_config[CONFIG_USB_PD_PORT_COUNT] = { {I2C_PORT_TCPC, CONFIG_TCPC_I2C_BASE_ADDR + 2}, }; -#ifndef BOARD_KUNIMITSU_V3 /* Physical fans. These are logically separate from pwm_channels. */ const struct fan_t fans[] = { {.flags = FAN_USE_RPM_MODE, @@ -148,7 +139,6 @@ const struct fan_t fans[] = { }, }; BUILD_ASSERT(ARRAY_SIZE(fans) == CONFIG_FANS); -#endif /* SPI devices */ const struct spi_device_t spi_devices[] = { @@ -539,23 +529,9 @@ int board_set_active_charge_port(int charge_port) CPRINTS("New chg p%d", charge_port); if (charge_port == CHARGE_PORT_NONE) { -#ifndef BOARD_KUNIMITSU_V3 /* Disable both ports */ gpio_set_level(GPIO_USB_C0_CHARGE_EN_L, 1); gpio_set_level(GPIO_USB_C1_CHARGE_EN_L, 1); -#else - /* - * TODO (crosbug.com/p/44704): Remove support for V3 when V4 is - * available. - * - * Currently we only get VBUS knowledge when charge is enabled, - * so, when not charging, we need to enable both ports. but, - * this is dangerous if you have two chargers plugged in and you - * set charge override to -1 then it will enable both sides! - */ - gpio_set_level(GPIO_USB_C0_CHARGE_EN_L, 0); - gpio_set_level(GPIO_USB_C1_CHARGE_EN_L, 0); -#endif } else { /* Make sure non-charging port is disabled */ gpio_set_level(charge_port ? GPIO_USB_C0_CHARGE_EN_L : @@ -595,7 +571,6 @@ static void board_chipset_shutdown(void) DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); -#ifndef BOARD_KUNIMITSU_V3 /* Make the pmic re-sequence the power rails under these conditions. */ #define PMIC_RESET_FLAGS \ (RESET_FLAG_WATCHDOG | RESET_FLAG_SOFT | RESET_FLAG_HARD) @@ -624,4 +599,3 @@ static void board_handle_reboot(void) gpio_set_level(GPIO_LDO_EN, 1); } DECLARE_HOOK(HOOK_INIT, board_handle_reboot, HOOK_PRIO_FIRST); -#endif diff --git a/board/kunimitsu/board.h b/board/kunimitsu/board.h index f65e64fc34..4a4c8bcb66 100644 --- a/board/kunimitsu/board.h +++ b/board/kunimitsu/board.h @@ -8,11 +8,6 @@ #ifndef __CROS_EC_BOARD_H #define __CROS_EC_BOARD_H -/* - * TODO (crosbug.com/p/44704): Remove support for V3 when V4 is available. - */ -#define BOARD_KUNIMITSU_V3 - /* Optional features */ #define CONFIG_ADC #define CONFIG_BATTERY_CUT_OFF @@ -29,24 +24,16 @@ #define CONFIG_CHARGER_ISL9237 #define CONFIG_CHARGER_ILIM_PIN_DISABLED #define CONFIG_CHARGER_INPUT_CURRENT 512 -#ifndef BOARD_KUNIMITSU_V3 #define CONFIG_CHARGER_MIN_BAT_PCT_FOR_POWER_ON 1 -#endif #define CONFIG_CHARGER_NARROW_VDC #define CONFIG_CHARGER_PSYS #define CONFIG_CHARGER_SENSE_RESISTOR 10 #define CONFIG_CHARGER_SENSE_RESISTOR_AC 20 -#ifndef BOARD_KUNIMITSU_V3 #define CONFIG_TRICKLE_CHARGING -#endif -#ifndef BOARD_KUNIMITSU_V3 /* PSYS resistor 8.25KOhm */ #define CHARGER_PSYS_RESISTOR 8250 -#else -/* PSYS resistor 8.6KOhm */ -#define CHARGER_PSYS_RESISTOR 8600 -#endif + /* * PSYS gain = 1 / (PSYS resistor * (1.44 or 0.36) uA/W) */ @@ -57,9 +44,7 @@ #define CONFIG_CLOCK_CRYSTAL #undef CONFIG_DEBUG_ASSERT #define CONFIG_EXTPOWER_GPIO -#ifndef BOARD_KUNIMITSU_V3 #define CONFIG_FANS 1 -#endif #define CONFIG_HOSTCMD_PD #define CONFIG_I2C #define CONFIG_I2C_MASTER @@ -67,9 +52,11 @@ #define CONFIG_LED_COMMON #define CONFIG_LID_SWITCH #define CONFIG_LOW_POWER_IDLE -#ifdef BOARD_KUNIMITSU_V3 +/* + * TODO: Issue is seen with LTO feature, further debug is needed. + * #define CONFIG_LTO -#endif + */ #define CONFIG_POWER_BUTTON #define CONFIG_POWER_BUTTON_X86 #define CONFIG_POWER_COMMON @@ -166,27 +153,6 @@ /* Enable Pseudo G3 */ #define CONFIG_LOW_POWER_PSEUDO_G3 -/************************************** - * BELOW ARE CONFIG SPECIFIC FOR FAB3 * - **************************************/ -#ifdef BOARD_KUNIMITSU_V3 - -#define CONFIG_KEYBOARD_COL2_INVERTED - -#undef I2C_PORT_BATTERY -#undef I2C_PORT_CHARGER -#undef I2C_PORT_THERMAL -#define I2C_PORT_BATTERY MEC1322_I2C0_0 -#define I2C_PORT_CHARGER MEC1322_I2C0_0 -#define I2C_PORT_THERMAL MEC1322_I2C0_0 - -#undef I2C_PORT_PMIC -#undef I2C_PORT_USB_CHARGER_2 -#define I2C_PORT_PMIC MEC1322_I2C3 -#define I2C_PORT_USB_CHARGER_2 MEC1322_I2C3 - -#endif /* BOARD_KUNIMITSU_V3 */ - #ifndef __ASSEMBLER__ #include "gpio_signal.h" diff --git a/board/kunimitsu/gpio.inc b/board/kunimitsu/gpio.inc index 3a1e01ae7c..d6c9940242 100644 --- a/board/kunimitsu/gpio.inc +++ b/board/kunimitsu/gpio.inc @@ -14,11 +14,7 @@ GPIO_INT(POWER_BUTTON_L, PIN(35), GPIO_INT_BOTH, power_button_interrupt) GPIO_INT(RSMRST_L_PGOOD, PIN(63), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PCH_SLP_S4_L, PIN(200), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) GPIO_INT(PCH_SLP_S3_L, PIN(206), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) -#ifdef BOARD_KUNIMITSU_V3 -GPIO_INT(PCH_SLP_S0_L, PIN(211), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) -#else GPIO_INT(PCH_SLP_S0_L, PIN(141), GPIO_INT_BOTH, power_signal_interrupt) -#endif GPIO_INT(PCH_SLP_SUS_L, PIN(12), GPIO_INT_BOTH | GPIO_PULL_UP, power_signal_interrupt) GPIO_INT(VOLUME_UP_L, PIN(31), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(VOLUME_DOWN_L, PIN(47), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) @@ -49,9 +45,6 @@ GPIO(I2C3_SCL, PIN(24), GPIO_INPUT) GPIO(I2C3_SDA, PIN(25), GPIO_INPUT) GPIO(PCH_SCI_L, PIN(26), GPIO_ODR_HIGH) -#ifdef BOARD_KUNIMITSU_V3 -GPIO(NC_034, PIN(34), GPIO_INPUT | GPIO_PULL_UP) -#endif GPIO(USB1_ENABLE, PIN(36), GPIO_OUT_HIGH) GPIO(USB2_ENABLE, PIN(67), GPIO_OUT_HIGH) GPIO(ENTERING_RW, PIN(41), GPIO_OUT_LOW) @@ -66,11 +59,7 @@ GPIO(USB_PD_WAKE, PIN(60), GPIO_OUT_LOW) /* When asserted, ME does not lock security descriptor */ GPIO(PCH_SEC_DISABLE_L, PIN(65), GPIO_ODR_HIGH) GPIO(PCH_WAKE_L, PIN(66), GPIO_ODR_HIGH) -#ifdef BOARD_KUNIMITSU_V3 -GPIO(EC_FAN1_TTACH, PIN(105), GPIO_INPUT) -#else GPIO(USB2_OTG_VBUSSENSE, PIN(105), GPIO_ODR_HIGH) -#endif GPIO(PCH_ACOK, PIN(110), GPIO_OUT_LOW) /* Interrupts from accelerometer / gyro -- not yet implemented */ GPIO(LID_ACCEL_INT, PIN(161), GPIO_INPUT | GPIO_PULL_DOWN) /* Lid ACCEL sensor interrupt to EC */ @@ -81,53 +70,26 @@ GPIO(WLAN_OFF_L, PIN(132), GPIO_OUT_HIGH) /* RCIN# line to PCH for 8042 emulation */ GPIO(PCH_RCIN_L, PIN(135), GPIO_ODR_HIGH) /* Fan PWM output - NC / testing only */ -#ifdef BOARD_KUNIMITSU_V3 -GPIO(EC_FAN1_PWM, PIN(136), GPIO_OUT_LOW) -#else GPIO(NC_136, PIN(136), GPIO_INPUT | GPIO_PULL_UP) /* Reserved for KBD Backlight */ -#endif -#ifdef BOARD_KUNIMITSU_V3 -GPIO(USB2_OTG_VBUSSENSE, PIN(140), GPIO_ODR_HIGH) -/* Sensor input for KB PROX - UNUSED */ -GPIO(KB_PROX_INT_L, PIN(141), GPIO_INPUT) -#endif -#ifndef BOARD_KUNIMITSU_V3 /* Bring down all rails but RTC rail */ GPIO(LDO_EN, PIN(211), GPIO_OUT_LOW) -#endif GPIO(PCH_RSMRST_L, PIN(143), GPIO_OUT_LOW) /* prochot input from devices */ GPIO(PLATFORM_EC_PROCHOT, PIN(151), GPIO_INPUT) GPIO(USB_C0_5V_EN, PIN(154), GPIO_OUT_LOW) GPIO(USB_C1_5V_EN, PIN(204), GPIO_OUT_LOW) GPIO(USB_C0_CHARGE_EN_L, PIN(64), GPIO_OUT_LOW) -#ifdef BOARD_KUNIMITSU_V3 -GPIO(USB_C1_CHARGE_EN_L, PIN(157), GPIO_OUT_LOW) -#else GPIO(USB_C1_CHARGE_EN_L, PIN(210), GPIO_OUT_LOW) -#endif /* Reserved for USB-A ILIM */ GPIO(USB_ILIM_SEL, PIN(11), GPIO_INPUT | GPIO_PULL_UP) -#ifdef BOARD_KUNIMITSU_V3 -GPIO(LID_OPEN2, PIN(160), GPIO_INPUT | GPIO_PULL_UP) -#else GPIO(FAN_PWR_DIS_L, PIN(160), GPIO_OUT_HIGH) -#endif GPIO(PCH_RTCRST_L, PIN(163), GPIO_ODR_HIGH) -#ifdef BOARD_KUNIMITSU_V3 -GPIO(NC_201, PIN(201), GPIO_INPUT | GPIO_PULL_UP) -#else GPIO(PMIC_SLP_SUS_L, PIN(201), GPIO_OUT_LOW) -#endif GPIO(ENABLE_BACKLIGHT, PIN(202), GPIO_OUT_HIGH) GPIO(PP3300_WLAN_EN, PIN(203), GPIO_OUT_HIGH) -#ifdef BOARD_KUNIMITSU_V3 -GPIO(EC_WAKE_CLK, PIN(210), GPIO_INPUT) -#else GPIO(CHG_1A5_EN, PIN(157), GPIO_OUT_HIGH) -#endif GPIO(BOARD_VERSION1, PIN(6), GPIO_INPUT) GPIO(BOARD_VERSION2, PIN(7), GPIO_INPUT) GPIO(BOARD_VERSION3, PIN(10), GPIO_INPUT) @@ -147,13 +109,7 @@ ALTERNATE(PIN_MASK(16, 0x24), 1, MODULE_UART, 0) /* KB ROW - GPIO000-GPIO005 */ ALTERNATE(PIN_MASK(0, 0x3f), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) /* KB ROW - GPIO100-GPIO104, GPIO106-GPIO107 */ -#ifdef BOARD_KUNIMITSU_V3 -/* NOTE - GP101 should be configured as GPIO */ -ALTERNATE(PIN_MASK(10, 0xdd), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -GPIO(KBD_KSO2, PIN(101), GPIO_OUT_LOW) -#else ALTERNATE(PIN_MASK(10, 0xdf), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_OUTPUT) -#endif /* BOARD_KUNIMITSU_V3 */ /* KB COL - GPIO032 */ ALTERNATE(PIN_MASK(3, 0x04), 3, MODULE_KEYBOARD_SCAN, GPIO_KB_INPUT) /* KB COL - GPIO040, GPIO42-GPIO43 */ @@ -200,10 +156,8 @@ ALTERNATE(PIN_MASK(13, 0x02), 1, MODULE_PMU, 0) /* nRESET_OUT - GPIO121 */ ALTERNATE(PIN_MASK(12, 0x02), 1, MODULE_PMU, 0) -#ifndef BOARD_KUNIMITSU_V3 /* RPM-PWM for FAN */ /* TACH2PWM_OUT - GPIO34 */ ALTERNATE(PIN_MASK(3, 0x10), 3, MODULE_PWM_FAN, 0) /* TACH2PWM_IN - GPIO140 */ ALTERNATE(PIN_MASK(14, 0x01), 3, MODULE_PWM_FAN, 0) -#endif diff --git a/board/kunimitsu/usb_pd_policy.c b/board/kunimitsu/usb_pd_policy.c index e92a0111ce..6489d0e391 100644 --- a/board/kunimitsu/usb_pd_policy.c +++ b/board/kunimitsu/usb_pd_policy.c @@ -64,23 +64,9 @@ void pd_power_supply_reset(int port) /* Disable VBUS */ gpio_set_level(port ? GPIO_USB_C1_5V_EN : GPIO_USB_C0_5V_EN, 0); -#ifndef BOARD_KUNIMITSU_V3 + /* notify host of power info change */ pd_send_host_event(PD_EVENT_POWER_CHANGE); -#else - /* - * TODO (crosbug.com/p/44704): Remove support for V3 when V4 is - * available. - * - * Currently we can only detect VBUS when charge_en is asserted, - * so, if there is no active charge port, then enable charge_en. - * If the other port is the active charger, then leave this port - * disabled. - */ - if (charge_manager_get_active_charge_port() != !port) - gpio_set_level(port ? GPIO_USB_C1_CHARGE_EN_L : - GPIO_USB_C0_CHARGE_EN_L, 0); -#endif } void pd_set_input_current_limit(int port, uint32_t max_ma, |