diff options
author | Edward Hill <ecgh@chromium.org> | 2020-03-27 20:11:43 -0600 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2020-03-28 19:29:53 +0000 |
commit | 9f3ade325ef2111c078009e2d223e33f1abac871 (patch) | |
tree | a2a54fe4f069faee1b531c797d646e0a8273a479 /board/ezkinil | |
parent | 522979dc23224b7c1f9d4e844f4965cc17854fdd (diff) | |
download | chrome-ec-9f3ade325ef2111c078009e2d223e33f1abac871.tar.gz |
Morphius/Ezkinil: Remove Trembyle V0 HW support.
BUG=none
BRANCH=none
TEST=none
Signed-off-by: Edward Hill <ecgh@chromium.org>
Change-Id: I618a0ca9de0e767f47084527a11b56e10210223b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2125587
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Denis Brockus <dbrockus@chromium.org>
Diffstat (limited to 'board/ezkinil')
-rw-r--r-- | board/ezkinil/board.c | 18 | ||||
-rw-r--r-- | board/ezkinil/board.h | 6 | ||||
-rw-r--r-- | board/ezkinil/gpio.inc | 2 |
3 files changed, 2 insertions, 24 deletions
diff --git a/board/ezkinil/board.c b/board/ezkinil/board.c index 7a23f5cde3..917d081640 100644 --- a/board/ezkinil/board.c +++ b/board/ezkinil/board.c @@ -120,26 +120,8 @@ 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; - void board_update_sensor_config_from_sku(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/ezkinil/board.h b/board/ezkinil/board.h index baf97a4d30..1a87a15527 100644 --- a/board/ezkinil/board.h +++ b/board/ezkinil/board.h @@ -48,9 +48,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 @@ -62,10 +64,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_AP19B8M, BATTERY_AP18C7M, diff --git a/board/ezkinil/gpio.inc b/board/ezkinil/gpio.inc index a4c284f951..b9050f4c24 100644 --- a/board/ezkinil/gpio.inc +++ b/board/ezkinil/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_SYS_RST_L, PIN(C, 7), GPIO_ODR_HIGH) /* Cold Reset to SOC */ GPIO(USB_C0_TCPC_RST_L, PIN(E, 1), GPIO_OUT_HIGH) /* C0 TCPC Reset */ |