cleanup: Segregate ioexpander related drivers in ioexpander folder

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

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

16 files changed, 12 insertions, 12 deletions

diff --git a/baseboard/intelrvp/baseboard.c b/baseboard/intelrvp/baseboard.c
index a84b9f2b10..50aa4d83db 100644
--- a/baseboard/intelrvp/baseboard.c
+++ b/baseboard/intelrvp/baseboard.c
@@ -10,7 +10,7 @@
 #include "espi.h"
 #include "fan.h"
 #include "hooks.h"
-#include "ioexpander_pca9555.h"
+#include "pca9555.h"
 #include "peci.h"
 #include "power.h"
 #include "temp_sensor.h"
diff --git a/board/glkrvp/battery.c b/board/glkrvp/battery.c
index 8f0ff23d14..cccf3c1016 100644
--- a/board/glkrvp/battery.c
+++ b/board/glkrvp/battery.c
@@ -8,7 +8,7 @@
 #include "battery.h"
 #include "charger_profile_override.h"
 #include "console.h"
-#include "ioexpander_pca9555.h"
+#include "pca9555.h"
 #include "util.h"
 
 #define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
diff --git a/board/glkrvp/board.c b/board/glkrvp/board.c
index c8a723ba45..8ab22336ce 100644
--- a/board/glkrvp/board.c
+++ b/board/glkrvp/board.c
@@ -13,9 +13,9 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "i2c.h"
-#include "ioexpander_pca9555.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "pca9555.h"
 #include "power.h"
 #include "power_button.h"
 #include "spi.h"
diff --git a/board/glkrvp_ite/battery.c b/board/glkrvp_ite/battery.c
index f8665e2b58..b2dc6a11c8 100644
--- a/board/glkrvp_ite/battery.c
+++ b/board/glkrvp_ite/battery.c
@@ -8,7 +8,7 @@
 #include "battery.h"
 #include "charger_profile_override.h"
 #include "console.h"
-#include "ioexpander_pca9555.h"
+#include "pca9555.h"
 #include "util.h"
 
 #define CPRINTS(format, args...) cprints(CC_CHARGER, format, ## args)
diff --git a/board/glkrvp_ite/board.c b/board/glkrvp_ite/board.c
index 33d98477bf..64f067527d 100644
--- a/board/glkrvp_ite/board.c
+++ b/board/glkrvp_ite/board.c
@@ -14,10 +14,10 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "i2c.h"
-#include "ioexpander_pca9555.h"
 #include "intc.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
+#include "pca9555.h"
 #include "power.h"
 #include "power_button.h"
 #include "spi.h"
diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c
index 3b81029f73..f0cb4d9ddf 100644
--- a/board/jacuzzi/board.c
+++ b/board/jacuzzi/board.c
@@ -18,7 +18,6 @@
 #include "driver/battery/max17055.h"
 #include "driver/bc12/pi3usb9201.h"
 #include "driver/charger/isl923x.h"
-#include "driver/ioexpander_it8801.h"
 #include "driver/sync.h"
 #include "driver/tcpm/fusb302.h"
 #include "driver/usb_mux/it5205.h"
@@ -28,6 +27,7 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "i2c.h"
+#include "it8801.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
 #include "power.h"
diff --git a/board/plankton/board.c b/board/plankton/board.c
index 3f8e718f0e..551642fae0 100644
--- a/board/plankton/board.c
+++ b/board/plankton/board.c
@@ -12,7 +12,7 @@
 #include "hooks.h"
 #include "i2c.h"
 #include "ina2xx.h"
-#include "ioexpander_pca9534.h"
+#include "pca9534.h"
 #include "registers.h"
 #include "system.h"
 #include "task.h"
diff --git a/driver/build.mk b/driver/build.mk
index 27daf6bb3f..020ee211a7 100644
--- a/driver/build.mk
+++ b/driver/build.mk
@@ -79,9 +79,9 @@ driver-$(CONFIG_CHARGER_SY21612)+=charger/sy21612.o
 include $(_driver_cur_dir)fingerprint/build.mk
 
 # I/O expander
-driver-$(CONFIG_IO_EXPANDER_IT8801)+=ioexpander_it8801.o
-driver-$(CONFIG_IO_EXPANDER_PCA9534)+=ioexpander_pca9534.o
-driver-$(CONFIG_IO_EXPANDER_NCT38XX)+=ioexpander_nct38xx.o
+driver-$(CONFIG_IO_EXPANDER_IT8801)+=ioexpander/it8801.o
+driver-$(CONFIG_IO_EXPANDER_PCA9534)+=ioexpander/pca9534.o
+driver-$(CONFIG_IO_EXPANDER_NCT38XX)+=ioexpander/ioexpander_nct38xx.o
 
 
 # Current/Power monitor
diff --git a/driver/ioexpander_nct38xx.c b/driver/ioexpander/ioexpander_nct38xx.c
index e7fe3d9453..e7fe3d9453 100644
--- a/driver/ioexpander_nct38xx.c
+++ b/driver/ioexpander/ioexpander_nct38xx.c
diff --git a/driver/ioexpander_nct38xx.h b/driver/ioexpander/ioexpander_nct38xx.h
index 56dfe76e04..56dfe76e04 100644
--- a/driver/ioexpander_nct38xx.h
+++ b/driver/ioexpander/ioexpander_nct38xx.h
diff --git a/driver/ioexpander_it8300.h b/driver/ioexpander/it8300.h
index 2b47e7f3e1..2b47e7f3e1 100644
--- a/driver/ioexpander_it8300.h
+++ b/driver/ioexpander/it8300.h
diff --git a/driver/ioexpander_it8801.c b/driver/ioexpander/it8801.c
index 64ef3628ed..6b1184c740 100644
--- a/driver/ioexpander_it8801.c
+++ b/driver/ioexpander/it8801.c
@@ -5,10 +5,10 @@
 
 #include "common.h"
 #include "console.h"
-#include "driver/ioexpander_it8801.h"
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c.h"
+#include "it8801.h"
 #include "keyboard_raw.h"
 #include "keyboard_scan.h"
 #include "registers.h"
diff --git a/driver/ioexpander_it8801.h b/driver/ioexpander/it8801.h
index 9b84adf764..9b84adf764 100644
--- a/driver/ioexpander_it8801.h
+++ b/driver/ioexpander/it8801.h
diff --git a/driver/ioexpander_pca9534.c b/driver/ioexpander/pca9534.c
index 44bf59e424..d56eb864cb 100644
--- a/driver/ioexpander_pca9534.c
+++ b/driver/ioexpander/pca9534.c
@@ -6,7 +6,7 @@
  */
 
 #include "i2c.h"
-#include "ioexpander_pca9534.h"
+#include "pca9534.h"
 
 static int pca9534_pin_read(const int port, const uint16_t addr_flags,
 			    int reg, int pin, int *val)
diff --git a/driver/ioexpander_pca9534.h b/driver/ioexpander/pca9534.h
index 0fec577576..0fec577576 100644
--- a/driver/ioexpander_pca9534.h
+++ b/driver/ioexpander/pca9534.h
diff --git a/driver/ioexpander_pca9555.h b/driver/ioexpander/pca9555.h
index 273f898821..273f898821 100644
--- a/driver/ioexpander_pca9555.h
+++ b/driver/ioexpander/pca9555.h