diff options
| author | Keith Short <keithshort@chromium.org> | 2023-04-14 12:02:59 -0600 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-04-21 00:15:35 +0000 |
| commit | a57f4cdac8dc69e2c9ae0ebfdb76b4ed10d2dd21 (patch) | |
| tree | ba0bb33fde3425504c7fcab58e46c9365ed8f51c | |
| parent | 312f806c07106e61b5b19489999ca627b3e722b2 (diff) | |
| download | chrome-ec-stabilize-15432.B-main.tar.gz | |
zephyr: bc12 shim: Remove compat guardstabilize-15432.B-main
The CONFIG_PLATFORM_EC_USB_CHARGER option already guards the bc12.c shim
from compiling. A check that a BC1.2 driver is enabled is not required.
BUG=none
BRANCH=none
TEST=zmake compare-builds -a
TEST=./twister
Change-Id: I1c9598b81a4eb4f96cfc85ef21ecc313db65a8a7
Signed-off-by: Keith Short <keithshort@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4426808
Reviewed-by: Al Semjonovs <asemjonovs@google.com>
| -rw-r--r-- | zephyr/shim/src/bc12.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/zephyr/shim/src/bc12.c b/zephyr/shim/src/bc12.c index 12b45d2197..ed5fe101b2 100644 --- a/zephyr/shim/src/bc12.c +++ b/zephyr/shim/src/bc12.c @@ -13,11 +13,6 @@ #include <zephyr/devicetree.h> -#if DT_HAS_COMPAT_STATUS_OKAY(RT1718S_BC12_COMPAT) || \ - DT_HAS_COMPAT_STATUS_OKAY(RT1739_BC12_COMPAT) || \ - DT_HAS_COMPAT_STATUS_OKAY(RT9490_BC12_COMPAT) || \ - DT_HAS_COMPAT_STATUS_OKAY(PI3USB9201_COMPAT) - /* Check RT1718S dependency. BC12 node must be dependent on TCPC node. */ #if DT_HAS_COMPAT_STATUS_OKAY(RT1718S_BC12_COMPAT) BUILD_ASSERT(DT_HAS_COMPAT_STATUS_OKAY(RT1718S_TCPC_COMPAT)); @@ -43,5 +38,3 @@ BUILD_ASSERT(DT_HAS_COMPAT_STATUS_OKAY(RT1718S_TCPC_COMPAT)); /* BC1.2 controllers */ struct bc12_config bc12_ports[CHARGE_PORT_COUNT] = { DT_FOREACH_STATUS_OKAY( named_usbc_port, BC12_CHIP) }; - -#endif /* #if DT_HAS_COMPAT_STATUS_OKAY */ |