adc: Remove adc_chip.h where adc.h is used

This removes the use of adc_chip.h where adc.h is also used. In this
case, adc_chip.h is redundant.

BRANCH=none
BUG=b:181271666
TEST=buildall passes

Change-Id: Id7baf9aef949447a4d47934242f9bae97c971262
Signed-off-by: Caveh Jalali <caveh@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3120317
Reviewed-by: Keith Short <keithshort@chromium.org>

104 files changed, 0 insertions, 104 deletions

diff --git a/baseboard/asurada/baseboard.c b/baseboard/asurada/baseboard.c
index c00a990483..60a9622fa8 100644
--- a/baseboard/asurada/baseboard.c
+++ b/baseboard/asurada/baseboard.c
@@ -6,7 +6,6 @@
 /* Asurada baseboard-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charger.h"
diff --git a/baseboard/cherry/baseboard.c b/baseboard/cherry/baseboard.c
index 93f898dad0..d6ccab1fab 100644
--- a/baseboard/cherry/baseboard.c
+++ b/baseboard/cherry/baseboard.c
@@ -6,7 +6,6 @@
 /* Cherry baseboard-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charger.h"
diff --git a/baseboard/goroh/baseboard.c b/baseboard/goroh/baseboard.c
index 6914520b90..933fdc0eff 100644
--- a/baseboard/goroh/baseboard.c
+++ b/baseboard/goroh/baseboard.c
@@ -6,7 +6,6 @@
 /* Goroh baseboard-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charger.h"
diff --git a/baseboard/grunt/baseboard.c b/baseboard/grunt/baseboard.c
index d3e3f81682..7fc756ec47 100644
--- a/baseboard/grunt/baseboard.c
+++ b/baseboard/grunt/baseboard.c
@@ -6,7 +6,6 @@
 /* Grunt family-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state.h"
diff --git a/baseboard/guybrush/baseboard.c b/baseboard/guybrush/baseboard.c
index cd7dd65d55..df6cab8538 100644
--- a/baseboard/guybrush/baseboard.c
+++ b/baseboard/guybrush/baseboard.c
@@ -6,7 +6,6 @@
 /* Guybrush family-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "cros_board_info.h"
 #include "base_fw_config.h"
 #include "battery_fuel_gauge.h"
diff --git a/baseboard/kalista/baseboard.c b/baseboard/kalista/baseboard.c
index 6592033c83..a443f1919a 100644
--- a/baseboard/kalista/baseboard.c
+++ b/baseboard/kalista/baseboard.c
@@ -6,7 +6,6 @@
 /* Kalista baseboard configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "baseboard.h"
 #include "battery.h"
 #include "bd99992gw.h"
diff --git a/baseboard/kukui/baseboard.c b/baseboard/kukui/baseboard.c
index a779d57791..3f9a1c36c6 100644
--- a/baseboard/kukui/baseboard.c
+++ b/baseboard/kukui/baseboard.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "charger.h"
 #include "chipset.h"
 #include "dma.h"
diff --git a/baseboard/mancomb/baseboard.c b/baseboard/mancomb/baseboard.c
index b79cf3a3de..26604cf41b 100644
--- a/baseboard/mancomb/baseboard.c
+++ b/baseboard/mancomb/baseboard.c
@@ -6,7 +6,6 @@
 /* Mancomb family-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
 #include "charge_state_v2.h"
diff --git a/baseboard/zork/baseboard.c b/baseboard/zork/baseboard.c
index 00ccaf23c4..0b48d1075b 100644
--- a/baseboard/zork/baseboard.c
+++ b/baseboard/zork/baseboard.c
@@ -6,7 +6,6 @@
 /* Zork family-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "cbi_ec_fw_config.h"
 #include "charge_manager.h"
diff --git a/baseboard/zork/variant_dalboz.c b/baseboard/zork/variant_dalboz.c
index a43518e984..10058bb8bc 100644
--- a/baseboard/zork/variant_dalboz.c
+++ b/baseboard/zork/variant_dalboz.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "charger.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/akemi/board.c b/board/akemi/board.c
index 94b49f6ff4..5b88f82fb5 100644
--- a/board/akemi/board.c
+++ b/board/akemi/board.c
@@ -6,7 +6,6 @@
 /* Hatch board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/ambassador/board.c b/board/ambassador/board.c
index 322ca7dde7..f8dc910070 100644
--- a/board/ambassador/board.c
+++ b/board/ambassador/board.c
@@ -6,7 +6,6 @@
 /* Puff board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/ampton/board.c b/board/ampton/board.c
index 3c88e22a74..1634f02991 100644
--- a/board/ampton/board.c
+++ b/board/ampton/board.c
@@ -6,7 +6,6 @@
 /* Ampton/Apel board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_state.h"
 #include "common.h"
diff --git a/board/asurada/board.c b/board/asurada/board.c
index ac77c9e3cd..b57d327015 100644
--- a/board/asurada/board.c
+++ b/board/asurada/board.c
@@ -5,7 +5,6 @@
 /* Asurada board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/bds/board.c b/board/bds/board.c
index 95f3ef6cfd..91da893a52 100644
--- a/board/bds/board.c
+++ b/board/bds/board.c
@@ -5,7 +5,6 @@
 /* Stellaris EKB-LM4F-EAC board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "gpio.h"
 #include "i2c.h"
 #include "registers.h"
diff --git a/board/berknip/board.c b/board/berknip/board.c
index ca113980f6..a119007de6 100644
--- a/board/berknip/board.c
+++ b/board/berknip/board.c
@@ -6,7 +6,6 @@
 /* Berknip board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charger.h"
 #include "cbi_ec_fw_config.h"
diff --git a/board/bloog/board.c b/board/bloog/board.c
index 99ee87c080..dfad4ab281 100644
--- a/board/bloog/board.c
+++ b/board/bloog/board.c
@@ -6,7 +6,6 @@
 /* Bloog/Blooguard board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/bobba/board.c b/board/bobba/board.c
index fa56f996b8..1ab1dad660 100644
--- a/board/bobba/board.c
+++ b/board/bobba/board.c
@@ -6,7 +6,6 @@
 /* Bobba board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "button.h"
 #include "cbi_ssfc.h"
diff --git a/board/burnet/board.c b/board/burnet/board.c
index f0a8ec9824..7ed540de6a 100644
--- a/board/burnet/board.c
+++ b/board/burnet/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/c2d2/board.c b/board/c2d2/board.c
index 1cf4728f12..3327ea43b6 100644
--- a/board/c2d2/board.c
+++ b/board/c2d2/board.c
@@ -4,7 +4,6 @@
  */
 /* C2D2 debug device board configuration */
 
-#include "adc_chip.h"
 #include "adc.h"
 #include "common.h"
 #include "console.h"
diff --git a/board/casta/board.c b/board/casta/board.c
index 7a926563b1..8b36ed0a69 100644
--- a/board/casta/board.c
+++ b/board/casta/board.c
@@ -6,7 +6,6 @@
 /* Casta board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "cbi_ssfc.h"
 #include "charge_manager.h"
diff --git a/board/cerise/board.c b/board/cerise/board.c
index 83884bd42f..7bfd5f87a3 100644
--- a/board/cerise/board.c
+++ b/board/cerise/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/cherry/board.c b/board/cherry/board.c
index 612f7ef720..bb321880e3 100644
--- a/board/cherry/board.c
+++ b/board/cherry/board.c
@@ -5,7 +5,6 @@
 /* Cherry board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/chocodile_vpdmcu/board.c b/board/chocodile_vpdmcu/board.c
index ea4d129502..b3e49fc547 100644
--- a/board/chocodile_vpdmcu/board.c
+++ b/board/chocodile_vpdmcu/board.c
@@ -6,7 +6,6 @@
 /* chocodile board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "gpio.h"
 #include "hooks.h"
diff --git a/board/coachz/base_detect.c b/board/coachz/base_detect.c
index 39e478d1c7..0068b37d8d 100644
--- a/board/coachz/base_detect.c
+++ b/board/coachz/base_detect.c
@@ -6,7 +6,6 @@
 /* Coachz base detection code */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "board.h"
 #include "base_state.h"
 #include "chipset.h"
diff --git a/board/coffeecake/board.c b/board/coffeecake/board.c
index e00c9e7b4b..2939a65125 100644
--- a/board/coffeecake/board.c
+++ b/board/coffeecake/board.c
@@ -5,7 +5,6 @@
 /* Coffeecake dock configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "charger/sy21612.h"
 #include "clock.h"
 #include "common.h"
diff --git a/board/coral/board.c b/board/coral/board.c
index 869309f1fc..57866f30da 100644
--- a/board/coral/board.c
+++ b/board/coral/board.c
@@ -6,7 +6,6 @@
 /* Coral board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
diff --git a/board/damu/board.c b/board/damu/board.c
index c45d4e37a8..e15f6a1928 100644
--- a/board/damu/board.c
+++ b/board/damu/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/dingdong/board.c b/board/dingdong/board.c
index 0ca41dec45..ddaf6bb928 100644
--- a/board/dingdong/board.c
+++ b/board/dingdong/board.c
@@ -5,7 +5,6 @@
 /* Dingdong dongle configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "ec_version.h"
 #include "gpio.h"
diff --git a/board/dood/board.c b/board/dood/board.c
index d92d28084d..cef4c21268 100644
--- a/board/dood/board.c
+++ b/board/dood/board.c
@@ -6,7 +6,6 @@
 /* dood board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/dooly/board.c b/board/dooly/board.c
index c3de9483cd..b28f3d41b8 100644
--- a/board/dooly/board.c
+++ b/board/dooly/board.c
@@ -7,7 +7,6 @@
 
 #include "accelgyro.h"
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/dratini/board.c b/board/dratini/board.c
index 9dfa30c8b1..53fbe4b3d5 100644
--- a/board/dratini/board.c
+++ b/board/dratini/board.c
@@ -6,7 +6,6 @@
 /* Hatch board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/elm/board.c b/board/elm/board.c
index a7415cda41..d62ff8afae 100644
--- a/board/elm/board.c
+++ b/board/elm/board.c
@@ -6,7 +6,6 @@
 /* Oak board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "atomic.h"
 #include "battery.h"
 #include "charge_manager.h"
diff --git a/board/endeavour/board.c b/board/endeavour/board.c
index e59985729d..f208da3819 100644
--- a/board/endeavour/board.c
+++ b/board/endeavour/board.c
@@ -6,7 +6,6 @@
 /* Endeavour board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "bd99992gw.h"
 #include "board_config.h"
diff --git a/board/eve/board.c b/board/eve/board.c
index 345dccb632..cedcd6c5e4 100644
--- a/board/eve/board.c
+++ b/board/eve/board.c
@@ -6,7 +6,6 @@
 /* Eve board-specific configuration */
 
 #include "acpi.h"
-#include "adc_chip.h"
 #include "bd99992gw.h"
 #include "board_config.h"
 #include "button.h"
diff --git a/board/ezkinil/board.c b/board/ezkinil/board.c
index f43cb116b0..14f8e6e915 100644
--- a/board/ezkinil/board.c
+++ b/board/ezkinil/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "cbi_ssfc.h"
 #include "charge_state_v2.h"
diff --git a/board/fennel/board.c b/board/fennel/board.c
index b9d8e5c889..67e4edb892 100644
--- a/board/fennel/board.c
+++ b/board/fennel/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/fizz/board.c b/board/fizz/board.c
index b3627afa7b..0605b68e09 100644
--- a/board/fizz/board.c
+++ b/board/fizz/board.c
@@ -6,7 +6,6 @@
 /* Fizz board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "als.h"
 #include "battery.h"
 #include "bd99992gw.h"
diff --git a/board/fleex/board.c b/board/fleex/board.c
index ac04d3304b..7e11d671c6 100644
--- a/board/fleex/board.c
+++ b/board/fleex/board.c
@@ -6,7 +6,6 @@
 /* Fleex board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/fluffy/board.c b/board/fluffy/board.c
index 264ffc4478..a4de29a160 100644
--- a/board/fluffy/board.c
+++ b/board/fluffy/board.c
@@ -6,7 +6,6 @@
 /* Fluffy configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "console.h"
 #include "ec_version.h"
diff --git a/board/foob/board.c b/board/foob/board.c
index 3ff6fe65cb..3e7725ac2e 100644
--- a/board/foob/board.c
+++ b/board/foob/board.c
@@ -6,7 +6,6 @@
 /* Phaser board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_state.h"
 #include "common.h"
diff --git a/board/garg/board.c b/board/garg/board.c
index 2f20009f3a..be8bc07d36 100644
--- a/board/garg/board.c
+++ b/board/garg/board.c
@@ -6,7 +6,6 @@
 /* Garg board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "button.h"
 #include "cbi_ssfc.h"
diff --git a/board/genesis/board.c b/board/genesis/board.c
index 5cc45388b8..6f397bf1ab 100644
--- a/board/genesis/board.c
+++ b/board/genesis/board.c
@@ -6,7 +6,6 @@
 /* Puff board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/goroh/board.c b/board/goroh/board.c
index 2702cf8658..b28322eca0 100644
--- a/board/goroh/board.c
+++ b/board/goroh/board.c
@@ -5,7 +5,6 @@
 /* Goroh board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/hatch/board.c b/board/hatch/board.c
index a253950815..75f3b5f6cb 100644
--- a/board/hatch/board.c
+++ b/board/hatch/board.c
@@ -6,7 +6,6 @@
 /* Hatch board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/helios/board.c b/board/helios/board.c
index 11f2edb466..cd2fb7e798 100644
--- a/board/helios/board.c
+++ b/board/helios/board.c
@@ -6,7 +6,6 @@
 /* Helios board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/hoho/board.c b/board/hoho/board.c
index fe2bcf1476..07b772c826 100644
--- a/board/hoho/board.c
+++ b/board/hoho/board.c
@@ -5,7 +5,6 @@
 /* Hoho dongle configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "ec_commands.h"
 #include "ec_version.h"
diff --git a/board/homestar/base_detect.c b/board/homestar/base_detect.c
index 2bd115ea2a..b08784357b 100644
--- a/board/homestar/base_detect.c
+++ b/board/homestar/base_detect.c
@@ -6,7 +6,6 @@
 /* Homestar base detection code */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "base_state.h"
 #include "board.h"
 #include "chipset.h"
diff --git a/board/icarus/board.c b/board/icarus/board.c
index d094210c67..b0f2bb7060 100644
--- a/board/icarus/board.c
+++ b/board/icarus/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/jacuzzi/board.c b/board/jacuzzi/board.c
index 810f332c50..34c1ab899e 100644
--- a/board/jacuzzi/board.c
+++ b/board/jacuzzi/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/jinlon/board.c b/board/jinlon/board.c
index 796fe95f8e..470ff37f65 100644
--- a/board/jinlon/board.c
+++ b/board/jinlon/board.c
@@ -6,7 +6,6 @@
 /* Hatch board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/kakadu/board.c b/board/kakadu/board.c
index 592f7548c2..580bfe2355 100644
--- a/board/kakadu/board.c
+++ b/board/kakadu/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
diff --git a/board/kappa/board.c b/board/kappa/board.c
index 538c4d957b..655d53d672 100644
--- a/board/kappa/board.c
+++ b/board/kappa/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/katsu/board.c b/board/katsu/board.c
index 27d285dc76..2571683ec7 100644
--- a/board/katsu/board.c
+++ b/board/katsu/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
diff --git a/board/kindred/board.c b/board/kindred/board.c
index c704fd87d3..c17ddb1b8a 100644
--- a/board/kindred/board.c
+++ b/board/kindred/board.c
@@ -6,7 +6,6 @@
 /* Hatch board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/kodama/board.c b/board/kodama/board.c
index 41a2881d56..8112c880ce 100644
--- a/board/kodama/board.c
+++ b/board/kodama/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
diff --git a/board/kohaku/board.c b/board/kohaku/board.c
index 6b66fd56e8..0204cdd87f 100644
--- a/board/kohaku/board.c
+++ b/board/kohaku/board.c
@@ -6,7 +6,6 @@
 /* Kohaku board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/kukui/board.c b/board/kukui/board.c
index c71954862d..562377af77 100644
--- a/board/kukui/board.c
+++ b/board/kukui/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
diff --git a/board/lick/board.c b/board/lick/board.c
index 69d11e881f..4b5608b7b0 100644
--- a/board/lick/board.c
+++ b/board/lick/board.c
@@ -6,7 +6,6 @@
 /* Lick board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_state.h"
 #include "common.h"
diff --git a/board/makomo/board.c b/board/makomo/board.c
index 1f1e3c3521..8b135ba433 100644
--- a/board/makomo/board.c
+++ b/board/makomo/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/mchpevb1/board.c b/board/mchpevb1/board.c
index 9ed7cd19f6..73cec110bb 100644
--- a/board/mchpevb1/board.c
+++ b/board/mchpevb1/board.c
@@ -11,7 +11,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "als.h"
 #include "bd99992gw.h"
 #include "button.h"
diff --git a/board/meep/board.c b/board/meep/board.c
index 7aba99d5b7..daac19a89a 100644
--- a/board/meep/board.c
+++ b/board/meep/board.c
@@ -6,7 +6,6 @@
 /* Meep/Mimrock board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "button.h"
 #include "cbi_ssfc.h"
diff --git a/board/moonbuggy/board.c b/board/moonbuggy/board.c
index 743172a709..525ec7558d 100644
--- a/board/moonbuggy/board.c
+++ b/board/moonbuggy/board.c
@@ -6,7 +6,6 @@
 /* Puff board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/morphius/board.c b/board/morphius/board.c
index 45af06c4c9..48712ffb0c 100644
--- a/board/morphius/board.c
+++ b/board/morphius/board.c
@@ -6,7 +6,6 @@
 /* Morphius board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery_smart.h"
 #include "button.h"
 #include "cbi_ssfc.h"
diff --git a/board/mrbland/base_detect.c b/board/mrbland/base_detect.c
index 2bd115ea2a..b08784357b 100644
--- a/board/mrbland/base_detect.c
+++ b/board/mrbland/base_detect.c
@@ -6,7 +6,6 @@
 /* Homestar base detection code */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "base_state.h"
 #include "board.h"
 #include "chipset.h"
diff --git a/board/munna/board.c b/board/munna/board.c
index 8a81ed5966..2727401c10 100644
--- a/board/munna/board.c
+++ b/board/munna/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/mushu/board.c b/board/mushu/board.c
index c08b3867e3..353875e9f5 100644
--- a/board/mushu/board.c
+++ b/board/mushu/board.c
@@ -6,7 +6,6 @@
 /* Mushu board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/nami/board.c b/board/nami/board.c
index 0dbd315f3a..016537e13f 100644
--- a/board/nami/board.c
+++ b/board/nami/board.c
@@ -6,7 +6,6 @@
 /* Poppy board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "anx7447.h"
 #include "battery.h"
 #include "board_config.h"
diff --git a/board/nautilus/board.c b/board/nautilus/board.c
index bac1496a05..743beb40b0 100644
--- a/board/nautilus/board.c
+++ b/board/nautilus/board.c
@@ -6,7 +6,6 @@
 /* Poppy board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "bd99992gw.h"
 #include "board_config.h"
 #include "battery_smart.h"
diff --git a/board/nightfury/board.c b/board/nightfury/board.c
index 604e406c40..bed17b834c 100644
--- a/board/nightfury/board.c
+++ b/board/nightfury/board.c
@@ -6,7 +6,6 @@
 /* Nightfury board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/npcx7_evb/board.c b/board/npcx7_evb/board.c
index 42514c2432..9ddaf9bd51 100644
--- a/board/npcx7_evb/board.c
+++ b/board/npcx7_evb/board.c
@@ -6,7 +6,6 @@
 /* Nuvoton M4 EB board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/npcx9_evb/board.c b/board/npcx9_evb/board.c
index a104a409b0..8bfc053fa5 100644
--- a/board/npcx9_evb/board.c
+++ b/board/npcx9_evb/board.c
@@ -6,7 +6,6 @@
 /* Nuvoton M4 EB board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/npcx_evb/board.c b/board/npcx_evb/board.c
index c86f35f487..61e0665b7f 100644
--- a/board/npcx_evb/board.c
+++ b/board/npcx_evb/board.c
@@ -5,7 +5,6 @@
 /* EC for Nuvoton M4 EB configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/npcx_evb_arm/board.c b/board/npcx_evb_arm/board.c
index 8c4f9c7668..4ee03e7a00 100644
--- a/board/npcx_evb_arm/board.c
+++ b/board/npcx_evb_arm/board.c
@@ -5,7 +5,6 @@
 /* EC for Nuvoton M4 EB configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/nucleo-f411re/board.c b/board/nucleo-f411re/board.c
index 97f5a8a8d3..a177a793ab 100644
--- a/board/nucleo-f411re/board.c
+++ b/board/nucleo-f411re/board.c
@@ -5,7 +5,6 @@
 /* nucleo-f411re development board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "console.h"
 #include "driver/accelgyro_bmi_common.h"
diff --git a/board/oak/board.c b/board/oak/board.c
index c478c6b293..e8eba6d45b 100644
--- a/board/oak/board.c
+++ b/board/oak/board.c
@@ -6,7 +6,6 @@
 /* Oak board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "als.h"
 #include "atomic.h"
 #include "battery.h"
diff --git a/board/palkia/board.c b/board/palkia/board.c
index 2914f63f45..7586478724 100644
--- a/board/palkia/board.c
+++ b/board/palkia/board.c
@@ -6,7 +6,6 @@
 /* Palkia board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/phaser/board.c b/board/phaser/board.c
index 0dc4354667..488880c1fc 100644
--- a/board/phaser/board.c
+++ b/board/phaser/board.c
@@ -6,7 +6,6 @@
 /* Phaser board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_state.h"
 #include "common.h"
diff --git a/board/pico/board.c b/board/pico/board.c
index 11e03eb66a..ffabee3880 100644
--- a/board/pico/board.c
+++ b/board/pico/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/plankton/board.c b/board/plankton/board.c
index 551642fae0..a361f5fff3 100644
--- a/board/plankton/board.c
+++ b/board/plankton/board.c
@@ -5,7 +5,6 @@
 /* Plankton board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "console.h"
 #include "gpio.h"
diff --git a/board/poppy/base_detect_lux.c b/board/poppy/base_detect_lux.c
index 37ed3304fe..c348eb681d 100644
--- a/board/poppy/base_detect_lux.c
+++ b/board/poppy/base_detect_lux.c
@@ -6,7 +6,6 @@
 /* Lux base detection code */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "board.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/poppy/base_detect_poppy.c b/board/poppy/base_detect_poppy.c
index 9638894cb8..0fde6fb8e6 100644
--- a/board/poppy/base_detect_poppy.c
+++ b/board/poppy/base_detect_poppy.c
@@ -7,7 +7,6 @@
 
 #include "acpi.h"
 #include "adc.h"
-#include "adc_chip.h"
 #include "board.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/poppy/board.c b/board/poppy/board.c
index 84caa7a497..838c0d1724 100644
--- a/board/poppy/board.c
+++ b/board/poppy/board.c
@@ -6,7 +6,6 @@
 /* Poppy board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "als.h"
 #include "bd99992gw.h"
 #include "board_config.h"
diff --git a/board/puff/board.c b/board/puff/board.c
index 452b63c7a2..b71d6670aa 100644
--- a/board/puff/board.c
+++ b/board/puff/board.c
@@ -6,7 +6,6 @@
 /* Puff board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/rainier/board.c b/board/rainier/board.c
index ac0a5a928f..1581521d52 100644
--- a/board/rainier/board.c
+++ b/board/rainier/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "chipset.h"
diff --git a/board/rammus/board.c b/board/rammus/board.c
index ff4ea53eba..9e244043f2 100644
--- a/board/rammus/board.c
+++ b/board/rammus/board.c
@@ -6,7 +6,6 @@
 /* Rammus board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "anx7447.h"
 #include "bd99992gw.h"
 #include "board_config.h"
diff --git a/board/reef/board.c b/board/reef/board.c
index c37f84c507..8bb7291449 100644
--- a/board/reef/board.c
+++ b/board/reef/board.c
@@ -6,7 +6,6 @@
 /* Reef board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
diff --git a/board/reef_it8320/board.c b/board/reef_it8320/board.c
index 83106698f0..8b60074c02 100644
--- a/board/reef_it8320/board.c
+++ b/board/reef_it8320/board.c
@@ -6,7 +6,6 @@
 /* reef_it8320 board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_ramp.h"
diff --git a/board/reef_mchp/board.c b/board/reef_mchp/board.c
index 334d4615db..98d9b4fca4 100644
--- a/board/reef_mchp/board.c
+++ b/board/reef_mchp/board.c
@@ -6,7 +6,6 @@
 /* Reef board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "als.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/scarlet/board.c b/board/scarlet/board.c
index a2cfdacb97..f109d0ada3 100644
--- a/board/scarlet/board.c
+++ b/board/scarlet/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/scout/board.c b/board/scout/board.c
index 69271c65f3..7c87f97ec8 100644
--- a/board/scout/board.c
+++ b/board/scout/board.c
@@ -6,7 +6,6 @@
 /* Puff board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "chipset.h"
 #include "common.h"
diff --git a/board/servo_v4/board.c b/board/servo_v4/board.c
index 293de41acb..f4723b91f7 100644
--- a/board/servo_v4/board.c
+++ b/board/servo_v4/board.c
@@ -5,7 +5,6 @@
 /* Servo V4 configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "console.h"
 #include "ec_version.h"
diff --git a/board/servo_v4p1/board.c b/board/servo_v4p1/board.c
index 1ec782b2cf..82bc97f091 100644
--- a/board/servo_v4p1/board.c
+++ b/board/servo_v4p1/board.c
@@ -5,7 +5,6 @@
 /* Servo V4p1 configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "ccd_measure_sbu.h"
 #include "chg_control.h"
 #include "common.h"
diff --git a/board/spherion/board.c b/board/spherion/board.c
index 395791649f..1119b1f077 100644
--- a/board/spherion/board.c
+++ b/board/spherion/board.c
@@ -5,7 +5,6 @@
 /* Spherion board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charge_manager.h"
 #include "charge_state_v2.h"
diff --git a/board/stern/board.c b/board/stern/board.c
index 7b92262c93..586010a931 100644
--- a/board/stern/board.c
+++ b/board/stern/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/stryke/board.c b/board/stryke/board.c
index ad6906dea3..3275ff7fa9 100644
--- a/board/stryke/board.c
+++ b/board/stryke/board.c
@@ -6,7 +6,6 @@
 /* Stryke board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "common.h"
 #include "cros_board_info.h"
diff --git a/board/tigertail/board.c b/board/tigertail/board.c
index 8963c7e80a..f4d0382b9c 100644
--- a/board/tigertail/board.c
+++ b/board/tigertail/board.c
@@ -6,7 +6,6 @@
 /* Tigertail board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "console.h"
 #include "ec_version.h"
diff --git a/board/trembyle/board.c b/board/trembyle/board.c
index b82b5a6e18..89a62f3411 100644
--- a/board/trembyle/board.c
+++ b/board/trembyle/board.c
@@ -6,7 +6,6 @@
 /* Trembyle board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "charger.h"
 #include "cbi_ec_fw_config.h"
diff --git a/board/twinkie/board.c b/board/twinkie/board.c
index b50307397a..6572f27281 100644
--- a/board/twinkie/board.c
+++ b/board/twinkie/board.c
@@ -5,7 +5,6 @@
 /* Twinkie dongle configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "console.h"
 #include "ec_version.h"
diff --git a/board/willow/board.c b/board/willow/board.c
index 6d036a1526..84e1abf421 100644
--- a/board/willow/board.c
+++ b/board/willow/board.c
@@ -4,7 +4,6 @@
  */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "backlight.h"
 #include "button.h"
 #include "charge_manager.h"
diff --git a/board/woomax/board.c b/board/woomax/board.c
index 11a7c9c969..7770804402 100644
--- a/board/woomax/board.c
+++ b/board/woomax/board.c
@@ -6,7 +6,6 @@
 /* Trembyle board configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "button.h"
 #include "cbi_ec_fw_config.h"
 #include "cbi_ssfc.h"
diff --git a/board/wormdingler/base_detect.c b/board/wormdingler/base_detect.c
index ddad212fbb..73c28e4bc9 100644
--- a/board/wormdingler/base_detect.c
+++ b/board/wormdingler/base_detect.c
@@ -6,7 +6,6 @@
 /* Wormdingler base detection code */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "base_state.h"
 #include "board.h"
 #include "chipset.h"
diff --git a/board/yorp/board.c b/board/yorp/board.c
index 4a618133f3..625db5d0b7 100644
--- a/board/yorp/board.c
+++ b/board/yorp/board.c
@@ -6,7 +6,6 @@
 /* Yorp board-specific configuration */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "battery.h"
 #include "charge_manager.h"
 #include "charge_state.h"
diff --git a/board/zinger/hardware.c b/board/zinger/hardware.c
index 2aceb801e4..c19e6f0f6b 100644
--- a/board/zinger/hardware.c
+++ b/board/zinger/hardware.c
@@ -5,7 +5,6 @@
 /* Hardware initialization and common functions */
 
 #include "adc.h"
-#include "adc_chip.h"
 #include "common.h"
 #include "cpu.h"
 #include "registers.h"