Move tcpic.h header into include/driver

This header cannot currently be accessed by Zephyr since it is in a
driver directory, not an include directory. This header has quite a
bit of public stuff in it, so it seems reasonable to consider
everything public.

Move the header file and update all users.

BUG=b:175434113
BRANCH=none
TEST=make buildall -j30
build volteer on zephyr

Signed-off-by: Simon Glass <sjg@chromium.org>
Change-Id: Ibba37f47a06783fafb5095f853f2a68d92b6df87
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2607745

72 files changed, 71 insertions, 71 deletions

diff --git a/Makefile.toolchain b/Makefile.toolchain
index 65c76b8ac2..84c9e81660 100644
--- a/Makefile.toolchain
+++ b/Makefile.toolchain
@@ -74,7 +74,7 @@ CFLAGS_TEST=$(if $(TEST_BUILD),-DTEST_BUILD=$(EMPTY) \
                        -fno-experimental-new-pass-manager -DTEST_FUZZ=$(EMPTY))
 CFLAGS_COVERAGE=$(if $(TEST_COVERAGE),--coverage \
 				      -DTEST_COVERAGE=$(EMPTY),)
-CFLAGS_HOSTTEST=$(if $(TEST_HOSTTEST),-DTEST_HOSTTEST=$(EMPTY),)
+CFLAGS_HOSTTEST=$(if $(TEST_HOSTTEST),-DTEST_HOSTTEST=$(EMPTY),) -Iinclude/driver
 CFLAGS_DEFINE=-DOUTDIR=$(out)/$(BLD) -DCHIP=$(CHIP) -DBOARD_TASKFILE=$(_tsk_lst_file) \
               -DBOARD=$(BOARD) -DCORE=$(CORE) -DPROJECT=$(PROJECT) \
               -DCHIP_VARIANT=$(CHIP_VARIANT) -DCHIP_FAMILY=$(UC_CHIP_FAMILY) \
diff --git a/baseboard/dragonegg/baseboard.c b/baseboard/dragonegg/baseboard.c
index 3e70f7615c..2301a9cb0f 100644
--- a/baseboard/dragonegg/baseboard.c
+++ b/baseboard/dragonegg/baseboard.c
@@ -26,7 +26,7 @@
 #include "power/icelake.h"
 #include "timer.h"
 #include "util.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "usbc_ppc.h"
 #include "util.h"
 
diff --git a/baseboard/dragonegg/usb_pd_policy.c b/baseboard/dragonegg/usb_pd_policy.c
index 19b666ad17..85eeecdcf9 100644
--- a/baseboard/dragonegg/usb_pd_policy.c
+++ b/baseboard/dragonegg/usb_pd_policy.c
@@ -12,7 +12,7 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c
index c374eda42a..d592ce69ca 100644
--- a/baseboard/grunt/baseboard.c
+++ b/baseboard/grunt/baseboard.c
@@ -39,7 +39,7 @@
 #include "switch.h"
 #include "system.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_mux.h"
diff --git a/baseboard/hatch/baseboard.c b/baseboard/hatch/baseboard.c
index 97fd870242..d0cf3f00b0 100644
--- a/baseboard/hatch/baseboard.c
+++ b/baseboard/hatch/baseboard.c
@@ -26,7 +26,7 @@
 #include "power.h"
 #include "stdbool.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "timer.h"
 #include "usbc_ppc.h"
 #include "util.h"
diff --git a/baseboard/hatch/usb_pd_policy.c b/baseboard/hatch/usb_pd_policy.c
index d266307ad0..a66bfefe87 100644
--- a/baseboard/hatch/usb_pd_policy.c
+++ b/baseboard/hatch/usb_pd_policy.c
@@ -12,7 +12,7 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
diff --git a/baseboard/intelrvp/chg_usb_pd.c b/baseboard/intelrvp/chg_usb_pd.c
index fd3f3c9596..9f64cdd4e7 100644
--- a/baseboard/intelrvp/chg_usb_pd.c
+++ b/baseboard/intelrvp/chg_usb_pd.c
@@ -8,7 +8,7 @@
 #include "charge_manager.h"
 #include "charge_state_v2.h"
 #include "hooks.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ## args)
diff --git a/baseboard/intelrvp/chg_usb_pd_mecc_0_9.c b/baseboard/intelrvp/chg_usb_pd_mecc_0_9.c
index 455b384295..b587691123 100644
--- a/baseboard/intelrvp/chg_usb_pd_mecc_0_9.c
+++ b/baseboard/intelrvp/chg_usb_pd_mecc_0_9.c
@@ -7,7 +7,7 @@
 
 #include "console.h"
 #include "hooks.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "system.h"
 
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
diff --git a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
index 36aaa5612f..74fd933f2e 100644
--- a/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
+++ b/baseboard/intelrvp/chg_usb_pd_mecc_1_0.c
@@ -10,7 +10,7 @@
 #include "console.h"
 #include "driver/ppc/sn5s330.h"
 #include "hooks.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "system.h"
 #include "usbc_ppc.h"
 
diff --git a/baseboard/octopus/variant_usbc_ec_tcpcs.c b/baseboard/octopus/variant_usbc_ec_tcpcs.c
index 2635850bd8..c9d191438a 100644
--- a/baseboard/octopus/variant_usbc_ec_tcpcs.c
+++ b/baseboard/octopus/variant_usbc_ec_tcpcs.c
@@ -17,7 +17,7 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "usb_mux.h"
 #include "usbc_ppc.h"
 #include "util.h"
diff --git a/baseboard/octopus/variant_usbc_standalone_tcpcs.c b/baseboard/octopus/variant_usbc_standalone_tcpcs.c
index e383c486c0..fb5d466e65 100644
--- a/baseboard/octopus/variant_usbc_standalone_tcpcs.c
+++ b/baseboard/octopus/variant_usbc_standalone_tcpcs.c
@@ -16,7 +16,7 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "usb_mux.h"
 #include "usbc_ppc.h"
 #include "util.h"
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c
index 5802efba9d..e6688e9ab5 100644
--- a/baseboard/zork/baseboard.c
+++ b/baseboard/zork/baseboard.c
@@ -38,7 +38,7 @@
 #include "switch.h"
 #include "system.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_mux.h"
diff --git a/board/ambassador/usb_pd_policy.c b/board/ambassador/usb_pd_policy.c
index a9122e507a..5bc754453a 100644
--- a/board/ambassador/usb_pd_policy.c
+++ b/board/ambassador/usb_pd_policy.c
@@ -12,7 +12,7 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
diff --git a/board/ampton/board.c b/board/ampton/board.c
index 3e5ab18510..9010ed05a8 100644
--- a/board/ampton/board.c
+++ b/board/ampton/board.c
@@ -33,7 +33,7 @@
 #include "switch.h"
 #include "system.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "uart.h"
diff --git a/board/atlas/usb_pd_policy.c b/board/atlas/usb_pd_policy.c
index cb9a460330..77a4941a9a 100644
--- a/board/atlas/usb_pd_policy.c
+++ b/board/atlas/usb_pd_policy.c
@@ -16,7 +16,7 @@
 #include "registers.h"
 #include "system.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "timer.h"
 #include "util.h"
 #include "usb_mux.h"
diff --git a/board/bloog/board.c b/board/bloog/board.c
index 2973b5c6dd..81e980a47f 100644
--- a/board/bloog/board.c
+++ b/board/bloog/board.c
@@ -34,7 +34,7 @@
 #include "switch.h"
 #include "system.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_mux.h"
diff --git a/board/bobba/board.c b/board/bobba/board.c
index 0317db2a0a..d2c4871b3e 100644
--- a/board/bobba/board.c
+++ b/board/bobba/board.c
@@ -41,7 +41,7 @@
 #include "switch.h"
 #include "system.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_charge.h"
diff --git a/board/boten/board.c b/board/boten/board.c
index c67259712c..9a43b1574e 100644
--- a/board/boten/board.c
+++ b/board/boten/board.c
@@ -31,7 +31,7 @@
 #include "system.h"
 #include "tablet_mode.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "uart.h"
 #include "usb_charge.h"
diff --git a/board/casta/board.c b/board/casta/board.c
index 4942a76f62..45054be092 100644
--- a/board/casta/board.c
+++ b/board/casta/board.c
@@ -31,7 +31,7 @@
 #include "power_button.h"
 #include "switch.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_mux.h"
diff --git a/board/dood/board.c b/board/dood/board.c
index eb87efe87e..eaf1e878bb 100644
--- a/board/dood/board.c
+++ b/board/dood/board.c
@@ -38,7 +38,7 @@
 #include "switch.h"
 #include "system.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_charge.h"
diff --git a/board/dooly/usb_pd_policy.c b/board/dooly/usb_pd_policy.c
index fb42e30ea2..a8d89130c2 100644
--- a/board/dooly/usb_pd_policy.c
+++ b/board/dooly/usb_pd_policy.c
@@ -12,7 +12,7 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
diff --git a/board/drawcia/board.c b/board/drawcia/board.c
index 77782bbad7..5d2577bf07 100644
--- a/board/drawcia/board.c
+++ b/board/drawcia/board.c
@@ -33,7 +33,7 @@
 #include "system.h"
 #include "tablet_mode.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "uart.h"
 #include "usb_charge.h"
diff --git a/board/fleex/board.c b/board/fleex/board.c
index 95d3f0fbdb..27ab124e07 100644
--- a/board/fleex/board.c
+++ b/board/fleex/board.c
@@ -36,7 +36,7 @@
 #include "system.h"
 #include "task.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_mux.h"
diff --git a/board/foob/board.c b/board/foob/board.c
index 87a5c656de..c4d2c84cdb 100644
--- a/board/foob/board.c
+++ b/board/foob/board.c
@@ -26,7 +26,7 @@
 #include "switch.h"
 #include "task.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "util.h"
diff --git a/board/galtic/board.c b/board/galtic/board.c
index 840169ba83..6e553176fd 100644
--- a/board/galtic/board.c
+++ b/board/galtic/board.c
@@ -33,7 +33,7 @@
 #include "system.h"
 #include "tablet_mode.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "uart.h"
 #include "usb_charge.h"
diff --git a/board/garg/board.c b/board/garg/board.c
index a91d0147e6..285266f66f 100644
--- a/board/garg/board.c
+++ b/board/garg/board.c
@@ -33,7 +33,7 @@
 #include "switch.h"
 #include "system.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_mux.h"
diff --git a/board/genesis/usb_pd_policy.c b/board/genesis/usb_pd_policy.c
index a9122e507a..5bc754453a 100644
--- a/board/genesis/usb_pd_policy.c
+++ b/board/genesis/usb_pd_policy.c
@@ -12,7 +12,7 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
diff --git a/board/glkrvp/chg_usb_pd.c b/board/glkrvp/chg_usb_pd.c
index f8e8520b72..aea6e3eac5 100644
--- a/board/glkrvp/chg_usb_pd.c
+++ b/board/glkrvp/chg_usb_pd.c
@@ -8,7 +8,7 @@
 #include "console.h"
 #include "hooks.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "system.h"
 #include "usb_mux.h"
 #include "util.h"
diff --git a/board/glkrvp_ite/chg_usb_pd.c b/board/glkrvp_ite/chg_usb_pd.c
index 7bc60fd5c8..67824fbf3c 100644
--- a/board/glkrvp_ite/chg_usb_pd.c
+++ b/board/glkrvp_ite/chg_usb_pd.c
@@ -8,7 +8,7 @@
 #include "console.h"
 #include "hooks.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "system.h"
 #include "usb_mux.h"
 #include "util.h"
diff --git a/board/lantis/board.c b/board/lantis/board.c
index cff3319bbd..ef6d3ea4bb 100644
--- a/board/lantis/board.c
+++ b/board/lantis/board.c
@@ -33,7 +33,7 @@
 #include "system.h"
 #include "tablet_mode.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "uart.h"
 #include "usb_charge.h"
diff --git a/board/lick/board.c b/board/lick/board.c
index 71512249be..c173f34e28 100644
--- a/board/lick/board.c
+++ b/board/lick/board.c
@@ -26,7 +26,7 @@
 #include "switch.h"
 #include "task.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "util.h"
diff --git a/board/meep/board.c b/board/meep/board.c
index 0577671755..a1d8d1e2c4 100644
--- a/board/meep/board.c
+++ b/board/meep/board.c
@@ -36,7 +36,7 @@
 #include "switch.h"
 #include "system.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_mux.h"
diff --git a/board/nocturne/board.c b/board/nocturne/board.c
index 6a45cabf4c..5987bae025 100644
--- a/board/nocturne/board.c
+++ b/board/nocturne/board.c
@@ -39,7 +39,7 @@
 #include "system_chip.h"
 #include "switch.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "usb_mux.h"
 #include "usb_pd_tcpm.h"
diff --git a/board/pdeval-stm32f072/board.c b/board/pdeval-stm32f072/board.c
index 93f3f87082..8c62c10b79 100644
--- a/board/pdeval-stm32f072/board.c
+++ b/board/pdeval-stm32f072/board.c
@@ -13,7 +13,7 @@
 #include "i2c.h"
 #include "registers.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "usb_descriptor.h"
 #include "usb_pd.h"
 #include "usb_pd_tcpm.h"
diff --git a/board/phaser/board.c b/board/phaser/board.c
index 219f5ad1b1..1f012f3efb 100644
--- a/board/phaser/board.c
+++ b/board/phaser/board.c
@@ -27,7 +27,7 @@
 #include "switch.h"
 #include "task.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usbc_ppc.h"
diff --git a/board/puff/usb_pd_policy.c b/board/puff/usb_pd_policy.c
index 623f4ba502..9b0a372400 100644
--- a/board/puff/usb_pd_policy.c
+++ b/board/puff/usb_pd_policy.c
@@ -12,7 +12,7 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "system.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
diff --git a/board/storo/board.c b/board/storo/board.c
index fa6e8b6aee..4af8575ca3 100644
--- a/board/storo/board.c
+++ b/board/storo/board.c
@@ -32,7 +32,7 @@
 #include "system.h"
 #include "tablet_mode.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "uart.h"
 #include "usb_charge.h"
diff --git a/board/waddledee/board.c b/board/waddledee/board.c
index 8b5276b0df..6541692195 100644
--- a/board/waddledee/board.c
+++ b/board/waddledee/board.c
@@ -32,7 +32,7 @@
 #include "system.h"
 #include "tablet_mode.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "uart.h"
 #include "usb_charge.h"
diff --git a/board/wheelie/board.c b/board/wheelie/board.c
index 8c1e9b3def..71ceab13b5 100644
--- a/board/wheelie/board.c
+++ b/board/wheelie/board.c
@@ -32,7 +32,7 @@
 #include "switch.h"
 #include "tablet_mode.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "uart.h"
 #include "usb_charge.h"
diff --git a/board/yorp/board.c b/board/yorp/board.c
index 1d4597311a..0e8bd8aa54 100644
--- a/board/yorp/board.c
+++ b/board/yorp/board.c
@@ -32,7 +32,7 @@
 #include "switch.h"
 #include "system.h"
 #include "tablet_mode.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "temp_sensor.h"
 #include "thermistor.h"
 #include "usb_mux.h"
diff --git a/common/mock/tcpci_i2c_mock.c b/common/mock/tcpci_i2c_mock.c
index a320e3f9b1..7cf213533c 100644
--- a/common/mock/tcpci_i2c_mock.c
+++ b/common/mock/tcpci_i2c_mock.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 
diff --git a/common/usb_pd_protocol.c b/common/usb_pd_protocol.c
index b10d0e0c11..c186696d4c 100644
--- a/common/usb_pd_protocol.c
+++ b/common/usb_pd_protocol.c
@@ -20,7 +20,7 @@
 #include "registers.h"
 #include "system.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "util.h"
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c
index 813572e6a6..118c11f1e6 100644
--- a/common/usb_pd_tcpc.c
+++ b/common/usb_pd_tcpc.c
@@ -15,7 +15,7 @@
 #include "registers.h"
 #include "system.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "util.h"
diff --git a/driver/ioexpander/ioexpander_nct38xx.c b/driver/ioexpander/ioexpander_nct38xx.c
index ae7957e013..7472bf0162 100644
--- a/driver/ioexpander/ioexpander_nct38xx.c
+++ b/driver/ioexpander/ioexpander_nct38xx.c
@@ -11,7 +11,7 @@
 #include "i2c.h"
 #include "ioexpander.h"
 #include "nct38xx.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 
 #define CPRINTF(format, args...) cprintf(CC_GPIO, format, ## args)
 #define CPRINTS(format, args...) cprints(CC_GPIO, format, ## args)
diff --git a/driver/tcpm/anx7447.c b/driver/tcpm/anx7447.c
index 17c35c3564..3fbafbf8da 100644
--- a/driver/tcpm/anx7447.c
+++ b/driver/tcpm/anx7447.c
@@ -9,7 +9,7 @@
 #include "anx7447.h"
 #include "console.h"
 #include "hooks.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "usb_mux.h"
diff --git a/driver/tcpm/anx74xx.c b/driver/tcpm/anx74xx.c
index c5758272b9..c6cd1b9d6e 100644
--- a/driver/tcpm/anx74xx.c
+++ b/driver/tcpm/anx74xx.c
@@ -10,7 +10,7 @@
 #include "console.h"
 #include "anx74xx.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "usb_charge.h"
diff --git a/driver/tcpm/anx7688.c b/driver/tcpm/anx7688.c
index 15688e7012..1fa18f6b8b 100644
--- a/driver/tcpm/anx7688.c
+++ b/driver/tcpm/anx7688.c
@@ -6,7 +6,7 @@
 /* ANX7688 port manager */
 
 #include "hooks.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.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 febd08378a..93c9435a0d 100644
--- a/driver/tcpm/fusb302.c
+++ b/driver/tcpm/fusb302.c
@@ -11,7 +11,7 @@
 #include "fusb302.h"
 #include "task.h"
 #include "hooks.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "usb_charge.h"
diff --git a/driver/tcpm/fusb307.c b/driver/tcpm/fusb307.c
index 9a92172f32..6001b717e2 100644
--- a/driver/tcpm/fusb307.c
+++ b/driver/tcpm/fusb307.c
@@ -9,7 +9,7 @@
 #include "fusb307.h"
 #include "hooks.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "util.h"
diff --git a/driver/tcpm/it83xx.c b/driver/tcpm/it83xx.c
index 6affdddfdf..c618c00fe8 100644
--- a/driver/tcpm/it83xx.c
+++ b/driver/tcpm/it83xx.c
@@ -12,7 +12,7 @@
 #include "registers.h"
 #include "system.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "timer.h"
 #include "util.h"
 #include "usb_pd.h"
diff --git a/driver/tcpm/mt6370.c b/driver/tcpm/mt6370.c
index a5da3e5032..3716cc28ea 100644
--- a/driver/tcpm/mt6370.c
+++ b/driver/tcpm/mt6370.c
@@ -9,7 +9,7 @@
 #include "hooks.h"
 #include "mt6370.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "usb_mux.h"
diff --git a/driver/tcpm/nct38xx.c b/driver/tcpm/nct38xx.c
index 517c1f23db..f700d880e7 100644
--- a/driver/tcpm/nct38xx.c
+++ b/driver/tcpm/nct38xx.c
@@ -11,7 +11,7 @@
 #include "hooks.h"
 #include "nct38xx.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "usb_common.h"
 
 #if !defined(CONFIG_USB_PD_TCPM_TCPCI)
diff --git a/driver/tcpm/ps8xxx.c b/driver/tcpm/ps8xxx.c
index 3c1a731961..429187dfd0 100644
--- a/driver/tcpm/ps8xxx.c
+++ b/driver/tcpm/ps8xxx.c
@@ -17,7 +17,7 @@
 #include "common.h"
 #include "console.h"
 #include "ps8xxx.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "usb_mux.h"
diff --git a/driver/tcpm/raa489000.c b/driver/tcpm/raa489000.c
index 0aa03c5451..73f709bcf7 100644
--- a/driver/tcpm/raa489000.c
+++ b/driver/tcpm/raa489000.c
@@ -11,7 +11,7 @@
 #include "driver/charger/isl923x.h"
 #include "i2c.h"
 #include "raa489000.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 
 #define DEFAULT_R_AC 20
diff --git a/driver/tcpm/rt1715.c b/driver/tcpm/rt1715.c
index 5cd258cbc8..33f4f244ae 100644
--- a/driver/tcpm/rt1715.c
+++ b/driver/tcpm/rt1715.c
@@ -7,7 +7,7 @@
 
 #include "common.h"
 #include "rt1715.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "usb_pd.h"
diff --git a/driver/tcpm/stm32gx.c b/driver/tcpm/stm32gx.c
index 5b20d1f24f..790b373925 100644
--- a/driver/tcpm/stm32gx.c
+++ b/driver/tcpm/stm32gx.c
@@ -13,7 +13,7 @@
 #include "stm32gx.h"
 #include "system.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "timer.h"
 #include "util.h"
 #include "usb_pd.h"
diff --git a/driver/tcpm/stub.c b/driver/tcpm/stub.c
index db2b272048..352124e5dc 100644
--- a/driver/tcpm/stub.c
+++ b/driver/tcpm/stub.c
@@ -6,7 +6,7 @@
 /* TCPM for MCU also running TCPC */
 
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "usb_pd.h"
 #include "usb_pd_tcpc.h"
diff --git a/driver/tcpm/tcpci.c b/driver/tcpm/tcpci.c
index 7d138726af..ba313350e9 100644
--- a/driver/tcpm/tcpci.c
+++ b/driver/tcpm/tcpci.c
@@ -12,7 +12,7 @@
 #include "ec_commands.h"
 #include "ps8xxx.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "usb_charge.h"
diff --git a/driver/tcpm/tusb422.c b/driver/tcpm/tusb422.c
index a990589f38..c28cf48858 100644
--- a/driver/tcpm/tusb422.c
+++ b/driver/tcpm/tusb422.c
@@ -7,7 +7,7 @@
 
 #include "common.h"
 #include "tusb422.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "timer.h"
 #include "usb_pd.h"
diff --git a/driver/tcpm/tcpci.h b/include/driver/tcpm/tcpci.h
index 44af755c8b..44af755c8b 100644
--- a/driver/tcpm/tcpci.h
+++ b/include/driver/tcpm/tcpci.h
diff --git a/test/usb_prl.c b/test/usb_prl.c
index 96bd045949..42bbac4b6d 100644
--- a/test/usb_prl.c
+++ b/test/usb_prl.c
@@ -10,7 +10,7 @@
 #include "mock/usb_pe_sm_mock.h"
 #include "mock/usb_tc_sm_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "tcpm/tcpm.h"
 #include "test_util.h"
 #include "timer.h"
diff --git a/test/usb_tcpmv2_compliance_common.c b/test/usb_tcpmv2_compliance_common.c
index 5add250e9f..50ebd36aaa 100644
--- a/test/usb_tcpmv2_compliance_common.c
+++ b/test/usb_tcpmv2_compliance_common.c
@@ -7,7 +7,7 @@
 #include "mock/tcpci_i2c_mock.h"
 #include "mock/usb_mux_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_ll_e3.c b/test/usb_tcpmv2_td_pd_ll_e3.c
index 8989d8a9c7..153f32dc4f 100644
--- a/test/usb_tcpmv2_td_pd_ll_e3.c
+++ b/test/usb_tcpmv2_td_pd_ll_e3.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_ll_e4.c b/test/usb_tcpmv2_td_pd_ll_e4.c
index caf08a04df..24f4af862c 100644
--- a/test/usb_tcpmv2_td_pd_ll_e4.c
+++ b/test/usb_tcpmv2_td_pd_ll_e4.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_ll_e5.c b/test/usb_tcpmv2_td_pd_ll_e5.c
index 31664634b2..991b044636 100644
--- a/test/usb_tcpmv2_td_pd_ll_e5.c
+++ b/test/usb_tcpmv2_td_pd_ll_e5.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_other.c b/test/usb_tcpmv2_td_pd_other.c
index 1b2486b6f2..17829030ea 100644
--- a/test/usb_tcpmv2_td_pd_other.c
+++ b/test/usb_tcpmv2_td_pd_other.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_snk3_e12.c b/test/usb_tcpmv2_td_pd_snk3_e12.c
index e712e0d209..a55438d49a 100644
--- a/test/usb_tcpmv2_td_pd_snk3_e12.c
+++ b/test/usb_tcpmv2_td_pd_snk3_e12.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_src3_e1.c b/test/usb_tcpmv2_td_pd_src3_e1.c
index 8e2cb3721e..2f9184f089 100644
--- a/test/usb_tcpmv2_td_pd_src3_e1.c
+++ b/test/usb_tcpmv2_td_pd_src3_e1.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_src3_e26.c b/test/usb_tcpmv2_td_pd_src3_e26.c
index 48b6284dc2..5e899ef9b6 100644
--- a/test/usb_tcpmv2_td_pd_src3_e26.c
+++ b/test/usb_tcpmv2_td_pd_src3_e26.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_src_e1.c b/test/usb_tcpmv2_td_pd_src_e1.c
index 06ca702b79..90204a6106 100644
--- a/test/usb_tcpmv2_td_pd_src_e1.c
+++ b/test/usb_tcpmv2_td_pd_src_e1.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_src_e2.c b/test/usb_tcpmv2_td_pd_src_e2.c
index 69b47023ce..c4a1d7780b 100644
--- a/test/usb_tcpmv2_td_pd_src_e2.c
+++ b/test/usb_tcpmv2_td_pd_src_e2.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"
diff --git a/test/usb_tcpmv2_td_pd_src_e5.c b/test/usb_tcpmv2_td_pd_src_e5.c
index 62c316ba9d..3da7c843b2 100644
--- a/test/usb_tcpmv2_td_pd_src_e5.c
+++ b/test/usb_tcpmv2_td_pd_src_e5.c
@@ -5,7 +5,7 @@
 
 #include "mock/tcpci_i2c_mock.h"
 #include "task.h"
-#include "tcpci.h"
+#include "tcpm/tcpci.h"
 #include "test_util.h"
 #include "timer.h"
 #include "usb_tcpmv2_compliance.h"