diff options
67 files changed, 67 insertions, 66 deletions
@@ -128,7 +128,7 @@ UC_PROJECT:=$(call uppercase,$(PROJECT)) # Transform the configuration into make variables. This must be done after # the board/baseboard/project/chip/core variables are defined, since some of # the configs are dependent on particular configurations. -includes=include core/$(CORE)/include $(dirs) $(out) fuzz test +includes=include core/$(CORE)/include include/driver $(dirs) $(out) fuzz test ifdef CTS_MODULE includes+=cts/$(CTS_MODULE) cts endif diff --git a/baseboard/dragonegg/usb_pd_policy.c b/baseboard/dragonegg/usb_pd_policy.c index cc1cfd5aca..19b666ad17 100644 --- a/baseboard/dragonegg/usb_pd_policy.c +++ b/baseboard/dragonegg/usb_pd_policy.c @@ -13,7 +13,7 @@ #include "gpio.h" #include "system.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_mux.h" #include "usb_pd.h" #include "usbc_ppc.h" diff --git a/baseboard/hatch/usb_pd_policy.c b/baseboard/hatch/usb_pd_policy.c index c0c75f9cdb..d266307ad0 100644 --- a/baseboard/hatch/usb_pd_policy.c +++ b/baseboard/hatch/usb_pd_policy.c @@ -13,7 +13,7 @@ #include "gpio.h" #include "system.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_mux.h" #include "usb_pd.h" #include "usbc_ppc.h" diff --git a/board/ambassador/usb_pd_policy.c b/board/ambassador/usb_pd_policy.c index f817391784..a218d66603 100644 --- a/board/ambassador/usb_pd_policy.c +++ b/board/ambassador/usb_pd_policy.c @@ -13,7 +13,7 @@ #include "gpio.h" #include "system.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_mux.h" #include "usb_pd.h" #include "usbc_ppc.h" diff --git a/board/burnet/board.c b/board/burnet/board.c index c5329dcb03..1ba9ec173f 100644 --- a/board/burnet/board.c +++ b/board/burnet/board.c @@ -39,7 +39,7 @@ #include "system.h" #include "tablet_mode.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/cerise/board.c b/board/cerise/board.c index 99c80c60fb..24b0b8322c 100644 --- a/board/cerise/board.c +++ b/board/cerise/board.c @@ -40,7 +40,7 @@ #include "system.h" #include "tablet_mode.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/damu/board.c b/board/damu/board.c index 26086cbc98..b711be9d28 100644 --- a/board/damu/board.c +++ b/board/damu/board.c @@ -40,7 +40,7 @@ #include "system.h" #include "tablet_mode.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/dooly/usb_pd_policy.c b/board/dooly/usb_pd_policy.c index 021b18cae7..3197a4235e 100644 --- a/board/dooly/usb_pd_policy.c +++ b/board/dooly/usb_pd_policy.c @@ -13,7 +13,7 @@ #include "gpio.h" #include "system.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_mux.h" #include "usb_pd.h" #include "usbc_ppc.h" diff --git a/board/fennel/board.c b/board/fennel/board.c index 425abe9685..ff9fabda65 100644 --- a/board/fennel/board.c +++ b/board/fennel/board.c @@ -39,7 +39,7 @@ #include "system.h" #include "tablet_mode.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/flapjack/board.c b/board/flapjack/board.c index 065df1edf9..7da3cea4a6 100644 --- a/board/flapjack/board.c +++ b/board/flapjack/board.c @@ -39,7 +39,7 @@ #include "switch.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "temp_sensor.h" #include "temp_sensor_chip.h" #include "thermal.h" diff --git a/board/genesis/usb_pd_policy.c b/board/genesis/usb_pd_policy.c index f817391784..a218d66603 100644 --- a/board/genesis/usb_pd_policy.c +++ b/board/genesis/usb_pd_policy.c @@ -13,7 +13,7 @@ #include "gpio.h" #include "system.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_mux.h" #include "usb_pd.h" #include "usbc_ppc.h" diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c index 9b77b69dde..36addae6d6 100644 --- a/board/jacuzzi/board.c +++ b/board/jacuzzi/board.c @@ -38,7 +38,7 @@ #include "system.h" #include "tablet_mode.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/kakadu/board.c b/board/kakadu/board.c index 806403dde3..5be3420e56 100644 --- a/board/kakadu/board.c +++ b/board/kakadu/board.c @@ -34,7 +34,7 @@ #include "spi.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/kappa/board.c b/board/kappa/board.c index 6a47271afa..e65d0834e2 100644 --- a/board/kappa/board.c +++ b/board/kappa/board.c @@ -38,7 +38,7 @@ #include "system.h" #include "tablet_mode.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/kodama/board.c b/board/kodama/board.c index 2fab43d3ac..41a2881d56 100644 --- a/board/kodama/board.c +++ b/board/kodama/board.c @@ -34,7 +34,7 @@ #include "spi.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/kukui/board.c b/board/kukui/board.c index 0f6107ceaa..c71954862d 100644 --- a/board/kukui/board.c +++ b/board/kukui/board.c @@ -36,7 +36,7 @@ #include "spi.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/puff/usb_pd_policy.c b/board/puff/usb_pd_policy.c index f3b9146b0b..eeba1eee80 100644 --- a/board/puff/usb_pd_policy.c +++ b/board/puff/usb_pd_policy.c @@ -13,7 +13,7 @@ #include "gpio.h" #include "system.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_mux.h" #include "usb_pd.h" #include "usbc_ppc.h" diff --git a/board/rainier/board.c b/board/rainier/board.c index fa852a5a90..3814cd408b 100644 --- a/board/rainier/board.c +++ b/board/rainier/board.c @@ -31,7 +31,7 @@ #include "switch.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "temp_sensor.h" #include "temp_sensor_chip.h" #include "timer.h" diff --git a/board/scarlet/board.c b/board/scarlet/board.c index ef5dc6f6f1..6ce154e555 100644 --- a/board/scarlet/board.c +++ b/board/scarlet/board.c @@ -34,7 +34,7 @@ #include "switch.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "temp_sensor.h" #include "temp_sensor_chip.h" #include "timer.h" diff --git a/board/servo_v4/usb_pd_policy.c b/board/servo_v4/usb_pd_policy.c index b90b8705f2..fb183632d0 100644 --- a/board/servo_v4/usb_pd_policy.c +++ b/board/servo_v4/usb_pd_policy.c @@ -18,7 +18,7 @@ #include "registers.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "util.h" #include "usb_common.h" diff --git a/board/servo_v4p1/usb_pd_policy.c b/board/servo_v4p1/usb_pd_policy.c index 9fa7187696..3aeb508d53 100644 --- a/board/servo_v4p1/usb_pd_policy.c +++ b/board/servo_v4p1/usb_pd_policy.c @@ -16,7 +16,7 @@ #include "registers.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "tusb1064.h" #include "util.h" diff --git a/board/stern/board.c b/board/stern/board.c index 248c042b4f..91bcf76300 100644 --- a/board/stern/board.c +++ b/board/stern/board.c @@ -40,7 +40,7 @@ #include "system.h" #include "tablet_mode.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/board/willow/board.c b/board/willow/board.c index d0fd99b09e..47fc99063b 100644 --- a/board/willow/board.c +++ b/board/willow/board.c @@ -38,7 +38,7 @@ #include "system.h" #include "tablet_mode.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/chip/it83xx/intc.c b/chip/it83xx/intc.c index 08fcdbcf53..dba528ed9c 100644 --- a/chip/it83xx/intc.c +++ b/chip/it83xx/intc.c @@ -9,7 +9,7 @@ #include "kmsc_chip.h" #include "registers.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_pd.h" #if defined(CONFIG_USB_PD_TCPM_ITE_ON_CHIP) diff --git a/common/charge_manager.c b/common/charge_manager.c index e3c2f52620..eb6fd26595 100644 --- a/common/charge_manager.c +++ b/common/charge_manager.c @@ -15,7 +15,7 @@ #include "hooks.h" #include "host_command.h" #include "system.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_pd.h" #include "usb_pd_tcpm.h" diff --git a/common/host_command_pd.c b/common/host_command_pd.c index d46220a7a6..f9b67c8b8d 100644 --- a/common/host_command_pd.c +++ b/common/host_command_pd.c @@ -14,7 +14,7 @@ #include "panic.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_pd.h" #include "usb_pd_tcpm.h" diff --git a/common/usb_pd_host_cmd.c b/common/usb_pd_host_cmd.c index f8cb9f38e3..dedfad4f2a 100644 --- a/common/usb_pd_host_cmd.c +++ b/common/usb_pd_host_cmd.c @@ -14,7 +14,7 @@ #include "ec_commands.h" #include "host_command.h" #include "mkbp_event.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_mux.h" #include "usb_pd_tcpm.h" #include "usb_pd.h" diff --git a/common/usb_pd_policy.c b/common/usb_pd_policy.c index b480981a2d..89c87aacf5 100644 --- a/common/usb_pd_policy.c +++ b/common/usb_pd_policy.c @@ -18,7 +18,7 @@ #include "sha256.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "util.h" #include "usb_api.h" diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c index 4fae35aedb..b10d0e0c11 100644 --- a/common/usb_pd_protocol.c +++ b/common/usb_pd_protocol.c @@ -21,7 +21,7 @@ #include "system.h" #include "task.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "util.h" #include "usb_charge.h" diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index d8f1739532..813572e6a6 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -16,7 +16,7 @@ #include "system.h" #include "task.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "util.h" #include "usb_pd.h" diff --git a/common/usbc/tbt_alt_mode.c b/common/usbc/tbt_alt_mode.c index 23261adb5e..c6100e48c4 100644 --- a/common/usbc/tbt_alt_mode.c +++ b/common/usbc/tbt_alt_mode.c @@ -13,7 +13,7 @@ #include <stdint.h> #include "compile_time_macros.h" #include "console.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_common.h" #include "usb_mux.h" #include "usb_pd.h" diff --git a/common/usbc/usb_mode.c b/common/usbc/usb_mode.c index 5a1965d431..bbdad46a05 100644 --- a/common/usbc/usb_mode.c +++ b/common/usbc/usb_mode.c @@ -13,7 +13,7 @@ #include <stdint.h> #include "compile_time_macros.h" #include "console.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_common.h" #include "usb_mode.h" #include "usb_mux.h" diff --git a/common/usbc/usb_pd_dpm.c b/common/usbc/usb_pd_dpm.c index d71e590922..a8bb242954 100644 --- a/common/usbc/usb_pd_dpm.c +++ b/common/usbc/usb_pd_dpm.c @@ -13,7 +13,7 @@ #include "console.h" #include "ec_commands.h" #include "system.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_dp_alt_mode.h" #include "usb_mode.h" #include "usb_pd.h" diff --git a/common/usbc/usb_pe_drp_sm.c b/common/usbc/usb_pe_drp_sm.c index cb0b1611b9..1cb44bf164 100644 --- a/common/usbc/usb_pe_drp_sm.c +++ b/common/usbc/usb_pe_drp_sm.c @@ -15,7 +15,7 @@ #include "stdbool.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "util.h" #include "usb_common.h" #include "usb_dp_alt_mode.h" diff --git a/common/usbc/usb_prl_sm.c b/common/usbc/usb_prl_sm.c index bbf6060196..00a4cecfeb 100644 --- a/common/usbc/usb_prl_sm.c +++ b/common/usbc/usb_prl_sm.c @@ -19,7 +19,7 @@ #include "system.h" #include "task.h" #include "timer.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "util.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/common/usbc/usb_tc_ctvpd_sm.c b/common/usbc/usb_tc_ctvpd_sm.c index ba4b9710dc..a2babe754a 100644 --- a/common/usbc/usb_tc_ctvpd_sm.c +++ b/common/usbc/usb_tc_ctvpd_sm.c @@ -7,7 +7,7 @@ #include "console.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_pd.h" #include "usb_tc_sm.h" #include "vpd_api.h" diff --git a/common/usbc/usb_tc_drp_acc_trysrc_sm.c b/common/usbc/usb_tc_drp_acc_trysrc_sm.c index 74b3552309..e36d64b03b 100644 --- a/common/usbc/usb_tc_drp_acc_trysrc_sm.c +++ b/common/usbc/usb_tc_drp_acc_trysrc_sm.c @@ -10,7 +10,7 @@ #include "hooks.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_common.h" #include "usb_mux.h" #include "usb_pd.h" diff --git a/common/usbc/usb_tc_vpd_sm.c b/common/usbc/usb_tc_vpd_sm.c index 171c219705..f230d15003 100644 --- a/common/usbc/usb_tc_vpd_sm.c +++ b/common/usbc/usb_tc_vpd_sm.c @@ -7,7 +7,7 @@ #include "console.h" #include "system.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_pd.h" #include "usb_tc_sm.h" #include "usb_sm.h" diff --git a/common/usbc/usbc_task.c b/common/usbc/usbc_task.c index af9e7986bd..d0833d9103 100644 --- a/common/usbc/usbc_task.c +++ b/common/usbc/usbc_task.c @@ -24,7 +24,7 @@ #include "usb_mux.h" #include "usb_pd.h" #include "usb_prl_sm.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_pe_sm.h" #include "usb_prl_sm.h" #include "usb_sm.h" diff --git a/driver/bc12/max14637.c b/driver/bc12/max14637.c index 193e70ecb6..de0971132d 100644 --- a/driver/bc12/max14637.c +++ b/driver/bc12/max14637.c @@ -22,7 +22,7 @@ #include "power.h" #include "power/cannonlake.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c index 71e38e8f75..a4cfa5d2eb 100644 --- a/driver/charger/rt946x.c +++ b/driver/charger/rt946x.c @@ -20,7 +20,7 @@ #include "driver/wpc/p9221.h" #include "rt946x.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/driver/ppc/aoz1380.c b/driver/ppc/aoz1380.c index 83b6d67795..9ce5b442ac 100644 --- a/driver/ppc/aoz1380.c +++ b/driver/ppc/aoz1380.c @@ -17,7 +17,7 @@ #include "aoz1380.h" #include "hooks.h" #include "system.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_pd.h" #include "usb_pd_tcpc.h" #include "usbc_ppc.h" diff --git a/driver/ppc/nx20p348x.c b/driver/ppc/nx20p348x.c index b23bc4192f..a5ab4200c5 100644 --- a/driver/ppc/nx20p348x.c +++ b/driver/ppc/nx20p348x.c @@ -12,7 +12,7 @@ #include "hooks.h" #include "i2c.h" #include "system.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_charge.h" #include "usb_pd_tcpm.h" #include "usb_pd.h" diff --git a/driver/tcpm/anx7447.c b/driver/tcpm/anx7447.c index b009ba32ae..17c35c3564 100644 --- a/driver/tcpm/anx7447.c +++ b/driver/tcpm/anx7447.c @@ -10,7 +10,7 @@ #include "console.h" #include "hooks.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_mux.h" #include "usb_pd.h" diff --git a/driver/tcpm/anx74xx.c b/driver/tcpm/anx74xx.c index cdf145cc37..c5758272b9 100644 --- a/driver/tcpm/anx74xx.c +++ b/driver/tcpm/anx74xx.c @@ -11,7 +11,7 @@ #include "anx74xx.h" #include "task.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_mux.h" diff --git a/driver/tcpm/anx7688.c b/driver/tcpm/anx7688.c index 6b709dd626..15688e7012 100644 --- a/driver/tcpm/anx7688.c +++ b/driver/tcpm/anx7688.c @@ -7,7 +7,7 @@ #include "hooks.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_mux.h" diff --git a/driver/tcpm/fusb302.c b/driver/tcpm/fusb302.c index 17f71c615b..febd08378a 100644 --- a/driver/tcpm/fusb302.c +++ b/driver/tcpm/fusb302.c @@ -12,7 +12,7 @@ #include "task.h" #include "hooks.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/driver/tcpm/fusb307.c b/driver/tcpm/fusb307.c index 749aaaa139..9a92172f32 100644 --- a/driver/tcpm/fusb307.c +++ b/driver/tcpm/fusb307.c @@ -10,7 +10,7 @@ #include "hooks.h" #include "task.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "util.h" diff --git a/driver/tcpm/mt6370.c b/driver/tcpm/mt6370.c index cd66dec149..a5da3e5032 100644 --- a/driver/tcpm/mt6370.c +++ b/driver/tcpm/mt6370.c @@ -10,7 +10,7 @@ #include "mt6370.h" #include "task.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_mux.h" #include "usb_pd.h" diff --git a/driver/tcpm/ps8xxx.c b/driver/tcpm/ps8xxx.c index ea1961dcc1..3c1a731961 100644 --- a/driver/tcpm/ps8xxx.c +++ b/driver/tcpm/ps8xxx.c @@ -18,7 +18,7 @@ #include "console.h" #include "ps8xxx.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_mux.h" #include "usb_pd.h" diff --git a/driver/tcpm/raa489000.c b/driver/tcpm/raa489000.c index 3caa35f291..0aa03c5451 100644 --- a/driver/tcpm/raa489000.c +++ b/driver/tcpm/raa489000.c @@ -12,7 +12,7 @@ #include "i2c.h" #include "raa489000.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #define DEFAULT_R_AC 20 #define R_AC CONFIG_CHARGER_SENSE_RESISTOR_AC diff --git a/driver/tcpm/rt1715.c b/driver/tcpm/rt1715.c index 0455153a1b..5cd258cbc8 100644 --- a/driver/tcpm/rt1715.c +++ b/driver/tcpm/rt1715.c @@ -8,7 +8,7 @@ #include "common.h" #include "rt1715.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_pd.h" diff --git a/driver/tcpm/stub.c b/driver/tcpm/stub.c index c407e099fb..399676cf5c 100644 --- a/driver/tcpm/stub.c +++ b/driver/tcpm/stub.c @@ -7,7 +7,7 @@ #include "task.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_pd.h" #include "usb_pd_tcpc.h" #include "usb_pd_tcpm.h" diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c index be1a0766dc..7d138726af 100644 --- a/driver/tcpm/tcpci.c +++ b/driver/tcpm/tcpci.c @@ -13,7 +13,7 @@ #include "ps8xxx.h" #include "task.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_common.h" diff --git a/driver/tcpm/tcpci.h b/driver/tcpm/tcpci.h index 309c7c654b..f0970639a8 100644 --- a/driver/tcpm/tcpci.h +++ b/driver/tcpm/tcpci.h @@ -9,7 +9,7 @@ #define __CROS_EC_USB_PD_TCPM_TCPCI_H #include "config.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_mux.h" #include "usb_pd_tcpm.h" diff --git a/driver/tcpm/tusb422.c b/driver/tcpm/tusb422.c index 18fd053e7c..a990589f38 100644 --- a/driver/tcpm/tusb422.c +++ b/driver/tcpm/tusb422.c @@ -8,7 +8,7 @@ #include "common.h" #include "tusb422.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_pd.h" diff --git a/driver/wpc/p9221.c b/driver/wpc/p9221.c index 5e98737565..973d991240 100644 --- a/driver/wpc/p9221.c +++ b/driver/wpc/p9221.c @@ -15,7 +15,7 @@ #include "gpio.h" #include "hooks.h" #include "power.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "timer.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/fuzz/usb_pd_fuzz.c b/fuzz/usb_pd_fuzz.c index 777a86d592..89babff09b 100644 --- a/fuzz/usb_pd_fuzz.c +++ b/fuzz/usb_pd_fuzz.c @@ -7,7 +7,7 @@ #define HIDE_EC_STDLIB #include "common.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "test_util.h" #include "timer.h" #include "usb_pd.h" diff --git a/driver/tcpm/tcpm.h b/include/driver/tcpm/tcpm.h index 9a00a4f402..9a00a4f402 100644 --- a/driver/tcpm/tcpm.h +++ b/include/driver/tcpm/tcpm.h diff --git a/include/mock/tcpm_mock.h b/include/mock/tcpm_mock.h index 05af6aec48..7fd89919f5 100644 --- a/include/mock/tcpm_mock.h +++ b/include/mock/tcpm_mock.h @@ -5,7 +5,7 @@ /* Mock for the TCPM interface */ #include "common.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" /* Copied from usb_prl_sm.c, line 99. */ #define MOCK_CHK_BUF_SIZE 7 diff --git a/include/usb_dp_alt_mode.h b/include/usb_dp_alt_mode.h index 1cde3c3752..df968879be 100644 --- a/include/usb_dp_alt_mode.h +++ b/include/usb_dp_alt_mode.h @@ -14,7 +14,7 @@ #include <stdint.h> -#include "tcpm.h" +#include "tcpm/tcpm.h" /* * Initialize DP state for the specified port. diff --git a/include/usb_mode.h b/include/usb_mode.h index 69170594ab..001aadc38a 100644 --- a/include/usb_mode.h +++ b/include/usb_mode.h @@ -14,7 +14,7 @@ #include <stdint.h> -#include "tcpm.h" +#include "tcpm/tcpm.h" /* * Initialize USB4 state for the specified port. diff --git a/include/usb_mux.h b/include/usb_mux.h index 1831c621cb..3bdfa7be3e 100644 --- a/include/usb_mux.h +++ b/include/usb_mux.h @@ -10,7 +10,7 @@ #include "ec_commands.h" #include "i2c.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "usb_charge.h" #include "usb_pd.h" diff --git a/include/usb_tbt_alt_mode.h b/include/usb_tbt_alt_mode.h index de203667b0..3be7c60205 100644 --- a/include/usb_tbt_alt_mode.h +++ b/include/usb_tbt_alt_mode.h @@ -13,7 +13,7 @@ #include <stdint.h> -#include "tcpm.h" +#include "tcpm/tcpm.h" /* * Initialize Thunderbolt state for the specified port. diff --git a/test/usb_prl.c b/test/usb_prl.c index c381295abf..96bd045949 100644 --- a/test/usb_prl.c +++ b/test/usb_prl.c @@ -11,7 +11,7 @@ #include "mock/usb_tc_sm_mock.h" #include "task.h" #include "tcpci.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "test_util.h" #include "timer.h" #include "usb_emsg.h" diff --git a/test/usb_prl_old.c b/test/usb_prl_old.c index d1aa0ba649..6fe6b7f751 100644 --- a/test/usb_prl_old.c +++ b/test/usb_prl_old.c @@ -7,7 +7,7 @@ #include "common.h" #include "crc.h" #include "task.h" -#include "tcpm.h" +#include "tcpm/tcpm.h" #include "test_util.h" #include "timer.h" #include "usb_emsg.h" diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 0c0ecb5284..efbcbd4323 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -30,7 +30,8 @@ zephyr_include_directories_ifdef( "${PLATFORM_EC}/zephyr/shim/include" "${PLATFORM_EC}/fuzz" "${PLATFORM_EC}/test" - "${PLATFORM_EC}/include") + "${PLATFORM_EC}/include" + "${PLATFORM_EC}/include/driver") add_subdirectory_ifdef(CONFIG_PLATFORM_EC "shim") |