cleanup: Rename and move header files

Device-specific headers belong in driver/ or chip/.  The include/
directory should be for common interfaces.

Code should not normally need to include driver-specific headers.  If
it does, it should use the full relative path from the EC project root
(for example, drivers/charger/bq24715.h).

Change-Id: Id23db37a431e2d802a74ec601db6f69b613352ba
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/173746
Reviewed-by: Bill Richardson <wfrichar@chromium.org>

11 files changed, 26 insertions, 35 deletions

diff --git a/board/bds/board.c b/board/bds/board.c
index a9c9a16df6..e23b17c33a 100644
--- a/board/bds/board.c
+++ b/board/bds/board.c
@@ -5,9 +5,9 @@
 /* Stellaris EKB-LM4F-EAC board-specific configuration */
 
 #include "adc.h"
+#include "adc_chip.h"
 #include "gpio.h"
 #include "i2c.h"
-#include "lm4_adc.h"
 #include "registers.h"
 #include "util.h"
 
diff --git a/board/bolt/board.c b/board/bolt/board.c
index 714918ebd0..4cdab99430 100644
--- a/board/bolt/board.c
+++ b/board/bolt/board.c
@@ -5,20 +5,18 @@
 /* EC for Bolt board configuration */
 
 #include "adc.h"
-#include "board.h"
+#include "adc_chip.h"
 #include "backlight.h"
-#include "chip_temp_sensor.h"
 #include "chipset.h"
 #include "chipset_x86_common.h"
 #include "common.h"
-#include "ec_commands.h"
+#include "driver/temp_sensor/tmp006.h"
 #include "extpower.h"
 #include "gpio.h"
 #include "host_command.h"
 #include "i2c.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
-#include "lm4_adc.h"
 #include "peci.h"
 #include "power_button.h"
 #include "pwm.h"
@@ -26,9 +24,9 @@
 #include "registers.h"
 #include "switch.h"
 #include "temp_sensor.h"
+#include "temp_sensor_chip.h"
 #include "timer.h"
 #include "thermal.h"
-#include "tmp006.h"
 #include "util.h"
 
 /* GPIO signal list.  Must match order from enum gpio_signal. */
diff --git a/board/falco/board.c b/board/falco/board.c
index 487cc1ef39..55567bfe32 100644
--- a/board/falco/board.c
+++ b/board/falco/board.c
@@ -5,13 +5,13 @@
 /* EC for Falco board configuration */
 
 #include "adc.h"
+#include "adc_chip.h"
 #include "backlight.h"
 #include "board.h"
-#include "charger_bq24738.h"
-#include "chip_temp_sensor.h"
 #include "chipset_x86_common.h"
 #include "common.h"
-#include "ec_commands.h"
+#include "driver/charger/bq24738.h"
+#include "driver/temp_sensor/g781.h"
 #include "extpower.h"
 #include "fan.h"
 #include "gpio.h"
@@ -20,7 +20,6 @@
 #include "jtag.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
-#include "lm4_adc.h"
 #include "peci.h"
 #include "power_button.h"
 #include "pwm.h"
@@ -28,7 +27,7 @@
 #include "registers.h"
 #include "switch.h"
 #include "temp_sensor.h"
-#include "temp_sensor_g781.h"
+#include "temp_sensor_chip.h"
 #include "thermal.h"
 #include "timer.h"
 #include "uart.h"
diff --git a/board/kirby/board.c b/board/kirby/board.c
index 3b3464e3f8..3d91057cc3 100644
--- a/board/kirby/board.c
+++ b/board/kirby/board.c
@@ -5,6 +5,7 @@
 /* Kirby board-specific configuration */
 
 #include "adc.h"
+#include "adc_chip.h"
 #include "common.h"
 #include "chipset.h"
 #include "extpower.h"
@@ -17,7 +18,6 @@
 #include "pwm_data.h"
 #include "registers.h"
 #include "spi.h"
-#include "stm32_adc.h"
 #include "task.h"
 #include "util.h"
 
diff --git a/board/link/board.c b/board/link/board.c
index 5d05392c5f..4f1fe833f6 100644
--- a/board/link/board.c
+++ b/board/link/board.c
@@ -5,18 +5,17 @@
 /* EC for Link board configuration */
 
 #include "adc.h"
+#include "adc_chip.h"
 #include "backlight.h"
-#include "chip_temp_sensor.h"
 #include "chipset.h"
 #include "chipset_x86_common.h"
 #include "common.h"
-#include "ec_commands.h"
+#include "driver/temp_sensor/tmp006.h"
 #include "extpower.h"
 #include "gpio.h"
 #include "i2c.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
-#include "lm4_adc.h"
 #include "peci.h"
 #include "power_button.h"
 #include "pwm.h"
@@ -24,9 +23,9 @@
 #include "registers.h"
 #include "switch.h"
 #include "temp_sensor.h"
+#include "temp_sensor_chip.h"
 #include "timer.h"
 #include "thermal.h"
-#include "tmp006.h"
 #include "util.h"
 
 /* GPIO signal list.  Must match order from enum gpio_signal. */
diff --git a/board/peppy/board.c b/board/peppy/board.c
index 569d1ffa0a..f1eb2c861a 100644
--- a/board/peppy/board.c
+++ b/board/peppy/board.c
@@ -5,12 +5,12 @@
 /* EC for Peppy board configuration */
 
 #include "adc.h"
+#include "adc_chip.h"
 #include "backlight.h"
-#include "chip_temp_sensor.h"
 #include "chipset.h"
 #include "chipset_x86_common.h"
 #include "common.h"
-#include "ec_commands.h"
+#include "driver/temp_sensor/g781.h"
 #include "extpower.h"
 #include "gpio.h"
 #include "host_command.h"
@@ -18,7 +18,6 @@
 #include "jtag.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
-#include "lm4_adc.h"
 #include "peci.h"
 #include "power_button.h"
 #include "pwm.h"
@@ -26,7 +25,7 @@
 #include "registers.h"
 #include "switch.h"
 #include "temp_sensor.h"
-#include "temp_sensor_g781.h"
+#include "temp_sensor_chip.h"
 #include "thermal.h"
 #include "timer.h"
 #include "uart.h"
diff --git a/board/rambi/board.c b/board/rambi/board.c
index 0ddfb7df7d..7207d0c7f4 100644
--- a/board/rambi/board.c
+++ b/board/rambi/board.c
@@ -5,18 +5,17 @@
 /* EC for Rambi board configuration */
 
 #include "adc.h"
+#include "adc_chip.h"
 #include "backlight.h"
-#include "chip_temp_sensor.h"
 #include "chipset_x86_common.h"
 #include "common.h"
-#include "ec_commands.h"
+#include "driver/temp_sensor/g781.h"
 #include "extpower.h"
 #include "gpio.h"
 #include "host_command.h"
 #include "i2c.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
-#include "lm4_adc.h"
 #include "peci.h"
 #include "power_button.h"
 #include "pwm.h"
@@ -24,7 +23,7 @@
 #include "registers.h"
 #include "switch.h"
 #include "temp_sensor.h"
-#include "temp_sensor_g781.h"
+#include "temp_sensor_chip.h"
 #include "thermal.h"
 #include "timer.h"
 #include "util.h"
diff --git a/board/samus/board.c b/board/samus/board.c
index 753f71e9ee..9e3857f00b 100644
--- a/board/samus/board.c
+++ b/board/samus/board.c
@@ -5,19 +5,17 @@
 /* EC for Samus board configuration */
 
 #include "adc.h"
-#include "board.h"
+#include "adc_chip.h"
 #include "backlight.h"
-#include "chip_temp_sensor.h"
 #include "chipset_x86_common.h"
 #include "common.h"
-#include "ec_commands.h"
+#include "driver/temp_sensor/tmp006.h"
 #include "extpower.h"
 #include "gpio.h"
 #include "host_command.h"
 #include "i2c.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
-#include "lm4_adc.h"
 #include "peci.h"
 #include "power_button.h"
 #include "pwm.h"
@@ -25,9 +23,9 @@
 #include "registers.h"
 #include "switch.h"
 #include "temp_sensor.h"
+#include "temp_sensor_chip.h"
 #include "timer.h"
 #include "thermal.h"
-#include "tmp006.h"
 #include "util.h"
 
 /* GPIO signal list.  Must match order from enum gpio_signal. */
diff --git a/board/slippy/board.c b/board/slippy/board.c
index b10097142b..0627bfdff6 100644
--- a/board/slippy/board.c
+++ b/board/slippy/board.c
@@ -5,12 +5,12 @@
 /* EC for Slippy board configuration */
 
 #include "adc.h"
+#include "adc_chip.h"
 #include "backlight.h"
-#include "chip_temp_sensor.h"
 #include "chipset.h"
 #include "chipset_x86_common.h"
 #include "common.h"
-#include "ec_commands.h"
+#include "driver/temp_sensor/g781.h"
 #include "extpower.h"
 #include "gpio.h"
 #include "host_command.h"
@@ -18,7 +18,6 @@
 #include "jtag.h"
 #include "keyboard_scan.h"
 #include "lid_switch.h"
-#include "lm4_adc.h"
 #include "peci.h"
 #include "power_button.h"
 #include "pwm.h"
@@ -26,7 +25,7 @@
 #include "registers.h"
 #include "switch.h"
 #include "temp_sensor.h"
-#include "temp_sensor_g781.h"
+#include "temp_sensor_chip.h"
 #include "thermal.h"
 #include "timer.h"
 #include "uart.h"
diff --git a/board/spring/board.c b/board/spring/board.c
index 30269b27d8..51447737f5 100644
--- a/board/spring/board.c
+++ b/board/spring/board.c
@@ -5,6 +5,7 @@
 /* Spring board-specific configuration */
 
 #include "adc.h"
+#include "adc_chip.h"
 #include "board_config.h"
 #include "chipset.h"
 #include "common.h"
@@ -20,7 +21,6 @@
 #include "pwm.h"
 #include "pwm_data.h"
 #include "registers.h"
-#include "stm32_adc.h"
 #include "timer.h"
 #include "util.h"
 
diff --git a/board/spring/led.c b/board/spring/led.c
index a793afda33..4338911237 100644
--- a/board/spring/led.c
+++ b/board/spring/led.c
@@ -7,10 +7,10 @@
 
 #include "battery.h"
 #include "common.h"
+#include "driver/led/lp5562.h"
 #include "extpower.h"
 #include "hooks.h"
 #include "host_command.h"
-#include "lp5562.h"
 #include "pmu_tpschrome.h"
 #include "timer.h"
 #include "util.h"