power: move headers to include/power

This makes the headers visible to the Zephyr build.

BUG=b:173798264
BRANCH=none
TEST=buildall

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I3b6d27c1234b3924ee8902a86eec5fdb2ccd9998
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2571897
Reviewed-by: Jett Rink <jettrink@chromium.org>
Reviewed-by: Keith Short <keithshort@chromium.org>

22 files changed, 16 insertions, 16 deletions

diff --git a/baseboard/dedede/baseboard.c b/baseboard/dedede/baseboard.c
index 642133373e..5569dd93c3 100644
--- a/baseboard/dedede/baseboard.c
+++ b/baseboard/dedede/baseboard.c
@@ -14,7 +14,7 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "host_command.h"
-#include "intel_x86.h"
+#include "power/intel_x86.h"
 #include "system.h"
 #include "usb_pd.h"
 
diff --git a/baseboard/dragonegg/baseboard.c b/baseboard/dragonegg/baseboard.c
index 5841bef1b1..3e70f7615c 100644
--- a/baseboard/dragonegg/baseboard.c
+++ b/baseboard/dragonegg/baseboard.c
@@ -21,9 +21,9 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c.h"
-#include "icelake.h"
 #include "keyboard_scan.h"
 #include "power.h"
+#include "power/icelake.h"
 #include "timer.h"
 #include "util.h"
 #include "tcpci.h"
diff --git a/baseboard/volteer/baseboard.c b/baseboard/volteer/baseboard.c
index f42bcba930..be15e108a5 100644
--- a/baseboard/volteer/baseboard.c
+++ b/baseboard/volteer/baseboard.c
@@ -17,8 +17,8 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c.h"
-#include "icelake.h"
 #include "keyboard_scan.h"
+#include "power/icelake.h"
 #include "system.h"
 #include "task.h"
 #include "temp_sensor.h"
diff --git a/board/adlrvpp_ite/board.c b/board/adlrvpp_ite/board.c
index b0b9c7789c..c9fe6db0ce 100644
--- a/board/adlrvpp_ite/board.c
+++ b/board/adlrvpp_ite/board.c
@@ -14,12 +14,12 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "i2c.h"
-#include "icelake.h"
 #include "isl9241.h"
 #include "it83xx_pd.h"
 #include "lid_switch.h"
 #include "pca9675.h"
 #include "power.h"
+#include "power/icelake.h"
 #include "power_button.h"
 #include "pwm.h"
 #include "pwm_chip.h"
diff --git a/board/jslrvp_ite/board.c b/board/jslrvp_ite/board.c
index c84b2cf38c..eb654140a6 100644
--- a/board/jslrvp_ite/board.c
+++ b/board/jslrvp_ite/board.c
@@ -11,11 +11,11 @@
 #include "driver/charger/isl923x.h"
 #include "extpower.h"
 #include "i2c.h"
-#include "icelake.h"
 #include "intc.h"
 #include "it83xx_pd.h"
 #include "lid_switch.h"
 #include "power.h"
+#include "power/icelake.h"
 #include "power_button.h"
 #include "switch.h"
 #include "system.h"
diff --git a/board/tglrvpu_ite/board.c b/board/tglrvpu_ite/board.c
index 3a548b78b2..97ecf7c89f 100644
--- a/board/tglrvpu_ite/board.c
+++ b/board/tglrvpu_ite/board.c
@@ -11,11 +11,11 @@
 #include "driver/charger/isl9241.h"
 #include "extpower.h"
 #include "i2c.h"
-#include "icelake.h"
 #include "intc.h"
 #include "it83xx_pd.h"
 #include "lid_switch.h"
 #include "power.h"
+#include "power/icelake.h"
 #include "power_button.h"
 #include "switch.h"
 #include "system.h"
diff --git a/driver/bc12/max14637.c b/driver/bc12/max14637.c
index 91b5441a68..d1c640a0f6 100644
--- a/driver/bc12/max14637.c
+++ b/driver/bc12/max14637.c
@@ -13,7 +13,6 @@
  */
 
 #include "max14637.h"
-#include "cannonlake.h"
 #include "charge_manager.h"
 #include "chipset.h"
 #include "common.h"
@@ -21,6 +20,7 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "power.h"
+#include "power/cannonlake.h"
 #include "task.h"
 #include "tcpm.h"
 #include "timer.h"
diff --git a/power/apollolake.h b/include/power/apollolake.h
index cc864f26c3..cc864f26c3 100644
--- a/power/apollolake.h
+++ b/include/power/apollolake.h
diff --git a/power/cannonlake.h b/include/power/cannonlake.h
index a056a96ec8..a056a96ec8 100644
--- a/power/cannonlake.h
+++ b/include/power/cannonlake.h
diff --git a/power/cometlake-discrete.h b/include/power/cometlake-discrete.h
index 6f5370beee..6f5370beee 100644
--- a/power/cometlake-discrete.h
+++ b/include/power/cometlake-discrete.h
diff --git a/power/cometlake.h b/include/power/cometlake.h
index 8e0aab6982..8e0aab6982 100644
--- a/power/cometlake.h
+++ b/include/power/cometlake.h
diff --git a/power/icelake.h b/include/power/icelake.h
index 08c14718ec..08c14718ec 100644
--- a/power/icelake.h
+++ b/include/power/icelake.h
diff --git a/power/intel_x86.h b/include/power/intel_x86.h
index d50d6a75da..d50d6a75da 100644
--- a/power/intel_x86.h
+++ b/include/power/intel_x86.h
diff --git a/power/skylake.h b/include/power/skylake.h
index c8a656c6c5..c8a656c6c5 100644
--- a/power/skylake.h
+++ b/include/power/skylake.h
diff --git a/power/apollolake.c b/power/apollolake.c
index 36c78c8158..2aaf7fc533 100644
--- a/power/apollolake.c
+++ b/power/apollolake.c
@@ -8,7 +8,7 @@
 #include "chipset.h"
 #include "console.h"
 #include "gpio.h"
-#include "intel_x86.h"
+#include "power/intel_x86.h"
 #include "task.h"
 #include "timer.h"
 
diff --git a/power/cannonlake.c b/power/cannonlake.c
index 1822b1d3c2..392db669df 100644
--- a/power/cannonlake.c
+++ b/power/cannonlake.c
@@ -5,12 +5,12 @@
 
 /* Cannonlake chipset power control module for Chrome EC */
 
-#include "cannonlake.h"
 #include "chipset.h"
 #include "console.h"
 #include "gpio.h"
-#include "intel_x86.h"
 #include "power.h"
+#include "power/cannonlake.h"
+#include "power/intel_x86.h"
 #include "power_button.h"
 #include "task.h"
 #include "timer.h"
diff --git a/power/cometlake-discrete.c b/power/cometlake-discrete.c
index 0cdf8b2d5f..a22e32a69f 100644
--- a/power/cometlake-discrete.c
+++ b/power/cometlake-discrete.c
@@ -12,8 +12,8 @@
 #include "chipset.h"
 #include "console.h"
 #include "gpio.h"
-#include "intel_x86.h"
 #include "power.h"
+#include "power/intel_x86.h"
 #include "power_button.h"
 #include "task.h"
 #include "timer.h"
diff --git a/power/cometlake.c b/power/cometlake.c
index 8328696751..1b73bcc296 100644
--- a/power/cometlake.c
+++ b/power/cometlake.c
@@ -8,8 +8,8 @@
 #include "chipset.h"
 #include "console.h"
 #include "gpio.h"
-#include "intel_x86.h"
 #include "power.h"
+#include "power/intel_x86.h"
 #include "power_button.h"
 #include "task.h"
 #include "timer.h"
diff --git a/power/common.c b/power/common.c
index f5091d795c..ea6190d523 100644
--- a/power/common.c
+++ b/power/common.c
@@ -16,9 +16,9 @@
 #include "gpio.h"
 #include "hooks.h"
 #include "host_command.h"
-#include "intel_x86.h"
 #include "lpc.h"
 #include "power.h"
+#include "power/intel_x86.h"
 #include "system.h"
 #include "task.h"
 #include "timer.h"
diff --git a/power/icelake.c b/power/icelake.c
index 7f91e48006..3d1242b9a0 100644
--- a/power/icelake.c
+++ b/power/icelake.c
@@ -10,8 +10,8 @@
 #include "console.h"
 #include "gpio.h"
 #include "hooks.h"
-#include "intel_x86.h"
 #include "power.h"
+#include "power/intel_x86.h"
 #include "power_button.h"
 #include "task.h"
 #include "timer.h"
diff --git a/power/intel_x86.c b/power/intel_x86.c
index 893e9fbf4e..6c0cd6a920 100644
--- a/power/intel_x86.c
+++ b/power/intel_x86.c
@@ -12,9 +12,9 @@
 #include "ec_commands.h"
 #include "gpio.h"
 #include "hooks.h"
-#include "intel_x86.h"
 #include "lpc.h"
 #include "power.h"
+#include "power/intel_x86.h"
 #include "power_button.h"
 #include "system.h"
 #include "task.h"
diff --git a/power/skylake.c b/power/skylake.c
index 829a0fa370..a4cb649fd5 100644
--- a/power/skylake.c
+++ b/power/skylake.c
@@ -9,9 +9,9 @@
 #include "console.h"
 #include "gpio.h"
 #include "hooks.h"
-#include "intel_x86.h"
 #include "lpc.h"
 #include "panic.h"
+#include "power/intel_x86.h"
 #include "power_button.h"
 #include "system.h"
 #include "timer.h"