diff options
author | Eric Yilun Lin <yllin@chromium.org> | 2022-12-11 15:06:17 +0800 |
---|---|---|
committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2022-12-13 04:43:21 +0000 |
commit | 802a90e2e991129c0d9ff2b4b1d8f6bd36f0a492 (patch) | |
tree | e3d1337c6a89e4ba8f875c9c8b19c1d392d57a93 | |
parent | d49c205fd2e300ba2a926a714e9a48773c4d2370 (diff) | |
download | chrome-ec-802a90e2e991129c0d9ff2b4b1d8f6bd36f0a492.tar.gz |
corsola: headers clean up
Drop unnecessary headers.
BUG=none
TEST=zmake compare-builds \
$(find zephyr/program/corsola/ -type f -name project.overlay \
| sed -r 's|/[^/]+$||' | sed -r 's|^.+/||')
BRANCH=corsola
Change-Id: I45e1a8ac51f6a8dee9488b2d2845422a4fa90652
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4095602
Commit-Queue: Ting Shen <phoenixshen@chromium.org>
Auto-Submit: Eric Yilun Lin <yllin@google.com>
Tested-by: Eric Yilun Lin <yllin@google.com>
Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Code-Coverage: Zoss <zoss-cl-coverage@prod.google.com>
-rw-r--r-- | include/driver/usb_mux/ps8743_public.h | 2 | ||||
-rw-r--r-- | zephyr/program/corsola/kingler/src/led.c | 1 | ||||
-rw-r--r-- | zephyr/program/corsola/krabby/src/ppc.c | 1 | ||||
-rw-r--r-- | zephyr/program/corsola/magikarp/src/ppc.c | 8 | ||||
-rw-r--r-- | zephyr/program/corsola/src/board.c | 4 | ||||
-rw-r--r-- | zephyr/program/corsola/src/board_chipset.c | 2 | ||||
-rw-r--r-- | zephyr/program/corsola/src/ite_hooks.c | 1 | ||||
-rw-r--r-- | zephyr/program/corsola/src/ite_usb_pd_policy.c | 1 | ||||
-rw-r--r-- | zephyr/program/corsola/src/ite_usbc.c | 3 | ||||
-rw-r--r-- | zephyr/program/corsola/src/npcx_usb_pd_policy.c | 8 | ||||
-rw-r--r-- | zephyr/program/corsola/src/npcx_usbc.c | 6 | ||||
-rw-r--r-- | zephyr/program/corsola/src/usb_pd_policy.c | 3 | ||||
-rw-r--r-- | zephyr/program/corsola/src/usbc.c | 13 | ||||
-rw-r--r-- | zephyr/program/corsola/tentacruel/src/ppc.c | 4 | ||||
-rw-r--r-- | zephyr/program/corsola/tentacruel/src/sensor.c | 1 | ||||
-rw-r--r-- | zephyr/program/corsola/tentacruel/src/temp.c | 5 | ||||
-rw-r--r-- | zephyr/shim/include/temp_sensor/temp_sensor.h | 2 |
17 files changed, 11 insertions, 54 deletions
diff --git a/include/driver/usb_mux/ps8743_public.h b/include/driver/usb_mux/ps8743_public.h index 64ba2d0cd7..6459ecc973 100644 --- a/include/driver/usb_mux/ps8743_public.h +++ b/include/driver/usb_mux/ps8743_public.h @@ -8,6 +8,8 @@ #ifndef __CROS_EC_DRIVER_USB_MUX_PS8743_PUBLIC_H #define __CROS_EC_DRIVER_USB_MUX_PS8743_PUBLIC_H +#include "usb_mux.h" + #include <inttypes.h> #define PS8743_I2C_ADDR0_FLAG 0x10 diff --git a/zephyr/program/corsola/kingler/src/led.c b/zephyr/program/corsola/kingler/src/led.c index 4e2c5b12fb..2ce240833a 100644 --- a/zephyr/program/corsola/kingler/src/led.c +++ b/zephyr/program/corsola/kingler/src/led.c @@ -6,7 +6,6 @@ */ #include "common.h" #include "ec_commands.h" -#include "led_common.h" #include "led_onoff_states.h" #include "led_pwm.h" diff --git a/zephyr/program/corsola/krabby/src/ppc.c b/zephyr/program/corsola/krabby/src/ppc.c index dbbfee57b5..121d5ca279 100644 --- a/zephyr/program/corsola/krabby/src/ppc.c +++ b/zephyr/program/corsola/krabby/src/ppc.c @@ -10,7 +10,6 @@ #include "driver/ppc/syv682x.h" #include "gpio/gpio_int.h" #include "hooks.h" -#include "variant_db_detection.h" void c0_bc12_interrupt(enum gpio_signal signal) { diff --git a/zephyr/program/corsola/magikarp/src/ppc.c b/zephyr/program/corsola/magikarp/src/ppc.c index 41cce3f73d..f3f7ee8a98 100644 --- a/zephyr/program/corsola/magikarp/src/ppc.c +++ b/zephyr/program/corsola/magikarp/src/ppc.c @@ -6,14 +6,10 @@ /* Tentacruel PPC/BC12 (mixed RT1739 or PI3USB9201+SYV682X) configuration */ #include "baseboard_usbc_config.h" -#include "console.h" -#include "cros_board_info.h" +#include "driver/ppc/syv682x_public.h" #include "gpio/gpio_int.h" #include "hooks.h" -#include "usbc/ppc.h" -#include "variant_db_detection.h" - -#include <zephyr/logging/log.h> +#include "usb_charge.h" #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args) #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args) diff --git a/zephyr/program/corsola/src/board.c b/zephyr/program/corsola/src/board.c index bd0ee739b5..45c8bd016c 100644 --- a/zephyr/program/corsola/src/board.c +++ b/zephyr/program/corsola/src/board.c @@ -7,10 +7,6 @@ #include "console.h" #include "hooks.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_USB, format, ##args) diff --git a/zephyr/program/corsola/src/board_chipset.c b/zephyr/program/corsola/src/board_chipset.c index e534bfafcb..54cc7116fd 100644 --- a/zephyr/program/corsola/src/board_chipset.c +++ b/zephyr/program/corsola/src/board_chipset.c @@ -5,7 +5,7 @@ /* Corsola baseboard-chipset specific configuration */ -#include "gpio.h" +#include "gpio_signal.h" #include <zephyr/drivers/gpio.h> #include <zephyr/init.h> diff --git a/zephyr/program/corsola/src/ite_hooks.c b/zephyr/program/corsola/src/ite_hooks.c index 2582998b9c..5564ea1660 100644 --- a/zephyr/program/corsola/src/ite_hooks.c +++ b/zephyr/program/corsola/src/ite_hooks.c @@ -6,7 +6,6 @@ #include "charger.h" #include "driver/charger/rt9490.h" #include "extpower.h" -#include "gpio.h" #include "hooks.h" #include <zephyr/drivers/gpio.h> diff --git a/zephyr/program/corsola/src/ite_usb_pd_policy.c b/zephyr/program/corsola/src/ite_usb_pd_policy.c index 8f2a2c3515..71ac98d14a 100644 --- a/zephyr/program/corsola/src/ite_usb_pd_policy.c +++ b/zephyr/program/corsola/src/ite_usb_pd_policy.c @@ -5,7 +5,6 @@ #include "adc.h" #include "charge_manager.h" -#include "chipset.h" #include "usb_charge.h" #include "usb_pd.h" #include "usbc_ppc.h" diff --git a/zephyr/program/corsola/src/ite_usbc.c b/zephyr/program/corsola/src/ite_usbc.c index ab5888616e..4496053b6b 100644 --- a/zephyr/program/corsola/src/ite_usbc.c +++ b/zephyr/program/corsola/src/ite_usbc.c @@ -5,8 +5,6 @@ /* Krabby board-specific USB-C configuration */ -#include "adc.h" -#include "baseboard_usbc_config.h" #include "charge_manager.h" #include "console.h" #include "driver/tcpm/it83xx_pd.h" @@ -15,6 +13,7 @@ #include "usb_pd.h" #include "usbc_ppc.h" #include "variant_db_detection.h" +#include "zephyr_adc.h" #define CPRINTSUSB(format, args...) cprints(CC_USBCHARGE, format, ##args) #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ##args) diff --git a/zephyr/program/corsola/src/npcx_usb_pd_policy.c b/zephyr/program/corsola/src/npcx_usb_pd_policy.c index c9e26f6681..65be43807b 100644 --- a/zephyr/program/corsola/src/npcx_usb_pd_policy.c +++ b/zephyr/program/corsola/src/npcx_usb_pd_policy.c @@ -4,14 +4,10 @@ */ #include "baseboard_usbc_config.h" -#include "charge_manager.h" -#include "console.h" -#include "driver/ppc/rt1718s.h" -#include "system.h" -#include "usb_mux.h" +#include "driver/tcpm/rt1718s.h" +#include "driver/tcpm/tcpm.h" #include "usb_pd.h" #include "usbc_ppc.h" -#include "util.h" #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args) #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ##args) diff --git a/zephyr/program/corsola/src/npcx_usbc.c b/zephyr/program/corsola/src/npcx_usbc.c index fb55deb52c..eead9fa528 100644 --- a/zephyr/program/corsola/src/npcx_usbc.c +++ b/zephyr/program/corsola/src/npcx_usbc.c @@ -11,15 +11,11 @@ #endif #include "baseboard_usbc_config.h" -#include "charger.h" #include "console.h" -#include "driver/bc12/pi3usb9201_public.h" -#include "driver/charger/isl923x_public.h" #include "driver/ppc/nx20p348x.h" -#include "driver/ppc/rt1718s.h" #include "driver/tcpm/anx7447.h" #include "driver/tcpm/rt1718s.h" -#include "driver/usb_mux/ps8743.h" +#include "driver/usb_mux/ps8743_public.h" #include "gpio.h" #include "gpio/gpio_int.h" #include "hooks.h" diff --git a/zephyr/program/corsola/src/usb_pd_policy.c b/zephyr/program/corsola/src/usb_pd_policy.c index a5f3f11134..a7fa22fa41 100644 --- a/zephyr/program/corsola/src/usb_pd_policy.c +++ b/zephyr/program/corsola/src/usb_pd_policy.c @@ -3,17 +3,14 @@ * found in the LICENSE file. */ -#include "atomic.h" #include "baseboard_usbc_config.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/corsola/src/usbc.c b/zephyr/program/corsola/src/usbc.c index 93eb72a48f..b95b69edf5 100644 --- a/zephyr/program/corsola/src/usbc.c +++ b/zephyr/program/corsola/src/usbc.c @@ -5,26 +5,13 @@ /* Corsola baseboard-specific USB-C configuration */ -#include "adc.h" #include "baseboard_usbc_config.h" -#include "button.h" #include "charge_state_v2.h" -#include "charger.h" #include "console.h" #include "ec_commands.h" #include "extpower.h" #include "gpio/gpio_int.h" #include "hooks.h" -#include "i2c.h" -#include "lid_switch.h" -#include "power.h" -#include "power_button.h" -#include "ppc/syv682x_public.h" -#include "spi.h" -#include "switch.h" -#include "tablet_mode.h" -#include "task.h" -#include "uart.h" #include "usb_charge.h" #include "usb_mux.h" #include "usb_pd_tcpm.h" diff --git a/zephyr/program/corsola/tentacruel/src/ppc.c b/zephyr/program/corsola/tentacruel/src/ppc.c index 877b9940b4..d544849296 100644 --- a/zephyr/program/corsola/tentacruel/src/ppc.c +++ b/zephyr/program/corsola/tentacruel/src/ppc.c @@ -6,14 +6,12 @@ /* Tentacruel PPC/BC12 (mixed RT1739 or PI3USB9201+SYV682X) configuration */ #include "baseboard_usbc_config.h" -#include "console.h" #include "cros_board_info.h" -#include "driver/usb_mux/ps8743.h" +#include "driver/usb_mux/ps8743_public.h" #include "gpio/gpio_int.h" #include "hooks.h" #include "usb_mux.h" #include "usbc/ppc.h" -#include "variant_db_detection.h" #include <zephyr/logging/log.h> diff --git a/zephyr/program/corsola/tentacruel/src/sensor.c b/zephyr/program/corsola/tentacruel/src/sensor.c index 48e6f6c23c..16c2ac9fef 100644 --- a/zephyr/program/corsola/tentacruel/src/sensor.c +++ b/zephyr/program/corsola/tentacruel/src/sensor.c @@ -4,7 +4,6 @@ */ #include "accelgyro.h" -#include "common.h" #include "cros_cbi.h" #include "driver/accelgyro_bmi323.h" #include "driver/accelgyro_icm42607.h" diff --git a/zephyr/program/corsola/tentacruel/src/temp.c b/zephyr/program/corsola/tentacruel/src/temp.c index 08d5204e28..2e584640be 100644 --- a/zephyr/program/corsola/tentacruel/src/temp.c +++ b/zephyr/program/corsola/tentacruel/src/temp.c @@ -4,15 +4,10 @@ */ #include "charge_state.h" -#include "charger.h" #include "common.h" -#include "config.h" -#include "console.h" #include "driver/charger/rt9490.h" #include "hooks.h" #include "temp_sensor/temp_sensor.h" -#include "thermal.h" -#include "util.h" #define NUM_CURRENT_LEVELS ARRAY_SIZE(current_table) #define TEMP_THRESHOLD 50 diff --git a/zephyr/shim/include/temp_sensor/temp_sensor.h b/zephyr/shim/include/temp_sensor/temp_sensor.h index c4770ce767..5e4cca3063 100644 --- a/zephyr/shim/include/temp_sensor/temp_sensor.h +++ b/zephyr/shim/include/temp_sensor/temp_sensor.h @@ -7,7 +7,7 @@ #define ZEPHYR_SHIM_INCLUDE_TEMP_SENSOR_TEMP_SENSOR_H_ #include "charger/chg_rt9490.h" -#include "include/temp_sensor.h" +#include "temp_sensor.h" #include <zephyr/devicetree.h> |