diff options
author | YH Lin <yueherngl@google.com> | 2023-05-05 12:48:46 +0000 |
---|---|---|
committer | YH Lin <yueherngl@google.com> | 2023-05-05 12:48:46 +0000 |
commit | e79a9dab1721c3d7da1475f3f802c4ea871a48ec (patch) | |
tree | e59a5a0517bbd7edf879d70cca594499a4c22ab4 /zephyr/program/corsola/src/npcx_usbc.c | |
parent | 00f7707de7c0f8b4345fa5725a7c62aa1d2bd5af (diff) | |
parent | 70e2504d1886c585bc74c6f624887719e3f0a351 (diff) | |
download | chrome-ec-e79a9dab1721c3d7da1475f3f802c4ea871a48ec.tar.gz |
Merge remote-tracking branch cros/main into firmware-brya-14505.B-main
Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file
baseboard/brya/relevant-paths.txt firmware-brya-14505.B-main
Relevant changes:
git log --oneline 00f7707de7..70e2504d18 -- baseboard/brya board/agah
board/anahera board/banshee board/brya board/crota board/felwinter
board/gimble board/hades board/kano board/marasov board/mithrax
board/omnigul board/osiris board/primus board/redrix board/taeko
board/taniks board/vell board/volmar driver/bc12/pi3usb9201_public.*
driver/charger/bq25710.* driver/ppc/nx20p348x.*
driver/ppc/syv682x_public.* driver/retimer/bb_retimer_public.*
driver/tcpm/nct38xx.* driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.*
include/power/alderlake* include/intel_x86.h power/alderlake*
power/intel_x86.c util/getversion.sh
1ab2843570 Hades: Configure GPIOs (2)
b696e7629b Hades: Unblock USB_C1_PPC_SNK_EN on start-up
d001bbc638 Hades: Configure USB-C0 and USB-C1
50a53a526b Hades: Configure GPIOs
e881c1a04a hades: Support LGC battery
8b093356d4 Hades: Add LED_3_L and LED_4_L
4f3d3d6ae6 Hades: Rename USB-C2 USB-C1
fe35030f7f hades: Change keyboard config
88dfac40f0 Hades: Relocate EC_PROCHOT_IN_L
0db21802fa Hades: Swap GPU_ACOFF and BJ_ADP_PRESENT
d1a831463f Hades: Replace ISL9241 with RAA489110
a700192391 Agah/Hades: Make d_notify_policies more readable
53f35199ba Zephyr test: Test NXP PPC interrupts
8c8a42b383 omnigul: Update battery parameter.
67d4a05823 NX20P348X: Correct dead battery exit error handling
fafe10a6fe ppc/nx20p348x: Do not set reserved bit
d32a389718 Charger: CONFIG gate bypass mode
BRANCH=None
BUG=b:273722902 b:276468569 b:277981949 b:277158040 b:272815816
BUG=b:272821227 b:277981335 b:277280318 b:272815831 b:269790564
TEST=`emerge-brya chromeos-ec`
Force-Relevant-Builds: all
Change-Id: I1043c664a3f90dd3b9207da233e5dec078c1e4a1
Signed-off-by: YH Lin <yueherngl@google.com>
Diffstat (limited to 'zephyr/program/corsola/src/npcx_usbc.c')
-rw-r--r-- | zephyr/program/corsola/src/npcx_usbc.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/zephyr/program/corsola/src/npcx_usbc.c b/zephyr/program/corsola/src/npcx_usbc.c index 0ee6a43dc1..10a977696e 100644 --- a/zephyr/program/corsola/src/npcx_usbc.c +++ b/zephyr/program/corsola/src/npcx_usbc.c @@ -59,10 +59,12 @@ void board_tcpc_init(void) board_reset_pd_mcu(); } +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 /* Do not enable TCPC interrupt on port 1 if not type-c */ if (corsola_get_db_type() != CORSOLA_DB_TYPEC) { tcpc_config[USBC_PORT_C1].irq_gpio.port = NULL; } +#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */ /* Enable BC1.2 interrupts. */ gpio_enable_dt_interrupt(GPIO_INT_FROM_NODELABEL(int_usb_c0_bc12)); @@ -118,6 +120,7 @@ __override int board_rt1718s_init(int port) return EC_SUCCESS; } +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 __override int board_rt1718s_set_frs_enable(int port, int enable) { if (port == USBC_PORT_C1) @@ -130,6 +133,7 @@ __override int board_rt1718s_set_frs_enable(int port, int enable) enable ? GPIO_OUT_HIGH : GPIO_OUT_LOW); return EC_SUCCESS; } +#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */ void board_reset_pd_mcu(void) { @@ -144,8 +148,10 @@ void board_reset_pd_mcu(void) */ msleep(2); +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 /* reset C1 RT1718s */ rt1718s_sw_reset(USBC_PORT_C1); +#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */ } /* Used by Vbus discharge common code with CONFIG_USB_PD_DISCHARGE */ @@ -154,6 +160,7 @@ int board_vbus_source_enabled(int port) return ppc_is_sourcing_vbus(port); } +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 __override int board_rt1718s_set_snk_enable(int port, int enable) { if (port == USBC_PORT_C1) { @@ -162,6 +169,7 @@ __override int board_rt1718s_set_snk_enable(int port, int enable) return EC_SUCCESS; } +#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */ int board_set_active_charge_port(int port) { @@ -253,9 +261,11 @@ __override int board_get_vbus_voltage(int port) if (rv) return 0; break; +#if CONFIG_USB_PD_PORT_MAX_COUNT > 1 case USBC_PORT_C1: rt1718s_get_adc(port, RT1718S_ADC_VBUS1, &voltage); break; +#endif /* CONFIG_USB_PD_PORT_MAX_COUNT > 1 */ default: return 0; } |