From 5247059d1e3c767392ff75bec6dd7945b35b180d Mon Sep 17 00:00:00 2001
From: Eric Yilun Lin <yllin@chromium.org>
Date: Tue, 13 Dec 2022 19:45:04 +0800
Subject: geralt: headers cleanup

Drop unnecessary headers, and replace them  with the shortest include
dependency.

BUG=none
TEST=zmake buildd geralt
BRANCH=none

Change-Id: I3201c59bddd559f0f0910099eb7e344defa7882b
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4100032
Auto-Submit: Eric Yilun Lin <yllin@google.com>
Reviewed-by: Sung-Chi Li <lschyi@chromium.org>
Commit-Queue: Eric Yilun Lin <yllin@google.com>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
Tested-by: Eric Yilun Lin <yllin@google.com>
---
 zephyr/program/geralt/src/backlight.c   | 2 +-
 zephyr/program/geralt/src/dp_alt_mode.c | 3 ---
 zephyr/program/geralt/src/hooks.c       | 2 +-
 zephyr/program/geralt/src/ppc.c         | 2 +-
 zephyr/program/geralt/src/usbc_config.c | 6 ++----
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/zephyr/program/geralt/src/backlight.c b/zephyr/program/geralt/src/backlight.c
index 1a8fc9461e..8234191d22 100644
--- a/zephyr/program/geralt/src/backlight.c
+++ b/zephyr/program/geralt/src/backlight.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "gpio.h"
+#include "gpio_signal.h"
 
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/init.h>
diff --git a/zephyr/program/geralt/src/dp_alt_mode.c b/zephyr/program/geralt/src/dp_alt_mode.c
index d0cfdf6a74..afafa68be0 100644
--- a/zephyr/program/geralt/src/dp_alt_mode.c
+++ b/zephyr/program/geralt/src/dp_alt_mode.c
@@ -3,16 +3,13 @@
  * found in the LICENSE file.
  */
 
-#include "atomic.h"
 #include "chipset.h"
 #include "console.h"
 #include "hooks.h"
 #include "timer.h"
 #include "typec_control.h"
-#include "usb_dp_alt_mode.h"
 #include "usb_mux.h"
 #include "usb_pd.h"
-#include "usbc_ppc.h"
 
 #define CPRINTS(format, args...) cprints(CC_USBPD, format, ##args)
 #define CPRINTF(format, args...) cprintf(CC_USBPD, format, ##args)
diff --git a/zephyr/program/geralt/src/hooks.c b/zephyr/program/geralt/src/hooks.c
index 64d3026093..628ecdd0f8 100644
--- a/zephyr/program/geralt/src/hooks.c
+++ b/zephyr/program/geralt/src/hooks.c
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-#include "gpio.h"
+#include "gpio_signal.h"
 #include "hooks.h"
 
 #include <zephyr/drivers/gpio.h>
diff --git a/zephyr/program/geralt/src/ppc.c b/zephyr/program/geralt/src/ppc.c
index 985c70af9a..e69aa2171c 100644
--- a/zephyr/program/geralt/src/ppc.c
+++ b/zephyr/program/geralt/src/ppc.c
@@ -4,7 +4,7 @@
  */
 
 #include "gpio/gpio_int.h"
-#include "usbc/ppc.h"
+#include "usbc_ppc.h"
 
 #include <zephyr/init.h>
 
diff --git a/zephyr/program/geralt/src/usbc_config.c b/zephyr/program/geralt/src/usbc_config.c
index 882dfacd6f..7c49f58237 100644
--- a/zephyr/program/geralt/src/usbc_config.c
+++ b/zephyr/program/geralt/src/usbc_config.c
@@ -5,15 +5,13 @@
 
 /* Geralt baseboard-specific USB-C configuration */
 
-#include "adc.h"
+#include "charge_manager.h"
 #include "charge_state_v2.h"
-#include "charger.h"
 #include "console.h"
 #include "driver/tcpm/it83xx_pd.h"
-#include "hooks.h"
-#include "usb_charge.h"
 #include "usb_pd.h"
 #include "usbc_ppc.h"
+#include "zephyr_adc.h"
 
 #include <ap_power/ap_power.h>
 
-- 
cgit v1.2.1