diff options
Diffstat (limited to 'zephyr/shim/chip')
-rw-r--r-- | zephyr/shim/chip/it8xxx2/clock.c | 7 | ||||
-rw-r--r-- | zephyr/shim/chip/it8xxx2/gpio.c | 5 | ||||
-rw-r--r-- | zephyr/shim/chip/it8xxx2/keyboard_raw.c | 9 | ||||
-rw-r--r-- | zephyr/shim/chip/it8xxx2/power_policy.c | 7 | ||||
-rw-r--r-- | zephyr/shim/chip/mchp/clock.c | 7 | ||||
-rw-r--r-- | zephyr/shim/chip/mchp/gpio.c | 3 | ||||
-rw-r--r-- | zephyr/shim/chip/mchp/keyboard_raw.c | 9 | ||||
-rw-r--r-- | zephyr/shim/chip/mchp/system.c | 6 | ||||
-rw-r--r-- | zephyr/shim/chip/mchp/system_download_from_flash.c | 7 | ||||
-rw-r--r-- | zephyr/shim/chip/mchp/system_external_storage.c | 11 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/clock.c | 7 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/gpio.c | 11 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/keyboard_raw.c | 9 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c | 6 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/power_policy.c | 9 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/shi.c | 15 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/system.c | 6 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/system_download_from_flash.c | 9 | ||||
-rw-r--r-- | zephyr/shim/chip/npcx/system_external_storage.c | 6 |
19 files changed, 68 insertions, 81 deletions
diff --git a/zephyr/shim/chip/it8xxx2/clock.c b/zephyr/shim/chip/it8xxx2/clock.c index a4df87dc1d..14dbc0e7eb 100644 --- a/zephyr/shim/chip/it8xxx2/clock.c +++ b/zephyr/shim/chip/it8xxx2/clock.c @@ -3,16 +3,15 @@ * found in the LICENSE file. */ -#include "module_id.h" - #include <zephyr/device.h> #include <zephyr/drivers/clock_control.h> #include <zephyr/kernel.h> #include <zephyr/logging/log.h> -#include <zephyr/sys/util.h> - #include <soc.h> #include <soc/ite_it8xxx2/reg_def_cros.h> +#include <zephyr/sys/util.h> + +#include "module_id.h" LOG_MODULE_REGISTER(shim_clock, LOG_LEVEL_ERR); diff --git a/zephyr/shim/chip/it8xxx2/gpio.c b/zephyr/shim/chip/it8xxx2/gpio.c index 16eb7a3963..7106b2a294 100644 --- a/zephyr/shim/chip/it8xxx2/gpio.c +++ b/zephyr/shim/chip/it8xxx2/gpio.c @@ -3,13 +3,14 @@ * found in the LICENSE file. */ -#include "gpio/gpio.h" - #include <zephyr/device.h> #include <zephyr/drivers/gpio.h> #include <zephyr/kernel.h> + #include <zephyr/logging/log.h> +#include "gpio/gpio.h" + LOG_MODULE_REGISTER(shim_cros_gpio, LOG_LEVEL_ERR); static const struct unused_pin_config unused_pin_configs[] = { diff --git a/zephyr/shim/chip/it8xxx2/keyboard_raw.c b/zephyr/shim/chip/it8xxx2/keyboard_raw.c index 5fe99b7efa..0a117cda14 100644 --- a/zephyr/shim/chip/it8xxx2/keyboard_raw.c +++ b/zephyr/shim/chip/it8xxx2/keyboard_raw.c @@ -5,14 +5,13 @@ /* Functions needed by keyboard scanner module for Chrome EC */ -#include "drivers/cros_kb_raw.h" -#include "keyboard_raw.h" - #include <zephyr/device.h> -#include <zephyr/kernel.h> #include <zephyr/logging/log.h> - #include <soc.h> +#include <zephyr/kernel.h> + +#include "drivers/cros_kb_raw.h" +#include "keyboard_raw.h" /** * Return true if the current value of the given input GPIO port is zero diff --git a/zephyr/shim/chip/it8xxx2/power_policy.c b/zephyr/shim/chip/it8xxx2/power_policy.c index c6e73d53a4..c8efb0ca96 100644 --- a/zephyr/shim/chip/it8xxx2/power_policy.c +++ b/zephyr/shim/chip/it8xxx2/power_policy.c @@ -3,13 +3,12 @@ * found in the LICENSE file. */ -#include "system.h" - -#include <zephyr/kernel.h> #include <zephyr/pm/pm.h> #include <zephyr/pm/policy.h> - #include <soc.h> +#include <zephyr/kernel.h> + +#include "system.h" static const struct pm_state_info pm_states[] = PM_STATE_INFO_LIST_FROM_DT_CPU(DT_NODELABEL(cpu0)); diff --git a/zephyr/shim/chip/mchp/clock.c b/zephyr/shim/chip/mchp/clock.c index 5fb39bfd43..6ee4cd931c 100644 --- a/zephyr/shim/chip/mchp/clock.c +++ b/zephyr/shim/chip/mchp/clock.c @@ -3,17 +3,16 @@ * found in the LICENSE file. */ -#include "clock_chip.h" -#include "module_id.h" - #include <zephyr/device.h> #include <zephyr/drivers/clock_control.h> #include <zephyr/dt-bindings/clock/mchp_xec_pcr.h> #include <zephyr/kernel.h> #include <zephyr/logging/log.h> - #include <soc.h> +#include "clock_chip.h" +#include "module_id.h" + LOG_MODULE_REGISTER(shim_clock, LOG_LEVEL_ERR); #define PCR_NODE DT_INST(0, microchip_xec_pcr) diff --git a/zephyr/shim/chip/mchp/gpio.c b/zephyr/shim/chip/mchp/gpio.c index d772a566d8..7801c6f7cc 100644 --- a/zephyr/shim/chip/mchp/gpio.c +++ b/zephyr/shim/chip/mchp/gpio.c @@ -3,12 +3,11 @@ * found in the LICENSE file. */ -#include "gpio/gpio.h" - #include <zephyr/device.h> #include <zephyr/drivers/gpio.h> #include <zephyr/kernel.h> #include <zephyr/logging/log.h> +#include "gpio/gpio.h" LOG_MODULE_REGISTER(shim_cros_gpio, LOG_LEVEL_ERR); diff --git a/zephyr/shim/chip/mchp/keyboard_raw.c b/zephyr/shim/chip/mchp/keyboard_raw.c index 9183e4d7dd..95ad642d12 100644 --- a/zephyr/shim/chip/mchp/keyboard_raw.c +++ b/zephyr/shim/chip/mchp/keyboard_raw.c @@ -5,14 +5,13 @@ /* Functions needed by keyboard scanner module for Chrome EC */ -#include "drivers/cros_kb_raw.h" -#include "keyboard_raw.h" - #include <zephyr/device.h> -#include <zephyr/kernel.h> #include <zephyr/logging/log.h> - #include <soc.h> +#include <zephyr/kernel.h> + +#include "drivers/cros_kb_raw.h" +#include "keyboard_raw.h" /** * Return true if the current value of the given input GPIO port is zero diff --git a/zephyr/shim/chip/mchp/system.c b/zephyr/shim/chip/mchp/system.c index 6e5da9aa80..35ba806533 100644 --- a/zephyr/shim/chip/mchp/system.c +++ b/zephyr/shim/chip/mchp/system.c @@ -3,12 +3,12 @@ * found in the LICENSE file. */ -#include "system.h" -#include "system_chip.h" - #include <zephyr/drivers/bbram.h> #include <zephyr/logging/log.h> +#include "system.h" +#include "system_chip.h" + LOG_MODULE_REGISTER(shim_xec_system, LOG_LEVEL_ERR); #define GET_BBRAM_OFS(node) DT_PROP(DT_PATH(named_bbram_regions, node), offset) diff --git a/zephyr/shim/chip/mchp/system_download_from_flash.c b/zephyr/shim/chip/mchp/system_download_from_flash.c index 8f6304274f..51cdc5aab6 100644 --- a/zephyr/shim/chip/mchp/system_download_from_flash.c +++ b/zephyr/shim/chip/mchp/system_download_from_flash.c @@ -2,14 +2,13 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ +#include <zephyr/dt-bindings/clock/npcx_clock.h> +#include <stdnoreturn.h> + #include "common.h" #include "soc.h" #include "system_chip.h" -#include <zephyr/dt-bindings/clock/npcx_clock.h> - -#include <stdnoreturn.h> - /* Modules Map */ #define WDT_NODE DT_INST(0, microchip_xec_watchdog) #define STRUCT_WDT_REG_BASE_ADDR ((struct wdt_regs *)(DT_REG_ADDR(WDT_NODE))) diff --git a/zephyr/shim/chip/mchp/system_external_storage.c b/zephyr/shim/chip/mchp/system_external_storage.c index 5887e045a4..4250b05fe3 100644 --- a/zephyr/shim/chip/mchp/system_external_storage.c +++ b/zephyr/shim/chip/mchp/system_external_storage.c @@ -3,16 +3,15 @@ * found in the LICENSE file. */ +#include <zephyr/devicetree.h> +#include <zephyr/drivers/bbram.h> +#include <soc.h> + #include "clock_chip.h" #include "common.h" -#include "config_chip.h" #include "system.h" #include "system_chip.h" - -#include <zephyr/devicetree.h> -#include <zephyr/drivers/bbram.h> - -#include <soc.h> +#include "config_chip.h" #define MCHP_ECRO_WORD 0x4F524345u /* ASCII ECRO */ #define MCHP_ECRW_WORD 0x57524345u /* ASCII ECRW */ diff --git a/zephyr/shim/chip/npcx/clock.c b/zephyr/shim/chip/npcx/clock.c index 2a6fe27ef4..fc483ef775 100644 --- a/zephyr/shim/chip/npcx/clock.c +++ b/zephyr/shim/chip/npcx/clock.c @@ -3,17 +3,16 @@ * found in the LICENSE file. */ -#include "clock_chip.h" -#include "module_id.h" - #include <zephyr/device.h> #include <zephyr/drivers/clock_control.h> #include <zephyr/dt-bindings/clock/npcx_clock.h> #include <zephyr/kernel.h> #include <zephyr/logging/log.h> - #include <soc.h> +#include "clock_chip.h" +#include "module_id.h" + LOG_MODULE_REGISTER(shim_clock, LOG_LEVEL_ERR); #define CDCG_NODE DT_INST(0, nuvoton_npcx_pcc) diff --git a/zephyr/shim/chip/npcx/gpio.c b/zephyr/shim/chip/npcx/gpio.c index 1d51c00f61..850123e17b 100644 --- a/zephyr/shim/chip/npcx/gpio.c +++ b/zephyr/shim/chip/npcx/gpio.c @@ -3,16 +3,17 @@ * found in the LICENSE file. */ -#include "gpio/gpio.h" -#include "soc_gpio.h" -#include "util.h" - #include <zephyr/device.h> #include <zephyr/drivers/gpio.h> #include <zephyr/kernel.h> -#include <zephyr/logging/log.h> #include <zephyr/shell/shell.h> +#include <zephyr/logging/log.h> + +#include "gpio/gpio.h" +#include "soc_gpio.h" +#include "util.h" + LOG_MODULE_REGISTER(shim_cros_gpio, LOG_LEVEL_ERR); static const struct unused_pin_config unused_pin_configs[] = { diff --git a/zephyr/shim/chip/npcx/keyboard_raw.c b/zephyr/shim/chip/npcx/keyboard_raw.c index 1f01952ab9..4d43134482 100644 --- a/zephyr/shim/chip/npcx/keyboard_raw.c +++ b/zephyr/shim/chip/npcx/keyboard_raw.c @@ -5,16 +5,15 @@ /* Functions needed by keyboard scanner module for Chrome EC */ -#include "drivers/cros_kb_raw.h" -#include "keyboard_raw.h" - #include <zephyr/device.h> #include <zephyr/drivers/gpio.h> -#include <zephyr/kernel.h> #include <zephyr/logging/log.h> - #include <soc.h> #include <soc_gpio.h> +#include <zephyr/kernel.h> + +#include "drivers/cros_kb_raw.h" +#include "keyboard_raw.h" /** * Return true if the current value of the given input GPIO port is zero diff --git a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c index 3062ed98a4..e3fecc0cbd 100644 --- a/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c +++ b/zephyr/shim/chip/npcx/npcx_monitor/npcx_monitor.c @@ -5,14 +5,12 @@ * NPCX SoC spi flash update tool - monitor firmware */ +#include <stdint.h> +#include <zephyr/sys/util.h> #include "config_chip.h" #include "npcx_monitor.h" #include "registers.h" -#include <stdint.h> - -#include <zephyr/sys/util.h> - /* * TODO(b/197162681): This was copied from chip/npcx/spiflashfw but this * needs to be moved to Zephyr upstream diff --git a/zephyr/shim/chip/npcx/power_policy.c b/zephyr/shim/chip/npcx/power_policy.c index 29ebcbd542..aea6e62d30 100644 --- a/zephyr/shim/chip/npcx/power_policy.c +++ b/zephyr/shim/chip/npcx/power_policy.c @@ -3,16 +3,15 @@ * found in the LICENSE file. */ -#include "console.h" -#include "cros_version.h" -#include "system.h" - #include <zephyr/kernel.h> #include <zephyr/pm/pm.h> #include <zephyr/pm/policy.h> - #include <soc.h> +#include "console.h" +#include "cros_version.h" +#include "system.h" + static const struct pm_state_info residency_info[] = PM_STATE_INFO_LIST_FROM_DT_CPU(DT_NODELABEL(cpu0)); diff --git a/zephyr/shim/chip/npcx/shi.c b/zephyr/shim/chip/npcx/shi.c index 0cecc2c56e..8bec57252d 100644 --- a/zephyr/shim/chip/npcx/shi.c +++ b/zephyr/shim/chip/npcx/shi.c @@ -5,19 +5,18 @@ /* Functions needed by Serial Host Interface module for Chrome EC */ -#include "chipset.h" -#include "drivers/cros_shi.h" -#include "hooks.h" -#include "host_command.h" -#include "system.h" - #include <zephyr/device.h> #include <zephyr/dt-bindings/clock/npcx_clock.h> -#include <zephyr/kernel.h> #include <zephyr/logging/log.h> +#include <soc.h> +#include <zephyr/kernel.h> #include <ap_power/ap_power.h> -#include <soc.h> +#include "chipset.h" +#include "drivers/cros_shi.h" +#include "hooks.h" +#include "host_command.h" +#include "system.h" LOG_MODULE_REGISTER(shim_cros_shi, LOG_LEVEL_DBG); diff --git a/zephyr/shim/chip/npcx/system.c b/zephyr/shim/chip/npcx/system.c index 1fbdca0803..2240acea54 100644 --- a/zephyr/shim/chip/npcx/system.c +++ b/zephyr/shim/chip/npcx/system.c @@ -3,12 +3,12 @@ * found in the LICENSE file. */ -#include "system.h" -#include "system_chip.h" - #include <zephyr/drivers/bbram.h> #include <zephyr/logging/log.h> +#include "system.h" +#include "system_chip.h" + LOG_MODULE_REGISTER(shim_npcx_system, LOG_LEVEL_ERR); static void chip_bbram_status_check(void) diff --git a/zephyr/shim/chip/npcx/system_download_from_flash.c b/zephyr/shim/chip/npcx/system_download_from_flash.c index 53e22d4839..1aef9560d1 100644 --- a/zephyr/shim/chip/npcx/system_download_from_flash.c +++ b/zephyr/shim/chip/npcx/system_download_from_flash.c @@ -2,14 +2,13 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ -#include "common.h" -#include "soc.h" -#include "system_chip.h" - #include <zephyr/dt-bindings/clock/npcx_clock.h> +#include <stdnoreturn.h> #include <zephyr/sys/__assert.h> -#include <stdnoreturn.h> +#include "common.h" +#include "soc.h" +#include "system_chip.h" /* Modules Map */ #define NPCX_PMC_BASE_ADDR 0x4000D000 diff --git a/zephyr/shim/chip/npcx/system_external_storage.c b/zephyr/shim/chip/npcx/system_external_storage.c index d3b2d26362..81e1968cf4 100644 --- a/zephyr/shim/chip/npcx/system_external_storage.c +++ b/zephyr/shim/chip/npcx/system_external_storage.c @@ -3,15 +3,15 @@ * found in the LICENSE file. */ +#include <zephyr/devicetree.h> +#include <zephyr/drivers/syscon.h> + #include "clock_chip.h" #include "common.h" #include "rom_chip.h" #include "system.h" #include "system_chip.h" -#include <zephyr/devicetree.h> -#include <zephyr/drivers/syscon.h> - /* TODO (b:179900857) Make this implementation not npcx specific. */ static const struct device *mdc_dev = DEVICE_DT_GET(DT_NODELABEL(mdc)); |