cleanup: Segregate USB MUX related drivers in usb_mux folder

BUG=none
BRANCH=none
TEST=make buildall -j

Change-Id: If44a363d1288cbfabe5c6545e550f2b8fc623227
Signed-off-by: Vijay Hiremath <vijay.p.hiremath@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1700793
Reviewed-by: Jett Rink <jettrink@chromium.org>

13 files changed, 17 insertions, 17 deletions

diff --git a/baseboard/octopus/variant_usbc_ec_tcpcs.c b/baseboard/octopus/variant_usbc_ec_tcpcs.c
index 2d50402924..afea880075 100644
--- a/baseboard/octopus/variant_usbc_ec_tcpcs.c
+++ b/baseboard/octopus/variant_usbc_ec_tcpcs.c
@@ -10,7 +10,7 @@
 #include "console.h"
 #include "driver/ppc/sn5s330.h"
 #include "driver/tcpm/it83xx_pd.h"
-#include "driver/usb_mux_it5205.h"
+#include "driver/usb_mux/it5205.h"
 #include "driver/tcpm/ps8xxx.h"
 #include "driver/tcpm/tcpci.h"
 #include "driver/tcpm/tcpm.h"
diff --git a/board/ampton/board.c b/board/ampton/board.c
index 08cb017489..9a9ed5c3c7 100644
--- a/board/ampton/board.c
+++ b/board/ampton/board.c
@@ -17,7 +17,7 @@
 #include "driver/sync.h"
 #include "driver/tcpm/it83xx_pd.h"
 #include "driver/tcpm/ps8xxx.h"
-#include "driver/usb_mux_it5205.h"
+#include "driver/usb_mux/it5205.h"
 #include "extpower.h"
 #include "gpio.h"
 #include "hooks.h"
diff --git a/board/chell/board.c b/board/chell/board.c
index 2ab6b556d2..6311dc6c9c 100644
--- a/board/chell/board.c
+++ b/board/chell/board.c
@@ -34,7 +34,7 @@
 #include "uart.h"
 #include "usb_charge.h"
 #include "usb_mux.h"
-#include "usb_mux_ps874x.h"
+#include "usb_mux/ps874x.h"
 #include "usb_pd.h"
 #include "usb_pd_tcpm.h"
 #include "util.h"
diff --git a/driver/build.mk b/driver/build.mk
index 1c0cff744d..8b5a26a2db 100644
--- a/driver/build.mk
+++ b/driver/build.mk
@@ -130,14 +130,14 @@ driver-$(CONFIG_USB_PD_TCPM_NCT38XX)+=tcpm/nct38xx.o
 driver-$(CONFIG_USB_PD_RETIMER_INTEL_BB)+=retimer/bb_retimer.o
 
 # USB mux high-level driver
-driver-$(CONFIG_USBC_SS_MUX)+=usb_mux.o
+driver-$(CONFIG_USBC_SS_MUX)+=usb_mux/usb_mux.o
 
 # USB muxes
-driver-$(CONFIG_USB_MUX_IT5205)+=usb_mux_it5205.o
-driver-$(CONFIG_USB_MUX_PI3USB30532)+=usb_mux_pi3usb30532.o
-driver-$(CONFIG_USB_MUX_PS8740)+=usb_mux_ps874x.o
-driver-$(CONFIG_USB_MUX_PS8743)+=usb_mux_ps874x.o
-driver-$(CONFIG_USB_MUX_VIRTUAL)+=usb_mux_virtual.o
+driver-$(CONFIG_USB_MUX_IT5205)+=usb_mux/it5205.o
+driver-$(CONFIG_USB_MUX_PI3USB30532)+=usb_mux/pi3usb30532.o
+driver-$(CONFIG_USB_MUX_PS8740)+=usb_mux/ps874x.o
+driver-$(CONFIG_USB_MUX_PS8743)+=usb_mux/ps874x.o
+driver-$(CONFIG_USB_MUX_VIRTUAL)+=usb_mux/virtual.o
 
 # Type-C Power Path Controllers (PPC)
 driver-$(CONFIG_USBC_PPC_SN5S330)+=ppc/sn5s330.o
diff --git a/driver/usb_mux_it5205.c b/driver/usb_mux/it5205.c
index 4c2f274c88..9a6f71dade 100644
--- a/driver/usb_mux_it5205.c
+++ b/driver/usb_mux/it5205.c
@@ -8,8 +8,8 @@
 #include "common.h"
 #include "console.h"
 #include "i2c.h"
+#include "it5205.h"
 #include "usb_mux.h"
-#include "usb_mux_it5205.h"
 #include "util.h"
 
 #define MUX_STATE_DP_USB_MASK (MUX_USB_ENABLED | MUX_DP_ENABLED)
diff --git a/driver/usb_mux_it5205.h b/driver/usb_mux/it5205.h
index dbc30466d6..b81b33cac3 100644
--- a/driver/usb_mux_it5205.h
+++ b/driver/usb_mux/it5205.h
@@ -5,8 +5,8 @@
  * ITE IT5205 Type-C USB alternate mode mux.
  */
 
-#ifndef __CROS_EC_USB_MUX_IT5205_H
-#define __CROS_EC_USB_MUX_IT5205_H
+#ifndef __CROS_EC_IT5205_H
+#define __CROS_EC_IT5205_H
 
 /* I2C interface */
 #define IT5205_I2C_ADDR1 (0x48 << 1)
@@ -31,4 +31,4 @@
 #define IT5205_DP_USB            0x03
 #define IT5205_USB               0x07
 
-#endif /* __CROS_EC_USB_MUX_IT5205_H */
+#endif /* __CROS_EC_IT5205_H */
diff --git a/driver/usb_mux_pi3usb30532.c b/driver/usb_mux/pi3usb30532.c
index 54d6f49fe7..54d6f49fe7 100644
--- a/driver/usb_mux_pi3usb30532.c
+++ b/driver/usb_mux/pi3usb30532.c
diff --git a/driver/pi3usb30532.h b/driver/usb_mux/pi3usb30532.h
index 7f120a9f85..7f120a9f85 100644
--- a/driver/pi3usb30532.h
+++ b/driver/usb_mux/pi3usb30532.h
diff --git a/driver/pi3usb9281.h b/driver/usb_mux/pi3usb9281.h
index 69b671500e..69b671500e 100644
--- a/driver/pi3usb9281.h
+++ b/driver/usb_mux/pi3usb9281.h
diff --git a/driver/usb_mux_ps874x.c b/driver/usb_mux/ps874x.c
index b560329c2a..bf00553d28 100644
--- a/driver/usb_mux_ps874x.c
+++ b/driver/usb_mux/ps874x.c
@@ -7,7 +7,7 @@
 
 #include "common.h"
 #include "i2c.h"
-#include "usb_mux_ps874x.h"
+#include "ps874x.h"
 #include "usb_mux.h"
 #include "util.h"
 
diff --git a/driver/usb_mux_ps874x.h b/driver/usb_mux/ps874x.h
index 2b98ebcb63..e7bd185bcf 100644
--- a/driver/usb_mux_ps874x.h
+++ b/driver/usb_mux/ps874x.h
@@ -5,8 +5,8 @@
  * Parade PS874X USB Type-C Redriving Switch for USB Host / DisplayPort.
  */
 
-#ifndef __CROS_EC_USB_MUX_PS874X_H
-#define __CROS_EC_USB_MUX_PS874X_H
+#ifndef __CROS_EC_PS874X_H
+#define __CROS_EC_PS874X_H
 
 /* Mode register for setting mux */
 #define PS874X_REG_MODE 0x00
@@ -111,4 +111,4 @@
 
 int ps874x_tune_usb_eq(int i2c_addr, uint8_t tx, uint8_t rx);
 
-#endif /* __CROS_EC_USB_MUX_PS874X_H */
+#endif /* __CROS_EC_PS874X_H */
diff --git a/driver/usb_mux.c b/driver/usb_mux/usb_mux.c
index 43ebd9841a..43ebd9841a 100644
--- a/driver/usb_mux.c
+++ b/driver/usb_mux/usb_mux.c
diff --git a/driver/usb_mux_virtual.c b/driver/usb_mux/virtual.c
index e20e0a2ef7..e20e0a2ef7 100644
--- a/driver/usb_mux_virtual.c
+++ b/driver/usb_mux/virtual.c