diff options
Diffstat (limited to 'zephyr/shim/include')
27 files changed, 55 insertions, 33 deletions
diff --git a/zephyr/shim/include/charger/chg_isl923x.h b/zephyr/shim/include/charger/chg_isl923x.h index b0323cd1b8..9156e574de 100644 --- a/zephyr/shim/include/charger/chg_isl923x.h +++ b/zephyr/shim/include/charger/chg_isl923x.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/charger/isl923x_public.h" +#include <zephyr/devicetree.h> + #define ISL923X_CHG_COMPAT intersil_isl923x #define ISL923X_EMUL_COMPAT cros_isl923x_emul diff --git a/zephyr/shim/include/charger/chg_isl9241.h b/zephyr/shim/include/charger/chg_isl9241.h index 711a581c2f..c6d2239038 100644 --- a/zephyr/shim/include/charger/chg_isl9241.h +++ b/zephyr/shim/include/charger/chg_isl9241.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/charger/isl9241_public.h" +#include <zephyr/devicetree.h> + #define ISL9241_CHG_COMPAT intersil_isl9241 #define CHG_CONFIG_ISL9241(id) \ diff --git a/zephyr/shim/include/charger/chg_rt9490.h b/zephyr/shim/include/charger/chg_rt9490.h index 3ac596d482..44d81eac48 100644 --- a/zephyr/shim/include/charger/chg_rt9490.h +++ b/zephyr/shim/include/charger/chg_rt9490.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/charger/rt9490.h" +#include <zephyr/devicetree.h> + #define RT9490_CHG_COMPAT richtek_rt9490 #define RT9490_EMUL_COMPAT zephyr_rt9490_emul diff --git a/zephyr/shim/include/charger/chg_sm5803.h b/zephyr/shim/include/charger/chg_sm5803.h index 65ef066970..853dd06a63 100644 --- a/zephyr/shim/include/charger/chg_sm5803.h +++ b/zephyr/shim/include/charger/chg_sm5803.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/charger/sm5803.h" +#include <zephyr/devicetree.h> + #define SM5803_CHG_COMPAT siliconmitus_sm5803 #define CHG_CONFIG_SM5803(id) \ diff --git a/zephyr/shim/include/charger_chips.h b/zephyr/shim/include/charger_chips.h index b24fa246bf..503a53330d 100644 --- a/zephyr/shim/include/charger_chips.h +++ b/zephyr/shim/include/charger_chips.h @@ -7,6 +7,7 @@ #define __CROS_EC_CHARGER_CHIPS_H #include "charger.h" + #include <zephyr/devicetree.h> extern const struct charger_config_t chg_chips_alt[]; diff --git a/zephyr/shim/include/config_chip.h b/zephyr/shim/include/config_chip.h index 7f56d9c342..7b3abce82e 100644 --- a/zephyr/shim/include/config_chip.h +++ b/zephyr/shim/include/config_chip.h @@ -15,6 +15,7 @@ #line 16 #include <zephyr/devicetree.h> + #include <autoconf.h> #define SENSOR_NODE DT_PATH(motionsense_sensor) diff --git a/zephyr/shim/include/cros_cbi.h b/zephyr/shim/include/cros_cbi.h index 6f5bfd4d70..603be590c1 100644 --- a/zephyr/shim/include/cros_cbi.h +++ b/zephyr/shim/include/cros_cbi.h @@ -6,9 +6,9 @@ #ifndef __CROS_EC_CROS_CBI_H #define __CROS_EC_CROS_CBI_H -#include <zephyr/kernel.h> #include <zephyr/device.h> #include <zephyr/devicetree.h> +#include <zephyr/kernel.h> /* * Macros are _INST_ types, so require DT_DRV_COMPAT to be defined. diff --git a/zephyr/shim/include/motionsense_sensors.h b/zephyr/shim/include/motionsense_sensors.h index e00eae426e..f83a8c63ad 100644 --- a/zephyr/shim/include/motionsense_sensors.h +++ b/zephyr/shim/include/motionsense_sensors.h @@ -6,9 +6,10 @@ #ifndef __CROS_EC_MOTIONSENSE_SENSORS_H #define __CROS_EC_MOTIONSENSE_SENSORS_H -#include <zephyr/devicetree.h> #include "motion_sense.h" +#include <zephyr/devicetree.h> + extern struct motion_sensor_t motion_sensors_alt[]; /* diff --git a/zephyr/shim/include/motionsense_sensors_defs.h b/zephyr/shim/include/motionsense_sensors_defs.h index ac0fc6bf56..b4b0274237 100644 --- a/zephyr/shim/include/motionsense_sensors_defs.h +++ b/zephyr/shim/include/motionsense_sensors_defs.h @@ -6,10 +6,10 @@ #ifndef __CROS_EC_MOTIONSENSE_SENSORS_DEFS_H #define __CROS_EC_MOTIONSENSE_SENSORS_DEFS_H -#include <zephyr/devicetree.h> - #include "common.h" +#include <zephyr/devicetree.h> + #define SENSOR_ID(id) DT_CAT(SENSOR_, id) /* Define the SENSOR_ID if: diff --git a/zephyr/shim/include/temp_sensor/temp_sensor.h b/zephyr/shim/include/temp_sensor/temp_sensor.h index a6cdfb5524..c4770ce767 100644 --- a/zephyr/shim/include/temp_sensor/temp_sensor.h +++ b/zephyr/shim/include/temp_sensor/temp_sensor.h @@ -6,9 +6,10 @@ #ifndef ZEPHYR_SHIM_INCLUDE_TEMP_SENSOR_TEMP_SENSOR_H_ #define ZEPHYR_SHIM_INCLUDE_TEMP_SENSOR_TEMP_SENSOR_H_ -#include <zephyr/devicetree.h> -#include "include/temp_sensor.h" #include "charger/chg_rt9490.h" +#include "include/temp_sensor.h" + +#include <zephyr/devicetree.h> #ifdef CONFIG_PLATFORM_EC_TEMP_SENSOR diff --git a/zephyr/shim/include/usbc/ppc.h b/zephyr/shim/include/usbc/ppc.h index 28e518a3ef..fa38145f66 100644 --- a/zephyr/shim/include/usbc/ppc.h +++ b/zephyr/shim/include/usbc/ppc.h @@ -6,15 +6,16 @@ #ifndef ZEPHYR_CHROME_USBC_PPC_H #define ZEPHYR_CHROME_USBC_PPC_H -#include <zephyr/device.h> -#include <zephyr/devicetree.h> -#include "usbc/ppc_rt1739.h" #include "usbc/ppc_nx20p348x.h" +#include "usbc/ppc_rt1739.h" #include "usbc/ppc_sn5s330.h" #include "usbc/ppc_syv682x.h" #include "usbc/utils.h" #include "usbc_ppc.h" +#include <zephyr/device.h> +#include <zephyr/devicetree.h> + extern struct ppc_config_t ppc_chips_alt[]; #define ALT_PPC_CHIP_CHK(usbc_id, usb_port_num) \ diff --git a/zephyr/shim/include/usbc/tcpc_anx7447.h b/zephyr/shim/include/usbc/tcpc_anx7447.h index b45e03393c..89076c8c49 100644 --- a/zephyr/shim/include/usbc/tcpc_anx7447.h +++ b/zephyr/shim/include/usbc/tcpc_anx7447.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "tcpm/anx7447_public.h" +#include <zephyr/devicetree.h> + #define ANX7447_TCPC_COMPAT analogix_anx7447_tcpc #define TCPC_CONFIG_ANX7447(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_anx7447_emul.h b/zephyr/shim/include/usbc/tcpc_anx7447_emul.h index 78322a7329..f8ca60de6e 100644 --- a/zephyr/shim/include/usbc/tcpc_anx7447_emul.h +++ b/zephyr/shim/include/usbc/tcpc_anx7447_emul.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/tcpm/anx7447_public.h" +#include <zephyr/devicetree.h> + #define ANX7447_EMUL_COMPAT cros_anx7447_emul #define TCPC_CONFIG_ANX7447_EMUL(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_ccgxxf.h b/zephyr/shim/include/usbc/tcpc_ccgxxf.h index 0c02cf6846..fb7bdcabcf 100644 --- a/zephyr/shim/include/usbc/tcpc_ccgxxf.h +++ b/zephyr/shim/include/usbc/tcpc_ccgxxf.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/tcpm/ccgxxf.h" +#include <zephyr/devicetree.h> + #define CCGXXF_TCPC_COMPAT cypress_ccgxxf #define TCPC_CONFIG_CCGXXF(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_fusb302.h b/zephyr/shim/include/usbc/tcpc_fusb302.h index a2e512d938..fa309051cd 100644 --- a/zephyr/shim/include/usbc/tcpc_fusb302.h +++ b/zephyr/shim/include/usbc/tcpc_fusb302.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/tcpm/fusb302.h" +#include <zephyr/devicetree.h> + #define FUSB302_TCPC_COMPAT fairchild_fusb302 #define TCPC_CONFIG_FUSB302(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_generic_emul.h b/zephyr/shim/include/usbc/tcpc_generic_emul.h index 7dc46c51ba..9000dfdf20 100644 --- a/zephyr/shim/include/usbc/tcpc_generic_emul.h +++ b/zephyr/shim/include/usbc/tcpc_generic_emul.h @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> - #include "driver/tcpm/tcpci.h" +#include <zephyr/devicetree.h> + #define TCPCI_EMUL_COMPAT cros_tcpci_generic_emul #define TCPC_CONFIG_TCPCI_EMUL(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_it8xxx2.h b/zephyr/shim/include/usbc/tcpc_it8xxx2.h index c619656667..b9084782e0 100644 --- a/zephyr/shim/include/usbc/tcpc_it8xxx2.h +++ b/zephyr/shim/include/usbc/tcpc_it8xxx2.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/tcpm/it8xxx2_pd_public.h" +#include <zephyr/devicetree.h> + #define IT8XXX2_TCPC_COMPAT ite_it8xxx2_usbpd #define TCPC_CONFIG_IT8XXX2(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_nct38xx.h b/zephyr/shim/include/usbc/tcpc_nct38xx.h index 87ba3379c8..7a0752904e 100644 --- a/zephyr/shim/include/usbc/tcpc_nct38xx.h +++ b/zephyr/shim/include/usbc/tcpc_nct38xx.h @@ -6,9 +6,10 @@ #ifndef __CROS_EC_TCPC_NCT38XX_H #define __CROS_EC_TCPC_NCT38XX_H -#include <zephyr/devicetree.h> #include "driver/tcpm/nct38xx.h" +#include <zephyr/devicetree.h> + #define NCT38XX_TCPC_COMPAT nuvoton_nct38xx #define TCPC_CONFIG_NCT38XX(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_ps8xxx.h b/zephyr/shim/include/usbc/tcpc_ps8xxx.h index 1a457af09b..7d3b9c6ccc 100644 --- a/zephyr/shim/include/usbc/tcpc_ps8xxx.h +++ b/zephyr/shim/include/usbc/tcpc_ps8xxx.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/tcpm/ps8xxx_public.h" +#include <zephyr/devicetree.h> + #define PS8XXX_COMPAT parade_ps8xxx #define TCPC_CONFIG_PS8XXX(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h b/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h index fbd2e4bfd1..b1ea6f1705 100644 --- a/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h +++ b/zephyr/shim/include/usbc/tcpc_ps8xxx_emul.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "driver/tcpm/ps8xxx_public.h" +#include <zephyr/devicetree.h> + #define PS8XXX_EMUL_COMPAT cros_ps8xxx_emul #define TCPC_CONFIG_PS8XXX_EMUL(id) \ diff --git a/zephyr/shim/include/usbc/tcpc_rt1718s.h b/zephyr/shim/include/usbc/tcpc_rt1718s.h index 794fb99480..861b474ecf 100644 --- a/zephyr/shim/include/usbc/tcpc_rt1718s.h +++ b/zephyr/shim/include/usbc/tcpc_rt1718s.h @@ -3,9 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> #include "tcpm/rt1718s_public.h" +#include <zephyr/devicetree.h> + #define RT1718S_TCPC_COMPAT richtek_rt1718s_tcpc #define TCPC_CONFIG_RT1718S(id) \ diff --git a/zephyr/shim/include/usbc/tcpci.h b/zephyr/shim/include/usbc/tcpci.h index 67138dbe99..15cea4b332 100644 --- a/zephyr/shim/include/usbc/tcpci.h +++ b/zephyr/shim/include/usbc/tcpci.h @@ -3,10 +3,10 @@ * found in the LICENSE file. */ -#include <zephyr/devicetree.h> - #include "driver/tcpm/tcpci.h" +#include <zephyr/devicetree.h> + #define TCPCI_COMPAT cros_ec_tcpci #define TCPC_CONFIG_TCPCI(id) \ diff --git a/zephyr/shim/include/usbc/usb_muxes.h b/zephyr/shim/include/usbc/usb_muxes.h index 132ce77e91..6ee9c691a8 100644 --- a/zephyr/shim/include/usbc/usb_muxes.h +++ b/zephyr/shim/include/usbc/usb_muxes.h @@ -6,8 +6,6 @@ #ifndef ZEPHYR_CHROME_USBC_USB_MUXES_H #define ZEPHYR_CHROME_USBC_USB_MUXES_H -#include <zephyr/devicetree.h> -#include <zephyr/sys/util_macro.h> #include "usb_mux.h" #include "usbc/amd_fp6_usb_mux.h" #include "usbc/anx7447_usb_mux.h" @@ -21,6 +19,9 @@ #include "usbc/utils.h" #include "usbc/virtual_usb_mux.h" +#include <zephyr/devicetree.h> +#include <zephyr/sys/util_macro.h> + /** * @brief List of USB mux drivers compatibles and their configurations. Each * element of list has to have (compatible, config) format. diff --git a/zephyr/shim/include/zephyr_hooks_shim.h b/zephyr/shim/include/zephyr_hooks_shim.h index f3949787bd..f1c25c6e8f 100644 --- a/zephyr/shim/include/zephyr_hooks_shim.h +++ b/zephyr/shim/include/zephyr_hooks_shim.h @@ -8,12 +8,12 @@ #endif #define __CROS_EC_ZEPHYR_HOOKS_SHIM_H -#include <zephyr/init.h> -#include <zephyr/kernel.h> - #include "common.h" #include "cros_version.h" +#include <zephyr/init.h> +#include <zephyr/kernel.h> + /** * The internal data structure stored for a deferred function. */ diff --git a/zephyr/shim/include/zephyr_host_command.h b/zephyr/shim/include/zephyr_host_command.h index e2f0a7c296..9271c6c368 100644 --- a/zephyr/shim/include/zephyr_host_command.h +++ b/zephyr/shim/include/zephyr_host_command.h @@ -10,9 +10,10 @@ #endif #define __CROS_EC_ZEPHYR_HOST_COMMAND_H -#include <zephyr/init.h> #include <stdbool.h> +#include <zephyr/init.h> + /* Initializes and runs the host command handler loop. */ void host_command_task(void *u); diff --git a/zephyr/shim/include/zephyr_shim.h b/zephyr/shim/include/zephyr_shim.h index 3e12568155..dce1706c5b 100644 --- a/zephyr/shim/include/zephyr_shim.h +++ b/zephyr/shim/include/zephyr_shim.h @@ -6,9 +6,10 @@ #ifndef __BOARD_H #define __BOARD_H -#include <zephyr/devicetree.h> #include "common.h" +#include <zephyr/devicetree.h> + /* Included shimed version of gpio signal. */ #include "gpio_signal.h" diff --git a/zephyr/shim/include/zephyr_write_protect.h b/zephyr/shim/include/zephyr_write_protect.h index 227af16bd0..59a305a0f9 100644 --- a/zephyr/shim/include/zephyr_write_protect.h +++ b/zephyr/shim/include/zephyr_write_protect.h @@ -8,6 +8,7 @@ #include "gpio/gpio_int.h" #include "gpio_signal.h" + #include <zephyr/drivers/gpio.h> /** |