diff options
Diffstat (limited to 'zephyr/projects/herobrine/herobrine_npcx9/src')
-rw-r--r-- | zephyr/projects/herobrine/herobrine_npcx9/src/alt_dev_replacement.c | 35 | ||||
-rw-r--r-- | zephyr/projects/herobrine/herobrine_npcx9/src/usbc_config.c | 21 |
2 files changed, 35 insertions, 21 deletions
diff --git a/zephyr/projects/herobrine/herobrine_npcx9/src/alt_dev_replacement.c b/zephyr/projects/herobrine/herobrine_npcx9/src/alt_dev_replacement.c new file mode 100644 index 0000000000..fe3f06fca5 --- /dev/null +++ b/zephyr/projects/herobrine/herobrine_npcx9/src/alt_dev_replacement.c @@ -0,0 +1,35 @@ +/* Copyright 2021 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. + */ +#include <logging/log.h> +#include "usbc/ppc.h" +#include "hooks.h" +#include "cros_board_info.h" + +LOG_MODULE_REGISTER(alt_dev_replacement); + +#define BOARD_VERSION_UNKNOWN 0xffffffff + +/* Check board version to decide which ppc is used. */ +static bool board_has_syv_ppc(void) +{ + static uint32_t board_version = BOARD_VERSION_UNKNOWN; + + if (board_version == BOARD_VERSION_UNKNOWN) { + if (cbi_get_board_version(&board_version) != EC_SUCCESS) { + LOG_ERR("Failed to get board version."); + board_version = 0; + } + } + + return (board_version >= 1); +} + +static void check_alternate_devices(void) +{ + /* Configure the PPC driver */ + if (board_has_syv_ppc()) + PPC_ENABLE_ALTERNATE(ppc_port0_syv); +} +DECLARE_HOOK(HOOK_INIT, check_alternate_devices, HOOK_PRIO_DEFAULT); diff --git a/zephyr/projects/herobrine/herobrine_npcx9/src/usbc_config.c b/zephyr/projects/herobrine/herobrine_npcx9/src/usbc_config.c index 20536752f2..1bce0c51b3 100644 --- a/zephyr/projects/herobrine/herobrine_npcx9/src/usbc_config.c +++ b/zephyr/projects/herobrine/herobrine_npcx9/src/usbc_config.c @@ -62,23 +62,6 @@ void usba_oc_interrupt(enum gpio_signal signal) hook_call_deferred(&usba_oc_deferred_data, 0); } -#define BOARD_VERSION_UNKNOWN 0xffffffff - -/* Check board version to decide which ppc is used. */ -static bool board_has_syv_ppc(void) -{ - static uint32_t board_version = BOARD_VERSION_UNKNOWN; - - if (board_version == BOARD_VERSION_UNKNOWN) { - if (cbi_get_board_version(&board_version) != EC_SUCCESS) { - CPRINTS("Failed to get board version."); - board_version = 0; - } - } - - return (board_version >= 1); -} - void ppc_interrupt(enum gpio_signal signal) { switch (signal) { @@ -190,10 +173,6 @@ static void board_init_usbc(void) { /* Enable USB-A overcurrent interrupt */ gpio_enable_interrupt(GPIO_USB_A0_OC_ODL); - - /* Configure the PPC driver */ - if (board_has_syv_ppc()) - PPC_ENABLE_ALTERNATE(ppc_port0_syv); } DECLARE_HOOK(HOOK_INIT, board_init_usbc, HOOK_PRIO_DEFAULT); |