diff options
| author | Edward Hill <ecgh@chromium.org> | 2020-04-28 10:39:08 -0600 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-04-29 09:47:20 +0000 |
| commit | dc5f575bdd51a022eb8e6daac74ab348620c73ba (patch) | |
| tree | 4792c4ca8dc017408148a9420599bef0e553e3c7 /board/trembyle | |
| parent | ae97645e8f4a8dc554739450e64fef5c77666c2b (diff) | |
| download | chrome-ec-dc5f575bdd51a022eb8e6daac74ab348620c73ba.tar.gz | |
Zork: Configure GPIO86 EC_H1_PACKET_MODE low
GPIO86 is EC_H1_PACKET_MODE and should be initialized low.
Drop support for V0 HW.
BUG=b:155032841
BRANCH=none
TEST=EC console is not read only
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: I025a280b1f7392ce952b418afdcd96a4da29e25f
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2170143
Tested-by: Rob Barnes <robbarnes@google.com>
Reviewed-by: Rob Barnes <robbarnes@google.com>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'board/trembyle')
| -rw-r--r-- | board/trembyle/board.c | 18 | ||||
| -rw-r--r-- | board/trembyle/board.h | 6 | ||||
| -rw-r--r-- | board/trembyle/gpio.inc | 3 |
3 files changed, 3 insertions, 24 deletions
diff --git a/board/trembyle/board.c b/board/trembyle/board.c index c2be9d2b88..0add1454d3 100644 --- a/board/trembyle/board.c +++ b/board/trembyle/board.c @@ -124,10 +124,6 @@ unsigned int motion_sensor_count = ARRAY_SIZE(motion_sensors); #endif /* HAS_TASK_MOTIONSENSE */ -/* These GPIOs moved. Temporarily detect and support the V0 HW. */ -enum gpio_signal GPIO_PCH_PWRBTN_L = GPIO_EC_FCH_PWR_BTN_L; -enum gpio_signal GPIO_PCH_SYS_PWROK = GPIO_EC_FCH_PWROK; - const struct pwm_t pwm_channels[] = { [PWM_CH_KBLIGHT] = { .channel = 3, @@ -308,20 +304,6 @@ BUILD_ASSERT(ARRAY_SIZE(usb_muxes) == USBC_PORT_COUNT); void setup_fw_config(void) { - int data; - - /* - * If the CBI EEPROM is found on the battery I2C port then we are - * running on V0 HW so re-map the GPIOs that moved. - */ - if ((system_get_sku_id() == 0x7fffffff) - && (i2c_read8(I2C_PORT_BATTERY, I2C_ADDR_EEPROM_FLAGS, 0, &data) - == EC_SUCCESS)) { - ccprints("V0 HW detected"); - GPIO_PCH_PWRBTN_L = GPIO_EC_FCH_PWR_BTN_L_V0; - GPIO_PCH_SYS_PWROK = GPIO_EC_FCH_PWROK_V0; - } - /* Enable Gyro interrupts */ gpio_enable_interrupt(GPIO_6AXIS_INT_L); diff --git a/board/trembyle/board.h b/board/trembyle/board.h index 9514fe94c7..2347705021 100644 --- a/board/trembyle/board.h +++ b/board/trembyle/board.h @@ -46,9 +46,11 @@ #define GPIO_ENABLE_BACKLIGHT_L GPIO_EC_EDP_BL_DISABLE #define GPIO_ENTERING_RW GPIO_EC_ENTERING_RW #define GPIO_KBD_KSO2 GPIO_EC_KSO_02_INV +#define GPIO_PCH_PWRBTN_L GPIO_EC_FCH_PWR_BTN_L #define GPIO_PCH_RSMRST_L GPIO_EC_FCH_RSMRST_L #define GPIO_PCH_SLP_S3_L GPIO_SLP_S3_L #define GPIO_PCH_SLP_S5_L GPIO_SLP_S5_L +#define GPIO_PCH_SYS_PWROK GPIO_EC_FCH_PWROK #define GPIO_PCH_WAKE_L GPIO_EC_FCH_WAKE_L #define GPIO_POWER_BUTTON_L GPIO_EC_PWR_BTN_ODL #define GPIO_S0_PGOOD GPIO_S0_PWROK_OD @@ -60,10 +62,6 @@ #ifndef __ASSEMBLER__ -/* These GPIOs moved. Temporarily detect and support the V0 HW. */ -extern enum gpio_signal GPIO_PCH_PWRBTN_L; -extern enum gpio_signal GPIO_PCH_SYS_PWROK; - enum battery_type { BATTERY_AP18F4M, BATTERY_TYPE_COUNT, diff --git a/board/trembyle/gpio.inc b/board/trembyle/gpio.inc index 534b684199..a7fdc78d97 100644 --- a/board/trembyle/gpio.inc +++ b/board/trembyle/gpio.inc @@ -38,10 +38,8 @@ GPIO(EN_PWR_A, PIN(B, 7), GPIO_OUT_LOW) /* Enable Power */ GPIO(EC_EDP_BL_DISABLE, PIN(A, 2), GPIO_OUT_HIGH) /* Enable Backlight */ GPIO(EC_ENTERING_RW, PIN(E, 5), GPIO_OUT_LOW) /* EC Entering RW */ GPIO(EC_FCH_PWR_BTN_L, PIN(6, 2), GPIO_OUT_HIGH) /* Power Button to SOC */ -GPIO(EC_FCH_PWR_BTN_L_V0, PIN(8, 6), GPIO_OUT_HIGH) /* Power Button to SOC */ GPIO(EC_FCH_RSMRST_L, PIN(A, 1), GPIO_OUT_LOW) /* RSMRST# to SOC */ GPIO(EC_FCH_PWROK, PIN(D, 3), GPIO_OUT_LOW) /* Power OK to SOC */ -GPIO(EC_FCH_PWROK_V0, PIN(7, 5), GPIO_OUT_LOW) /* Power OK to SOC */ GPIO(EC_FCH_WAKE_L, PIN(0, 3), GPIO_OUT_HIGH) /* Wake SOC */ GPIO(EC_FCH_SCI_ODL, PIN(7, 6), GPIO_ODR_HIGH) /* SCI to SOC */ GPIO(EC_SYS_RST_L, PIN(C, 7), GPIO_ODR_HIGH) /* Cold Reset to SOC */ @@ -51,6 +49,7 @@ GPIO(USB_C0_HPD, PIN(F, 5), GPIO_OUT_LOW) /* C0 DP Hotplug Detect */ GPIO(USB_C0_IN_HPD, PIN(7, 3), GPIO_OUT_LOW) /* C0 IN Hotplug Detect */ GPIO(DP1_HPD, PIN(F, 4), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */ GPIO(DP2_HPD, PIN(C, 1), GPIO_OUT_LOW) /* C1 DP Hotplug Detect */ +GPIO(EC_H1_PACKET_MODE, PIN(8, 6), GPIO_OUT_LOW) /* H1 Packet Mode */ UNIMPLEMENTED(PCH_SMI_L) |