diff options
author | Wai-Hong Tam <waihong@google.com> | 2021-06-17 16:16:10 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2021-06-21 22:32:42 +0000 |
commit | e7310cebc12212b582a87ba8358c76c3943624bf (patch) | |
tree | ad82672f8f2346c3b9eb2c5cb07ea1e03bcdb88a | |
parent | b3eb02515c64a5427bc212ee8e61fc6958055136 (diff) | |
download | chrome-ec-e7310cebc12212b582a87ba8358c76c3943624bf.tar.gz |
trogdor: Drop the support of legacy board revisions
The older board revisions use a different EC part. No way to support it
using the same EC image. Totally drop the support.
BRANCH=None
BUG=b:184071830
TEST=Built the Trogdor image.
Change-Id: Ib495d69eeb1b4894c87b45ad86a29fd43a0befd9
Signed-off-by: Wai-Hong Tam <waihong@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2971865
Reviewed-by: Stephen Boyd <swboyd@chromium.org>
-rw-r--r-- | board/trogdor/board.c | 17 | ||||
-rw-r--r-- | board/trogdor/board.h | 8 | ||||
-rw-r--r-- | board/trogdor/board_revs.h | 28 | ||||
-rw-r--r-- | board/trogdor/gpio.inc | 5 |
4 files changed, 0 insertions, 58 deletions
diff --git a/board/trogdor/board.c b/board/trogdor/board.c index bc735a8df5..0da77a9061 100644 --- a/board/trogdor/board.c +++ b/board/trogdor/board.c @@ -19,11 +19,7 @@ #include "hooks.h" #include "keyboard_scan.h" #include "lid_switch.h" -#if BOARD_REV >= TROGDOR_REV1 #include "pi3usb9201.h" -#else -#include "pi3usb9281.h" -#endif /* BOARD_REV */ #include "power.h" #include "power/qcom.h" #include "power_button.h" @@ -261,7 +257,6 @@ const int usb_port_enable[USB_PORT_COUNT] = { }; /* BC1.2 */ -#if BOARD_REV >= TROGDOR_REV1 const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { { .i2c_port = I2C_PORT_POWER, @@ -272,18 +267,6 @@ const struct pi3usb9201_config_t pi3usb9201_bc12_chips[] = { .i2c_addr_flags = PI3USB9201_I2C_ADDR_3_FLAGS, }, }; -#else -struct pi3usb9281_config pi3usb9281_chips[] = { - { - .i2c_port = I2C_PORT_POWER, - }, - { - .i2c_port = I2C_PORT_EEPROM, - }, -}; -BUILD_ASSERT(ARRAY_SIZE(pi3usb9281_chips) == - CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT); -#endif /* BOARD_REV */ /* Initialize board. */ static void board_init(void) diff --git a/board/trogdor/board.h b/board/trogdor/board.h index 971d3e0abc..d4a1a00794 100644 --- a/board/trogdor/board.h +++ b/board/trogdor/board.h @@ -10,9 +10,6 @@ #include "baseboard.h" -/* Board revision */ -#include "board_revs.h" - /* TODO(waihong): Remove the following bringup features */ #define CONFIG_BRINGUP #define CONFIG_SYSTEM_UNLOCKED /* Allow dangerous commands. */ @@ -30,12 +27,7 @@ #define CONFIG_PWM_KBLIGHT /* BC 1.2 Charger */ -#if BOARD_REV >= TROGDOR_REV1 #define CONFIG_BC12_DETECT_PI3USB9201 -#else -#define CONFIG_BC12_DETECT_PI3USB9281 -#define CONFIG_BC12_DETECT_PI3USB9281_CHIP_COUNT 2 -#endif /* BOARD_REV */ /* USB */ #define CONFIG_USB_PD_TCPM_PS8805 diff --git a/board/trogdor/board_revs.h b/board/trogdor/board_revs.h deleted file mode 100644 index b587de65fc..0000000000 --- a/board/trogdor/board_revs.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ - -#ifndef __CROS_EC_BOARD_REVS_H -#define __CROS_EC_BOARD_REVS_H - -#define TROGDOR_REV0 0 -#define TROGDOR_REV1 1 -#define TROGDOR_REV2 2 -#define TROGDOR_REV_LAST TROGDOR_REV2 - -#define TROGDOR_REV_DEFAULT TROGDOR_REV2 - -#if !defined(BOARD_REV) -#define BOARD_REV TROGDOR_REV_DEFAULT -#endif - -#if BOARD_REV < TROGDOR_REV0 || BOARD_REV > TROGDOR_REV_LAST -#error "Board revision out of range" -#endif - -#if BOARD_REV < TROGDOR_REV2 -#error "Legacy board not supported" -#endif - -#endif /* __CROS_EC_BOARD_REVS_H */ diff --git a/board/trogdor/gpio.inc b/board/trogdor/gpio.inc index 687b98ee06..067b904125 100644 --- a/board/trogdor/gpio.inc +++ b/board/trogdor/gpio.inc @@ -13,13 +13,8 @@ GPIO_INT(USB_C0_PD_INT_ODL, PIN(E, 0), GPIO_INT_FALLING, tcpc_alert_event) / GPIO_INT(USB_C1_PD_INT_ODL, PIN(F, 5), GPIO_INT_FALLING, tcpc_alert_event) /* Interrupt from port-1 TCPC */ GPIO_INT(USB_C0_SWCTL_INT_ODL, PIN(0, 3), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-0 PPC */ GPIO_INT(USB_C1_SWCTL_INT_ODL, PIN(4, 0), GPIO_INT_FALLING, ppc_interrupt) /* Interrupt from port-1 PPC */ -#if BOARD_REV >= TROGDOR_REV1 GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING | GPIO_PULL_UP, usb0_evt) /* Interrupt from port-0 BC1.2 */ GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING | GPIO_PULL_UP, usb1_evt) /* Interrupt from port-1 BC1.2 */ -#else -GPIO_INT(USB_C0_BC12_INT_L, PIN(6, 1), GPIO_INT_FALLING, usb0_evt) /* Interrupt from port-0 BC1.2 */ -GPIO_INT(USB_C1_BC12_INT_L, PIN(8, 2), GPIO_INT_FALLING, usb1_evt) /* Interrupt from port-1 BC1.2 */ -#endif /* BOARD_REV */ GPIO_INT(USB_A0_OC_ODL, PIN(D, 1), GPIO_INT_BOTH | GPIO_PULL_UP, usba_oc_interrupt) /* System interrupts */ |