From 09d40e0e08283a249e7dce0e106c07c5141f9b7e Mon Sep 17 00:00:00 2001 From: Antonio Nino Diaz Date: Fri, 14 Dec 2018 00:18:21 +0000 Subject: Sanitise includes across codebase Enforce full include path for includes. Deprecate old paths. The following folders inside include/lib have been left unchanged: - include/lib/cpus/${ARCH} - include/lib/el3_runtime/${ARCH} The reason for this change is that having a global namespace for includes isn't a good idea. It defeats one of the advantages of having folders and it introduces problems that are sometimes subtle (because you may not know the header you are actually including if there are two of them). For example, this patch had to be created because two headers were called the same way: e0ea0928d5b7 ("Fix gpio includes of mt8173 platform to avoid collision."). More recently, this patch has had similar problems: 46f9b2c3a282 ("drivers: add tzc380 support"). This problem was introduced in commit 4ecca33988b9 ("Move include and source files to logical locations"). At that time, there weren't too many headers so it wasn't a real issue. However, time has shown that this creates problems. Platforms that want to preserve the way they include headers may add the removed paths to PLAT_INCLUDES, but this is discouraged. Change-Id: I39dc53ed98f9e297a5966e723d1936d6ccf2fc8f Signed-off-by: Antonio Nino Diaz --- drivers/allwinner/sunxi_rsb.c | 8 +++--- drivers/arm/cci/cci.c | 11 ++++---- drivers/arm/ccn/ccn.c | 12 +++++---- drivers/arm/gic/common/gic_common.c | 6 +++-- drivers/arm/gic/common/gic_common_private.h | 5 ++-- drivers/arm/gic/v2/gicv2_helpers.c | 12 +++++---- drivers/arm/gic/v2/gicv2_main.c | 15 ++++++----- drivers/arm/gic/v2/gicv2_private.h | 5 ++-- drivers/arm/gic/v3/arm_gicv3_common.c | 7 ++--- drivers/arm/gic/v3/gic600.c | 5 ++-- drivers/arm/gic/v3/gicv3_helpers.c | 10 ++++--- drivers/arm/gic/v3/gicv3_main.c | 12 +++++---- drivers/arm/gic/v3/gicv3_private.h | 8 +++--- drivers/arm/pl011/aarch32/pl011_console.S | 2 +- drivers/arm/pl011/aarch64/pl011_console.S | 2 +- drivers/arm/pl061/pl061_gpio.c | 13 ++++----- drivers/arm/smmu/smmu_v3.c | 5 ++-- drivers/arm/sp804/sp804_delay_timer.c | 5 ++-- drivers/arm/sp805/sp805.c | 5 ++-- drivers/arm/tzc/tzc380.c | 7 ++--- drivers/arm/tzc/tzc400.c | 8 +++--- drivers/arm/tzc/tzc_common_private.h | 4 +-- drivers/arm/tzc/tzc_dmc500.c | 10 ++++--- drivers/arm/tzc/tzc_dmc620.c | 7 ++--- drivers/auth/auth_mod.c | 18 +++++++------ drivers/auth/crypto_mod.c | 5 ++-- drivers/auth/cryptocell/cryptocell_crypto.c | 26 +++++++++--------- drivers/auth/cryptocell/cryptocell_crypto.mk | 4 +-- drivers/auth/img_parser_mod.c | 9 ++++--- drivers/auth/mbedtls/mbedtls_common.c | 12 +++++---- drivers/auth/mbedtls/mbedtls_common.mk | 3 +-- drivers/auth/mbedtls/mbedtls_crypto.c | 9 ++++--- drivers/auth/mbedtls/mbedtls_x509_parser.c | 9 ++++--- drivers/auth/tbbr/tbbr_cot.c | 7 ++--- drivers/cadence/uart/aarch64/cdns_console.S | 2 +- drivers/cfi/v2m/v2m_flash.c | 5 ++-- drivers/console/multi_console.c | 1 + .../coreboot/cbmem_console/aarch64/cbmem_console.S | 2 +- drivers/delay_timer/delay_timer.c | 6 +++-- drivers/delay_timer/generic_delay_timer.c | 13 ++++----- drivers/gpio/gpio.c | 3 ++- drivers/imx/timer/imx_gpt.c | 6 +++-- drivers/imx/uart/imx_uart.c | 8 ++++-- drivers/imx/usdhc/imx_usdhc.c | 16 ++++++----- drivers/imx/usdhc/imx_usdhc.h | 2 +- drivers/io/io_block.c | 14 +++++----- drivers/io/io_dummy.c | 9 ++++--- drivers/io/io_fip.c | 22 ++++++++------- drivers/io/io_memmap.c | 14 +++++----- drivers/io/io_semihosting.c | 10 +++---- drivers/io/io_storage.c | 7 ++--- drivers/marvell/amb_adec.c | 5 ++-- drivers/marvell/ap807_clocks_init.c | 7 ++--- drivers/marvell/cache_llc.c | 10 ++++--- drivers/marvell/ccu.c | 7 ++--- drivers/marvell/comphy/phy-comphy-3700.c | 11 +++++--- drivers/marvell/comphy/phy-comphy-cp110.c | 10 ++++--- drivers/marvell/gwin.c | 7 ++--- drivers/marvell/io_win.c | 7 ++--- drivers/marvell/iob.c | 9 ++++--- drivers/marvell/mc_trustzone/mc_trustzone.c | 8 +++--- drivers/marvell/mc_trustzone/mc_trustzone.h | 2 +- drivers/marvell/mci.c | 9 ++++--- drivers/marvell/mochi/ap807_setup.c | 15 ++++++----- drivers/marvell/mochi/apn806_setup.c | 15 ++++++----- drivers/marvell/mochi/cp110_setup.c | 11 ++++---- drivers/marvell/thermal.c | 4 +-- drivers/marvell/uart/a3700_console.S | 2 +- drivers/mentor/i2c/mi2cv.c | 10 ++++--- drivers/meson/console/aarch64/meson_console.S | 2 +- drivers/mmc/mmc.c | 11 ++++---- drivers/partition/gpt.c | 7 ++--- drivers/partition/partition.c | 13 ++++----- drivers/renesas/rcar/auth/auth_mod.c | 12 +++++---- drivers/renesas/rcar/avs/avs_driver.c | 7 ++--- drivers/renesas/rcar/board/board.c | 5 +++- drivers/renesas/rcar/common.c | 3 ++- drivers/renesas/rcar/console/rcar_printf.c | 16 ++++++----- drivers/renesas/rcar/cpld/ulcb_cpld.c | 2 +- drivers/renesas/rcar/delay/micro_delay.h | 2 +- drivers/renesas/rcar/dma/dma_driver.c | 8 +++--- drivers/renesas/rcar/emmc/emmc_cmd.c | 3 ++- drivers/renesas/rcar/emmc/emmc_init.c | 4 ++- drivers/renesas/rcar/emmc/emmc_interrupt.c | 6 ++--- drivers/renesas/rcar/emmc/emmc_mount.c | 5 ++-- drivers/renesas/rcar/emmc/emmc_read.c | 2 ++ drivers/renesas/rcar/emmc/emmc_utility.c | 3 ++- drivers/renesas/rcar/iic_dvfs/iic_dvfs.c | 5 ++-- drivers/renesas/rcar/io/io_emmcdrv.c | 7 ++--- drivers/renesas/rcar/io/io_memdrv.c | 7 ++--- drivers/renesas/rcar/io/io_rcar.c | 24 ++++++++++------- drivers/renesas/rcar/pwrc/pwrc.c | 14 +++++----- drivers/renesas/rcar/rom/rom_api.c | 4 ++- drivers/renesas/rcar/rpc/rpc_driver.c | 6 +++-- drivers/renesas/rcar/watchdog/swdt.c | 7 ++--- drivers/st/clk/stm32mp1_clk.c | 31 ++++++++++++---------- drivers/st/clk/stm32mp1_clkfunc.c | 9 ++++--- drivers/st/ddr/stm32mp1_ddr.c | 27 ++++++++++--------- drivers/st/ddr/stm32mp1_ddr_helpers.c | 7 ++--- drivers/st/ddr/stm32mp1_ram.c | 24 ++++++++++------- drivers/st/gpio/stm32_gpio.c | 9 ++++--- drivers/st/io/io_mmc.c | 13 ++++----- drivers/st/io/io_stm32image.c | 19 +++++++------ drivers/st/mmc/stm32_sdmmc2.c | 28 ++++++++++--------- drivers/st/pmic/stm32_i2c.c | 9 ++++--- drivers/st/pmic/stm32mp1_pmic.c | 24 ++++++++++------- drivers/st/pmic/stpmu1.c | 7 ++--- drivers/st/reset/stm32mp1_reset.c | 14 +++++----- drivers/st/uart/aarch32/stm32_console.S | 4 +-- .../staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c | 4 +-- .../renesas/rcar/ddr/ddr_b/boot_init_dram.c | 6 +++-- drivers/staging/renesas/rcar/ddr/dram_sub_func.c | 5 ++-- drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c | 4 ++- .../staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c | 4 +-- .../staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c | 4 ++- drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c | 4 ++- .../staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c | 4 ++- drivers/staging/renesas/rcar/pfc/pfc_init.c | 6 +++-- .../staging/renesas/rcar/qos/E3/qos_init_e3_v10.c | 4 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3_v10.c | 4 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3_v11.c | 5 +++- .../staging/renesas/rcar/qos/H3/qos_init_h3_v20.c | 4 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3_v30.c | 4 ++- .../staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c | 4 ++- .../staging/renesas/rcar/qos/M3/qos_init_m3_v10.c | 4 ++- .../staging/renesas/rcar/qos/M3/qos_init_m3_v11.c | 4 ++- .../renesas/rcar/qos/M3N/qos_init_m3n_v10.c | 4 ++- drivers/staging/renesas/rcar/qos/qos_init.c | 6 +++-- drivers/synopsys/emmc/dw_mmc.c | 15 ++++++----- drivers/synopsys/ufs/dw_ufs.c | 9 ++++--- drivers/ti/uart/aarch64/16550_console.S | 2 +- drivers/ufs/ufs.c | 14 +++++----- 132 files changed, 646 insertions(+), 463 deletions(-) (limited to 'drivers') diff --git a/drivers/allwinner/sunxi_rsb.c b/drivers/allwinner/sunxi_rsb.c index 7075c674d5..67f5b7ec2b 100644 --- a/drivers/allwinner/sunxi_rsb.c +++ b/drivers/allwinner/sunxi_rsb.c @@ -4,10 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include + +#include +#include +#include + #include #define RSB_CTRL 0x00 diff --git a/drivers/arm/cci/cci.c b/drivers/arm/cci/cci.c index 605971cac7..a139f6cc74 100644 --- a/drivers/arm/cci/cci.c +++ b/drivers/arm/cci/cci.c @@ -4,15 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include #include #include +#include +#include +#include +#include +#include + #define MAKE_CCI_PART_NUMBER(hi, lo) (((hi) << 8) | (lo)) #define CCI_PART_LO_MASK U(0xff) #define CCI_PART_HI_MASK U(0xf) diff --git a/drivers/arm/ccn/ccn.c b/drivers/arm/ccn/ccn.c index d46e020891..64b1626970 100644 --- a/drivers/arm/ccn/ccn.c +++ b/drivers/arm/ccn/ccn.c @@ -4,14 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include #include -#include #include + +#include +#include +#include +#include +#include + #include "ccn_private.h" static const ccn_desc_t *ccn_plat_desc; diff --git a/drivers/arm/gic/common/gic_common.c b/drivers/arm/gic/common/gic_common.c index 589de5da40..38b2f67190 100644 --- a/drivers/arm/gic/common/gic_common.c +++ b/drivers/arm/gic/common/gic_common.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include "gic_common_private.h" /******************************************************************************* diff --git a/drivers/arm/gic/common/gic_common_private.h b/drivers/arm/gic/common/gic_common_private.h index 9d9e8c7bac..1ab1bdbef7 100644 --- a/drivers/arm/gic/common/gic_common_private.h +++ b/drivers/arm/gic/common/gic_common_private.h @@ -7,10 +7,11 @@ #ifndef GIC_COMMON_PRIVATE_H #define GIC_COMMON_PRIVATE_H -#include -#include #include +#include +#include + /******************************************************************************* * GIC Distributor interface register accessors that are common to GICv3 & GICv2 ******************************************************************************/ diff --git a/drivers/arm/gic/v2/gicv2_helpers.c b/drivers/arm/gic/v2/gicv2_helpers.c index bc4c1d1658..6739a782c1 100644 --- a/drivers/arm/gic/v2/gicv2_helpers.c +++ b/drivers/arm/gic/v2/gicv2_helpers.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include + #include "../common/gic_common_private.h" #include "gicv2_private.h" diff --git a/drivers/arm/gic/v2/gicv2_main.c b/drivers/arm/gic/v2/gicv2_main.c index b8729056d5..c5d4fe1c37 100644 --- a/drivers/arm/gic/v2/gicv2_main.c +++ b/drivers/arm/gic/v2/gicv2_main.c @@ -4,16 +4,17 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include + #include "../common/gic_common_private.h" #include "gicv2_private.h" diff --git a/drivers/arm/gic/v2/gicv2_private.h b/drivers/arm/gic/v2/gicv2_private.h index ccfad78cd9..0fbdab0a2c 100644 --- a/drivers/arm/gic/v2/gicv2_private.h +++ b/drivers/arm/gic/v2/gicv2_private.h @@ -7,10 +7,11 @@ #ifndef GICV2_PRIVATE_H #define GICV2_PRIVATE_H -#include -#include #include +#include +#include + /******************************************************************************* * Private function prototypes ******************************************************************************/ diff --git a/drivers/arm/gic/v3/arm_gicv3_common.c b/drivers/arm/gic/v3/arm_gicv3_common.c index c809732951..4489892863 100644 --- a/drivers/arm/gic/v3/arm_gicv3_common.c +++ b/drivers/arm/gic/v3/arm_gicv3_common.c @@ -10,12 +10,13 @@ * APIs that are different to those generic ones in GICv3 driver. */ -#include #include -#include + +#include +#include +#include #include "gicv3_private.h" -#include "arm_gicv3_common.h" /* * Flush the internal GIC cache of the LPIs pending tables to memory before diff --git a/drivers/arm/gic/v3/gic600.c b/drivers/arm/gic/v3/gic600.c index eb4fc548f7..9cb2ab25ed 100644 --- a/drivers/arm/gic/v3/gic600.c +++ b/drivers/arm/gic/v3/gic600.c @@ -11,9 +11,10 @@ * GIC600 supports independently power-gating redistributor interface. */ -#include #include -#include + +#include +#include #include "gicv3_private.h" diff --git a/drivers/arm/gic/v3/gicv3_helpers.c b/drivers/arm/gic/v3/gicv3_helpers.c index c12a4b6517..39ea2a3746 100644 --- a/drivers/arm/gic/v3/gicv3_helpers.c +++ b/drivers/arm/gic/v3/gicv3_helpers.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include -#include +#include +#include +#include + #include "../common/gic_common_private.h" #include "gicv3_private.h" diff --git a/drivers/arm/gic/v3/gicv3_main.c b/drivers/arm/gic/v3/gicv3_main.c index 60f2e108a0..cf92f10ba7 100644 --- a/drivers/arm/gic/v3/gicv3_main.c +++ b/drivers/arm/gic/v3/gicv3_main.c @@ -4,13 +4,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include + #include "gicv3_private.h" const gicv3_driver_data_t *gicv3_driver_data; diff --git a/drivers/arm/gic/v3/gicv3_private.h b/drivers/arm/gic/v3/gicv3_private.h index 188e711688..92066e1f2f 100644 --- a/drivers/arm/gic/v3/gicv3_private.h +++ b/drivers/arm/gic/v3/gicv3_private.h @@ -8,10 +8,12 @@ #define GICV3_PRIVATE_H #include -#include -#include -#include #include + +#include +#include +#include + #include "../common/gic_common_private.h" /******************************************************************************* diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index 5d6b95fe3e..ae613b1345 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S @@ -8,7 +8,7 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include +#include #if !MULTI_CONSOLE_API /* diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S index 7fec0904d9..aaa39c11c6 100644 --- a/drivers/arm/pl011/aarch64/pl011_console.S +++ b/drivers/arm/pl011/aarch64/pl011_console.S @@ -8,7 +8,7 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include +#include #if !MULTI_CONSOLE_API /* diff --git a/drivers/arm/pl061/pl061_gpio.c b/drivers/arm/pl061/pl061_gpio.c index af980e5eb2..97013e83fb 100644 --- a/drivers/arm/pl061/pl061_gpio.c +++ b/drivers/arm/pl061/pl061_gpio.c @@ -9,13 +9,14 @@ */ #include -#include -#include #include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include #if !PLAT_PL061_MAX_GPIOS # define PLAT_PL061_MAX_GPIOS 32 diff --git a/drivers/arm/smmu/smmu_v3.c b/drivers/arm/smmu/smmu_v3.c index 78a9ffa6df..004e81e360 100644 --- a/drivers/arm/smmu/smmu_v3.c +++ b/drivers/arm/smmu/smmu_v3.c @@ -5,10 +5,11 @@ */ #include -#include -#include #include +#include +#include + static inline uint32_t __init smmuv3_read_s_idr1(uintptr_t base) { return mmio_read_32(base + SMMU_S_IDR1); diff --git a/drivers/arm/sp804/sp804_delay_timer.c b/drivers/arm/sp804/sp804_delay_timer.c index 8f1c5c51b9..5313fbde2d 100644 --- a/drivers/arm/sp804/sp804_delay_timer.c +++ b/drivers/arm/sp804/sp804_delay_timer.c @@ -5,8 +5,9 @@ */ #include -#include -#include + +#include +#include uintptr_t sp804_base_addr; diff --git a/drivers/arm/sp805/sp805.c b/drivers/arm/sp805/sp805.c index aee90164ac..ffca1ced5b 100644 --- a/drivers/arm/sp805/sp805.c +++ b/drivers/arm/sp805/sp805.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include +#include + /* Inline register access functions */ static inline void sp805_write_wdog_load(uintptr_t base, uint32_t value) diff --git a/drivers/arm/tzc/tzc380.c b/drivers/arm/tzc/tzc380.c index 082161fe57..676df8d804 100644 --- a/drivers/arm/tzc/tzc380.c +++ b/drivers/arm/tzc/tzc380.c @@ -5,10 +5,11 @@ */ #include -#include -#include #include -#include + +#include +#include +#include struct tzc380_instance { uintptr_t base; diff --git a/drivers/arm/tzc/tzc400.c b/drivers/arm/tzc/tzc400.c index d27b010294..50d6701398 100644 --- a/drivers/arm/tzc/tzc400.c +++ b/drivers/arm/tzc/tzc400.c @@ -5,10 +5,12 @@ */ #include -#include -#include #include -#include + +#include +#include +#include + #include "tzc_common_private.h" /* diff --git a/drivers/arm/tzc/tzc_common_private.h b/drivers/arm/tzc/tzc_common_private.h index efac850712..c800536f33 100644 --- a/drivers/arm/tzc/tzc_common_private.h +++ b/drivers/arm/tzc/tzc_common_private.h @@ -9,8 +9,8 @@ #include #include -#include -#include +#include +#include #define DEFINE_TZC_COMMON_WRITE_ACTION(fn_name, macro_name) \ static inline void _tzc##fn_name##_write_action( \ diff --git a/drivers/arm/tzc/tzc_dmc500.c b/drivers/arm/tzc/tzc_dmc500.c index f0aba9c197..e45fbf8d8a 100644 --- a/drivers/arm/tzc/tzc_dmc500.c +++ b/drivers/arm/tzc/tzc_dmc500.c @@ -5,10 +5,12 @@ */ #include -#include -#include -#include -#include "tzc_common.h" + +#include +#include +#include +#include + #include "tzc_common_private.h" /* diff --git a/drivers/arm/tzc/tzc_dmc620.c b/drivers/arm/tzc/tzc_dmc620.c index 4abd0800b1..64ec5abee7 100644 --- a/drivers/arm/tzc/tzc_dmc620.c +++ b/drivers/arm/tzc/tzc_dmc620.c @@ -5,9 +5,10 @@ */ #include -#include -#include -#include + +#include +#include +#include /* Mask to extract bit 31 to 16 */ #define MASK_31_16 UINT64_C(0x0000ffff0000) diff --git a/drivers/auth/auth_mod.c b/drivers/auth/auth_mod.c index eb537b66a1..1b8ff82bca 100644 --- a/drivers/auth/auth_mod.c +++ b/drivers/auth/auth_mod.c @@ -5,17 +5,19 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include +#include + +#include +#include +#include +#include +#include +#include +#include + /* ASN.1 tags */ #define ASN1_INTEGER 0x02 diff --git a/drivers/auth/crypto_mod.c b/drivers/auth/crypto_mod.c index 4cd05506b2..5e5ac2b03d 100644 --- a/drivers/auth/crypto_mod.c +++ b/drivers/auth/crypto_mod.c @@ -5,8 +5,9 @@ */ #include -#include -#include + +#include +#include /* Variable exported by the crypto library through REGISTER_CRYPTO_LIB() */ diff --git a/drivers/auth/cryptocell/cryptocell_crypto.c b/drivers/auth/cryptocell/cryptocell_crypto.c index 80c10933e9..a507d0a421 100644 --- a/drivers/auth/cryptocell/cryptocell_crypto.c +++ b/drivers/auth/cryptocell/cryptocell_crypto.c @@ -4,20 +4,22 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/drivers/auth/cryptocell/cryptocell_crypto.mk b/drivers/auth/cryptocell/cryptocell_crypto.mk index a88dcfc579..a631829fda 100644 --- a/drivers/auth/cryptocell/cryptocell_crypto.mk +++ b/drivers/auth/cryptocell/cryptocell_crypto.mk @@ -20,9 +20,7 @@ endif TF_LDFLAGS += -L$(CCSBROM_LIB_PATH) LDLIBS += -lcc_712sbromx509 -INCLUDES += -Iinclude/drivers/arm/cryptocell - CRYPTOCELL_SOURCES := drivers/auth/cryptocell/cryptocell_crypto.c BL1_SOURCES += ${CRYPTOCELL_SOURCES} -BL2_SOURCES += ${CRYPTOCELL_SOURCES} \ No newline at end of file +BL2_SOURCES += ${CRYPTOCELL_SOURCES} diff --git a/drivers/auth/img_parser_mod.c b/drivers/auth/img_parser_mod.c index 63160141d7..c4688f8675 100644 --- a/drivers/auth/img_parser_mod.c +++ b/drivers/auth/img_parser_mod.c @@ -5,14 +5,15 @@ */ #include -#include -#include #include -#include #include #include #include -#include + +#include +#include +#include +#include IMPORT_SYM(uintptr_t, __PARSER_LIB_DESCS_START__, PARSER_LIB_DESCS_START); IMPORT_SYM(uintptr_t, __PARSER_LIB_DESCS_END__, PARSER_LIB_DESCS_END); diff --git a/drivers/auth/mbedtls/mbedtls_common.c b/drivers/auth/mbedtls/mbedtls_common.c index dbf45baebd..b6d02fd108 100644 --- a/drivers/auth/mbedtls/mbedtls_common.c +++ b/drivers/auth/mbedtls/mbedtls_common.c @@ -5,14 +5,16 @@ */ #include -#include +#include + /* mbed TLS headers */ #include #include -#include -#include -#include -#include + +#include +#include +#include +#include static void cleanup(void) { diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk index cfbd86ab93..63e65bd47c 100644 --- a/drivers/auth/mbedtls/mbedtls_common.mk +++ b/drivers/auth/mbedtls/mbedtls_common.mk @@ -14,10 +14,9 @@ ifeq (${MBEDTLS_DIR},) endif MBEDTLS_INC = -I${MBEDTLS_DIR}/include -INCLUDES += -Iinclude/drivers/auth/mbedtls # Specify mbed TLS configuration file -MBEDTLS_CONFIG_FILE := "" +MBEDTLS_CONFIG_FILE := "" $(eval $(call add_define,MBEDTLS_CONFIG_FILE)) MBEDTLS_SOURCES += drivers/auth/mbedtls/mbedtls_common.c diff --git a/drivers/auth/mbedtls/mbedtls_crypto.c b/drivers/auth/mbedtls/mbedtls_crypto.c index bc9ed3a85e..33420fbbd1 100644 --- a/drivers/auth/mbedtls/mbedtls_crypto.c +++ b/drivers/auth/mbedtls/mbedtls_crypto.c @@ -4,10 +4,6 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include #include #include @@ -17,6 +13,11 @@ #include #include +#include +#include +#include +#include + #define LIB_NAME "mbed TLS" /* diff --git a/drivers/auth/mbedtls/mbedtls_x509_parser.c b/drivers/auth/mbedtls/mbedtls_x509_parser.c index bda1208af9..129566bd69 100644 --- a/drivers/auth/mbedtls/mbedtls_x509_parser.c +++ b/drivers/auth/mbedtls/mbedtls_x509_parser.c @@ -12,20 +12,21 @@ * extensions field, such as an image hash or a public key. */ -#include #include -#include -#include #include #include #include -#include /* mbed TLS headers */ #include #include #include +#include +#include +#include +#include + /* Maximum OID string length ("a.b.c.d.e.f ...") */ #define MAX_OID_STR_LEN 64 diff --git a/drivers/auth/tbbr/tbbr_cot.c b/drivers/auth/tbbr/tbbr_cot.c index a950a7a8d4..ec14a185d1 100644 --- a/drivers/auth/tbbr/tbbr_cot.c +++ b/drivers/auth/tbbr/tbbr_cot.c @@ -4,12 +4,13 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include + +#include #if USE_TBBR_DEFS -#include +#include #else #include #endif diff --git a/drivers/cadence/uart/aarch64/cdns_console.S b/drivers/cadence/uart/aarch64/cdns_console.S index 418810e15c..43d08f4545 100644 --- a/drivers/cadence/uart/aarch64/cdns_console.S +++ b/drivers/cadence/uart/aarch64/cdns_console.S @@ -6,9 +6,9 @@ #include #include #include -#include #define USE_FINISH_CONSOLE_REG_2 #include +#include /* * "core" functions are low-level implementations that don't require diff --git a/drivers/cfi/v2m/v2m_flash.c b/drivers/cfi/v2m/v2m_flash.c index 9b80e2f2a1..aadafbce23 100644 --- a/drivers/cfi/v2m/v2m_flash.c +++ b/drivers/cfi/v2m/v2m_flash.c @@ -5,8 +5,9 @@ */ #include -#include -#include + +#include +#include /* * This file supplies a low level interface to the vexpress NOR flash diff --git a/drivers/console/multi_console.c b/drivers/console/multi_console.c index c678de0989..e94de35c7c 100644 --- a/drivers/console/multi_console.c +++ b/drivers/console/multi_console.c @@ -7,6 +7,7 @@ #if MULTI_CONSOLE_API #include + #include console_t *console_list; diff --git a/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S b/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S index 89be349c0e..4c14b69c51 100644 --- a/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S +++ b/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S @@ -5,9 +5,9 @@ */ #include -#include #define USE_FINISH_CONSOLE_REG_2 #include +#include /* * This driver implements access to coreboot's in-memory console diff --git a/drivers/delay_timer/delay_timer.c b/drivers/delay_timer/delay_timer.c index feac3579fe..8c2996ec32 100644 --- a/drivers/delay_timer/delay_timer.c +++ b/drivers/delay_timer/delay_timer.c @@ -5,9 +5,11 @@ */ #include -#include + #include -#include + +#include +#include /*********************************************************** * The delay timer implementation diff --git a/drivers/delay_timer/generic_delay_timer.c b/drivers/delay_timer/generic_delay_timer.c index 03ca5321a7..4b67ed0d14 100644 --- a/drivers/delay_timer/generic_delay_timer.c +++ b/drivers/delay_timer/generic_delay_timer.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include /* Ticks elapsed in one second by a signal of 1 MHz */ #define MHZ_TICKS_PER_SEC 1000000 diff --git a/drivers/gpio/gpio.c b/drivers/gpio/gpio.c index 62f3dc2539..76612b253e 100644 --- a/drivers/gpio/gpio.c +++ b/drivers/gpio/gpio.c @@ -11,7 +11,8 @@ #include #include -#include + +#include /* * The gpio implementation diff --git a/drivers/imx/timer/imx_gpt.c b/drivers/imx/timer/imx_gpt.c index bd364eb307..464efe93fe 100644 --- a/drivers/imx/timer/imx_gpt.c +++ b/drivers/imx/timer/imx_gpt.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include #define GPTCR_SWR BIT(15) /* Software reset */ diff --git a/drivers/imx/uart/imx_uart.c b/drivers/imx/uart/imx_uart.c index 0250a41426..68d31c8870 100644 --- a/drivers/imx/uart/imx_uart.c +++ b/drivers/imx/uart/imx_uart.c @@ -3,10 +3,14 @@ * * SPDX-License-Identifier: BSD-3-Clause */ -#include + #include -#include + #include + +#include +#include + #include /* TX/RX FIFO threshold */ diff --git a/drivers/imx/usdhc/imx_usdhc.c b/drivers/imx/usdhc/imx_usdhc.c index 1f9550e172..07f55b7843 100644 --- a/drivers/imx/usdhc/imx_usdhc.c +++ b/drivers/imx/usdhc/imx_usdhc.c @@ -4,17 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include +#include + +#include + static void imx_usdhc_initialize(void); static int imx_usdhc_send_cmd(struct mmc_cmd *cmd); static int imx_usdhc_set_ios(unsigned int clk, unsigned int width); diff --git a/drivers/imx/usdhc/imx_usdhc.h b/drivers/imx/usdhc/imx_usdhc.h index 9ff3298dfd..e063316aee 100644 --- a/drivers/imx/usdhc/imx_usdhc.h +++ b/drivers/imx/usdhc/imx_usdhc.h @@ -7,7 +7,7 @@ #ifndef IMX_USDHC_H #define IMX_USDHC_H -#include +#include typedef struct imx_usdhc_params { uintptr_t reg_base; diff --git a/drivers/io/io_block.c b/drivers/io/io_block.c index ff13113afb..f190a4307b 100644 --- a/drivers/io/io_block.c +++ b/drivers/io/io_block.c @@ -5,14 +5,16 @@ */ #include -#include #include -#include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include +#include typedef struct { io_block_dev_spec_t *dev_spec; diff --git a/drivers/io/io_dummy.c b/drivers/io/io_dummy.c index d4020e3a6d..4f0cda6daf 100644 --- a/drivers/io/io_dummy.c +++ b/drivers/io/io_dummy.c @@ -5,12 +5,13 @@ */ #include -#include -#include -#include -#include #include +#include +#include +#include +#include + struct file_state { int in_use; size_t size; diff --git a/drivers/io/io_fip.c b/drivers/io/io_fip.c index 9d6c763e89..d4771b5147 100644 --- a/drivers/io/io_fip.c +++ b/drivers/io/io_fip.c @@ -5,19 +5,21 @@ */ #include -#include -#include #include -#include -#include -#include -#include -#include -#include #include #include -#include -#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include #ifndef MAX_FIP_DEVICES #define MAX_FIP_DEVICES 1 diff --git a/drivers/io/io_memmap.c b/drivers/io/io_memmap.c index 5595e60a42..96590b6c03 100644 --- a/drivers/io/io_memmap.c +++ b/drivers/io/io_memmap.c @@ -5,13 +5,15 @@ */ #include -#include -#include -#include -#include -#include #include -#include + +#include + +#include +#include +#include +#include +#include /* As we need to be able to keep state for seek, only one file can be open * at a time. Make this a structure and point to the entity->info. When we diff --git a/drivers/io/io_semihosting.c b/drivers/io/io_semihosting.c index 9ca0a9dc9c..23d09c1188 100644 --- a/drivers/io/io_semihosting.c +++ b/drivers/io/io_semihosting.c @@ -5,13 +5,13 @@ */ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* Identify the device type as semihosting */ static io_type_t device_type_sh(void) diff --git a/drivers/io/io_storage.c b/drivers/io/io_storage.c index 948f848137..c9ff31bcc4 100644 --- a/drivers/io/io_storage.c +++ b/drivers/io/io_storage.c @@ -5,11 +5,12 @@ */ #include -#include -#include -#include #include +#include + +#include +#include /* Storage for a fixed maximum number of IO entities, definable by platform */ static io_entity_t entity_pool[MAX_IO_HANDLES]; diff --git a/drivers/marvell/amb_adec.c b/drivers/marvell/amb_adec.c index 16fe772dac..1f671058d5 100644 --- a/drivers/marvell/amb_adec.c +++ b/drivers/marvell/amb_adec.c @@ -7,9 +7,10 @@ /* AXI to M-Bridge decoding unit driver for Marvell Armada 8K and 8K+ SoCs */ +#include +#include + #include -#include -#include #include #include diff --git a/drivers/marvell/ap807_clocks_init.c b/drivers/marvell/ap807_clocks_init.c index 841e6aeb4e..04c256b614 100644 --- a/drivers/marvell/ap807_clocks_init.c +++ b/drivers/marvell/ap807_clocks_init.c @@ -5,10 +5,11 @@ * https://spdx.org/licenses */ +#include +#include +#include + #include -#include -#include -#include /* Notify bootloader on DRAM setup */ #define AP807_CPU_ARO_CTRL(cluster) \ diff --git a/drivers/marvell/cache_llc.c b/drivers/marvell/cache_llc.c index e13e6ce2f8..3df93a43ba 100644 --- a/drivers/marvell/cache_llc.c +++ b/drivers/marvell/cache_llc.c @@ -9,11 +9,13 @@ * for Marvell SoCs in AP806, AP807, and AP810 */ -#include #include -#include -#include -#include + +#include +#include +#include +#include + #include #define CCU_HTC_CR(ap_index) (MVEBU_CCU_BASE(ap_index) + 0x200) diff --git a/drivers/marvell/ccu.c b/drivers/marvell/ccu.c index acb1c00c0b..1e4ab44daf 100644 --- a/drivers/marvell/ccu.c +++ b/drivers/marvell/ccu.c @@ -7,10 +7,11 @@ /* CCU unit device driver for Marvell AP807, AP807 and AP810 SoCs */ +#include +#include +#include + #include -#include -#include -#include #include #include diff --git a/drivers/marvell/comphy/phy-comphy-3700.c b/drivers/marvell/comphy/phy-comphy-3700.c index 53a59b0f59..2e8c4128e7 100644 --- a/drivers/marvell/comphy/phy-comphy-3700.c +++ b/drivers/marvell/comphy/phy-comphy-3700.c @@ -5,13 +5,16 @@ * https://spdx.org/licenses */ -#include -#include #include -#include + +#include +#include +#include +#include + #include #include -#include + #include "phy-comphy-3700.h" #include "phy-comphy-common.h" diff --git a/drivers/marvell/comphy/phy-comphy-cp110.c b/drivers/marvell/comphy/phy-comphy-cp110.c index 86e5f1c68e..384dd39f23 100644 --- a/drivers/marvell/comphy/phy-comphy-cp110.c +++ b/drivers/marvell/comphy/phy-comphy-cp110.c @@ -7,12 +7,14 @@ /* Marvell CP110 SoC COMPHY unit driver */ -#include -#include #include -#include + +#include +#include +#include +#include + #include -#include #include "mvebu.h" #include "comphy-cp110.h" #include "phy-comphy-cp110.h" diff --git a/drivers/marvell/gwin.c b/drivers/marvell/gwin.c index a4743eb5e2..9d94308365 100644 --- a/drivers/marvell/gwin.c +++ b/drivers/marvell/gwin.c @@ -7,10 +7,11 @@ /* GWIN unit device driver for Marvell AP810 SoC */ +#include +#include +#include + #include -#include -#include -#include #include #include diff --git a/drivers/marvell/io_win.c b/drivers/marvell/io_win.c index c0424e0861..c4257fa7c1 100644 --- a/drivers/marvell/io_win.c +++ b/drivers/marvell/io_win.c @@ -7,10 +7,11 @@ /* IO Window unit device driver for Marvell AP807, AP807 and AP810 SoCs */ +#include +#include +#include + #include -#include -#include -#include #include #include diff --git a/drivers/marvell/iob.c b/drivers/marvell/iob.c index e88bc16730..87f147aa40 100644 --- a/drivers/marvell/iob.c +++ b/drivers/marvell/iob.c @@ -7,11 +7,12 @@ /* IOW unit device driver for Marvell CP110 and CP115 SoCs */ -#include #include -#include -#include -#include +#include +#include +#include + +#include #include #include diff --git a/drivers/marvell/mc_trustzone/mc_trustzone.c b/drivers/marvell/mc_trustzone/mc_trustzone.c index 0db3b8d099..52b3006769 100644 --- a/drivers/marvell/mc_trustzone/mc_trustzone.c +++ b/drivers/marvell/mc_trustzone/mc_trustzone.c @@ -5,10 +5,12 @@ * https://spdx.org/licenses */ -#include -#include -#include +#include +#include +#include + #include + #include "mc_trustzone.h" #define TZ_SIZE(x) ((x) >> 13) diff --git a/drivers/marvell/mc_trustzone/mc_trustzone.h b/drivers/marvell/mc_trustzone/mc_trustzone.h index d36dcb5c09..296dce8536 100644 --- a/drivers/marvell/mc_trustzone/mc_trustzone.h +++ b/drivers/marvell/mc_trustzone/mc_trustzone.h @@ -8,7 +8,7 @@ #ifndef MC_TRUSTZONE_H #define MC_TRUSTZONE_H -#include +#include #define MVEBU_TZ_MAX_WINS 16 diff --git a/drivers/marvell/mci.c b/drivers/marvell/mci.c index 721504e03a..3a9859c98c 100644 --- a/drivers/marvell/mci.c +++ b/drivers/marvell/mci.c @@ -7,10 +7,11 @@ /* MCI bus driver for Marvell ARMADA 8K and 8K+ SoCs */ -#include -#include -#include -#include +#include +#include +#include +#include + #include #include #include diff --git a/drivers/marvell/mochi/ap807_setup.c b/drivers/marvell/mochi/ap807_setup.c index 075ca31f83..864c9230a1 100644 --- a/drivers/marvell/mochi/ap807_setup.c +++ b/drivers/marvell/mochi/ap807_setup.c @@ -7,13 +7,14 @@ /* AP807 Marvell SoC driver */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include + #include #define SMMU_sACR (MVEBU_SMMU_BASE + 0x10) diff --git a/drivers/marvell/mochi/apn806_setup.c b/drivers/marvell/mochi/apn806_setup.c index 1d33be93a0..1e91c4317c 100644 --- a/drivers/marvell/mochi/apn806_setup.c +++ b/drivers/marvell/mochi/apn806_setup.c @@ -7,13 +7,14 @@ /* AP806 Marvell SoC driver */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include + #include #define SMMU_sACR (MVEBU_SMMU_BASE + 0x10) diff --git a/drivers/marvell/mochi/cp110_setup.c b/drivers/marvell/mochi/cp110_setup.c index 654bb62b2d..d7d7373180 100644 --- a/drivers/marvell/mochi/cp110_setup.c +++ b/drivers/marvell/mochi/cp110_setup.c @@ -7,11 +7,12 @@ /* CP110 Marvell SoC driver */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + #include /* diff --git a/drivers/marvell/thermal.c b/drivers/marvell/thermal.c index c7ceb92918..a501ab44ea 100644 --- a/drivers/marvell/thermal.c +++ b/drivers/marvell/thermal.c @@ -7,8 +7,8 @@ /* Driver for thermal unit located in Marvell ARMADA 8K and compatible SoCs */ -#include -#include +#include +#include int marvell_thermal_init(struct tsen_config *tsen_cfg) { diff --git a/drivers/marvell/uart/a3700_console.S b/drivers/marvell/uart/a3700_console.S index 25c21cfcd8..cc3855dbb7 100644 --- a/drivers/marvell/uart/a3700_console.S +++ b/drivers/marvell/uart/a3700_console.S @@ -7,9 +7,9 @@ #include #include -#include #define USE_FINISH_CONSOLE_REG_2 #include +#include /* * "core" functions are low-level implementations that don't require diff --git a/drivers/mentor/i2c/mi2cv.c b/drivers/mentor/i2c/mi2cv.c index 8ebd9662b1..1cdcf7478c 100644 --- a/drivers/mentor/i2c/mi2cv.c +++ b/drivers/mentor/i2c/mi2cv.c @@ -11,12 +11,14 @@ * for Marvell and Allwinner SoCs in ATF. */ -#include -#include #include -#include + +#include +#include +#include +#include + #include -#include #if LOG_LEVEL >= LOG_LEVEL_VERBOSE #define DEBUG_I2C diff --git a/drivers/meson/console/aarch64/meson_console.S b/drivers/meson/console/aarch64/meson_console.S index eaee10ef1e..5cf9b88785 100644 --- a/drivers/meson/console/aarch64/meson_console.S +++ b/drivers/meson/console/aarch64/meson_console.S @@ -8,7 +8,7 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include +#include .globl console_meson_register .globl console_meson_init diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 4160003c8f..50e87c1db4 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -6,15 +6,16 @@ /* Define a simple and generic interface to access eMMC and SD-card devices. */ -#include #include -#include -#include #include -#include #include #include -#include + +#include +#include +#include +#include +#include #define MMC_DEFAULT_MAX_RETRIES 5 #define SEND_OP_COND_MAX_RETRIES 100 diff --git a/drivers/partition/gpt.c b/drivers/partition/gpt.c index 0c51e62a87..4577f06a20 100644 --- a/drivers/partition/gpt.c +++ b/drivers/partition/gpt.c @@ -5,11 +5,12 @@ */ #include -#include #include -#include #include -#include + +#include +#include +#include static int unicode_to_ascii(unsigned short *str_in, unsigned char *str_out) { diff --git a/drivers/partition/partition.c b/drivers/partition/partition.c index 6085b8651b..07869acf50 100644 --- a/drivers/partition/partition.c +++ b/drivers/partition/partition.c @@ -5,15 +5,16 @@ */ #include -#include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include + static uint8_t mbr_sector[PARTITION_BLOCK_SIZE]; partition_entry_list_t list; diff --git a/drivers/renesas/rcar/auth/auth_mod.c b/drivers/renesas/rcar/auth/auth_mod.c index 04ed279287..d9446d95e0 100644 --- a/drivers/renesas/rcar/auth/auth_mod.c +++ b/drivers/renesas/rcar/auth/auth_mod.c @@ -5,13 +5,15 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include -#include -#include #include +#include + +#include +#include +#include +#include + #include "rom_api.h" typedef int32_t(*secure_boot_api_f) (uint32_t a, uint32_t b, void *c); diff --git a/drivers/renesas/rcar/avs/avs_driver.c b/drivers/renesas/rcar/avs/avs_driver.c index 80a7c91909..647869ede4 100644 --- a/drivers/renesas/rcar/avs/avs_driver.c +++ b/drivers/renesas/rcar/avs/avs_driver.c @@ -4,9 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include +#include +#include +#include + #include "cpg_registers.h" #include "avs_driver.h" #include "rcar_def.h" diff --git a/drivers/renesas/rcar/board/board.c b/drivers/renesas/rcar/board/board.c index 147a0b0c38..f15e06bc08 100644 --- a/drivers/renesas/rcar/board/board.c +++ b/drivers/renesas/rcar/board/board.c @@ -6,9 +6,12 @@ */ #include + +#include + #include + #include "board.h" -#include "utils_def.h" #ifndef BOARD_DEFAULT #if (RCAR_LSI == RCAR_E3) diff --git a/drivers/renesas/rcar/common.c b/drivers/renesas/rcar/common.c index e82e8b5214..42bdce5797 100644 --- a/drivers/renesas/rcar/common.c +++ b/drivers/renesas/rcar/common.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "rcar_private.h" void diff --git a/drivers/renesas/rcar/console/rcar_printf.c b/drivers/renesas/rcar/console/rcar_printf.c index 9321b584ad..2a6e2c0032 100644 --- a/drivers/renesas/rcar/console/rcar_printf.c +++ b/drivers/renesas/rcar/console/rcar_printf.c @@ -4,16 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include #include -#include -#include -#include -#include "rcar_def.h" -#include "rcar_private.h" -#include "rcar_printf.h" +#include + +#include +#include +#include + +#include "rcar_def.h" +#include "rcar_private.h" +#include "rcar_printf.h" #define INDEX_TIMER_COUNT (4U) diff --git a/drivers/renesas/rcar/cpld/ulcb_cpld.c b/drivers/renesas/rcar/cpld/ulcb_cpld.c index 92e438a4f1..d7192f48d9 100644 --- a/drivers/renesas/rcar/cpld/ulcb_cpld.c +++ b/drivers/renesas/rcar/cpld/ulcb_cpld.c @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include #define SCLK 8 /* GP_6_8 */ #define SSTBZ 3 /* GP_2_3 */ diff --git a/drivers/renesas/rcar/delay/micro_delay.h b/drivers/renesas/rcar/delay/micro_delay.h index 458959fd8d..4e4b28babc 100644 --- a/drivers/renesas/rcar/delay/micro_delay.h +++ b/drivers/renesas/rcar/delay/micro_delay.h @@ -10,7 +10,7 @@ #define TMU3_MEASUREMENT (0) #ifndef __ASSEMBLY__ -#include "stdint.h" +#include void rcar_micro_delay(uint32_t count_us); #if (TMU3_MEASUREMENT == 1) diff --git a/drivers/renesas/rcar/dma/dma_driver.c b/drivers/renesas/rcar/dma/dma_driver.c index d4fa65d263..fef55c477a 100644 --- a/drivers/renesas/rcar/dma/dma_driver.c +++ b/drivers/renesas/rcar/dma/dma_driver.c @@ -5,12 +5,14 @@ */ #include -#include #include -#include + +#include +#include +#include + #include "rcar_def.h" #include "cpg_registers.h" -#include "debug.h" #include "rcar_private.h" /* DMA CHANNEL setting (0/16/32) */ diff --git a/drivers/renesas/rcar/emmc/emmc_cmd.c b/drivers/renesas/rcar/emmc/emmc_cmd.c index 0f393490cc..a2e25e3394 100644 --- a/drivers/renesas/rcar/emmc/emmc_cmd.c +++ b/drivers/renesas/rcar/emmc/emmc_cmd.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/emmc/emmc_init.c b/drivers/renesas/rcar/emmc/emmc_init.c index 386fb1e4ec..b27e165862 100644 --- a/drivers/renesas/rcar/emmc/emmc_init.c +++ b/drivers/renesas/rcar/emmc/emmc_init.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/emmc/emmc_interrupt.c b/drivers/renesas/rcar/emmc/emmc_interrupt.c index 3077db4c03..37a3cf9d43 100644 --- a/drivers/renesas/rcar/emmc/emmc_interrupt.c +++ b/drivers/renesas/rcar/emmc/emmc_interrupt.c @@ -5,6 +5,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include + +#include #include "emmc_config.h" #include "emmc_def.h" @@ -13,9 +16,6 @@ #include "emmc_std.h" #include "rcar_def.h" -#include -#include - static EMMC_ERROR_CODE emmc_trans_sector(uint32_t *buff_address_virtual); uint32_t emmc_interrupt(void) diff --git a/drivers/renesas/rcar/emmc/emmc_mount.c b/drivers/renesas/rcar/emmc/emmc_mount.c index 9a7d2cad63..dd57b0c249 100644 --- a/drivers/renesas/rcar/emmc/emmc_mount.c +++ b/drivers/renesas/rcar/emmc/emmc_mount.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/emmc/emmc_read.c b/drivers/renesas/rcar/emmc/emmc_read.c index b11c2c43ef..390d0caac1 100644 --- a/drivers/renesas/rcar/emmc/emmc_read.c +++ b/drivers/renesas/rcar/emmc/emmc_read.c @@ -3,7 +3,9 @@ * * SPDX-License-Identifier: BSD-3-Clause */ + #include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/emmc/emmc_utility.c b/drivers/renesas/rcar/emmc/emmc_utility.c index e64947ddc7..39d9ede5ac 100644 --- a/drivers/renesas/rcar/emmc/emmc_utility.c +++ b/drivers/renesas/rcar/emmc/emmc_utility.c @@ -4,7 +4,8 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include + #include "emmc_config.h" #include "emmc_hal.h" #include "emmc_std.h" diff --git a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c index 11d52bf76d..39b9bb4e3c 100644 --- a/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c +++ b/drivers/renesas/rcar/iic_dvfs/iic_dvfs.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "rcar_def.h" #include "cpg_registers.h" #include "iic_dvfs.h" diff --git a/drivers/renesas/rcar/io/io_emmcdrv.c b/drivers/renesas/rcar/io/io_emmcdrv.c index f74bd5f4ea..4b464fb3e4 100644 --- a/drivers/renesas/rcar/io/io_emmcdrv.c +++ b/drivers/renesas/rcar/io/io_emmcdrv.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + #include "io_common.h" #include "io_emmcdrv.h" #include "io_private.h" diff --git a/drivers/renesas/rcar/io/io_memdrv.c b/drivers/renesas/rcar/io/io_memdrv.c index e55fd64665..3f6b4c71b1 100644 --- a/drivers/renesas/rcar/io/io_memdrv.c +++ b/drivers/renesas/rcar/io/io_memdrv.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + #include "io_common.h" #include "io_private.h" #include "io_memdrv.h" diff --git a/drivers/renesas/rcar/io/io_rcar.c b/drivers/renesas/rcar/io/io_rcar.c index 4293c51c58..650931bb45 100644 --- a/drivers/renesas/rcar/io/io_rcar.c +++ b/drivers/renesas/rcar/io/io_rcar.c @@ -4,23 +4,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include -#include -#include -#include -#include #include #include -#include -#include + +#include + #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include "io_rcar.h" #include "io_common.h" #include "io_private.h" + extern int32_t plat_get_drv_source(uint32_t id, uintptr_t *dev, uintptr_t *image_spec); diff --git a/drivers/renesas/rcar/pwrc/pwrc.c b/drivers/renesas/rcar/pwrc/pwrc.c index 6dfc0b69f4..8cdfe75e54 100644 --- a/drivers/renesas/rcar/pwrc/pwrc.c +++ b/drivers/renesas/rcar/pwrc/pwrc.c @@ -4,14 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include #include -#include + +#include +#include +#include +#include +#include +#include + #include "iic_dvfs.h" #include "rcar_def.h" #include "rcar_private.h" diff --git a/drivers/renesas/rcar/rom/rom_api.c b/drivers/renesas/rcar/rom/rom_api.c index c14de55b6a..be38fbff3f 100644 --- a/drivers/renesas/rcar/rom/rom_api.c +++ b/drivers/renesas/rcar/rom/rom_api.c @@ -4,8 +4,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + +#include + #include "rcar_def.h" #include "rom_api.h" diff --git a/drivers/renesas/rcar/rpc/rpc_driver.c b/drivers/renesas/rcar/rpc/rpc_driver.c index bc7424ac61..bea2752101 100644 --- a/drivers/renesas/rcar/rpc/rpc_driver.c +++ b/drivers/renesas/rcar/rpc/rpc_driver.c @@ -4,12 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include #include + +#include +#include + #include "cpg_registers.h" #include "rpc_registers.h" -#include "debug.h" #include "rcar_private.h" #define MSTPSR9_RPC_BIT (0x00020000U) diff --git a/drivers/renesas/rcar/watchdog/swdt.c b/drivers/renesas/rcar/watchdog/swdt.c index f9dbf86fe4..42f8653495 100644 --- a/drivers/renesas/rcar/watchdog/swdt.c +++ b/drivers/renesas/rcar/watchdog/swdt.c @@ -5,9 +5,10 @@ */ #include -#include -#include -#include +#include +#include +#include + #include "rcar_def.h" extern void gicd_set_icenabler(uintptr_t base, unsigned int id); diff --git a/drivers/st/clk/stm32mp1_clk.c b/drivers/st/clk/stm32mp1_clk.c index b8457cb37b..7a8898672d 100644 --- a/drivers/st/clk/stm32mp1_clk.c +++ b/drivers/st/clk/stm32mp1_clk.c @@ -4,26 +4,29 @@ * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ -#include -#include #include -#include -#include -#include -#include #include -#include -#include -#include -#include #include #include -#include -#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include #include -#include -#include #define MAX_HSI_HZ 64000000 diff --git a/drivers/st/clk/stm32mp1_clkfunc.c b/drivers/st/clk/stm32mp1_clkfunc.c index 078d803e70..179191945f 100644 --- a/drivers/st/clk/stm32mp1_clkfunc.c +++ b/drivers/st/clk/stm32mp1_clkfunc.c @@ -4,11 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include + #include -#include -#include + +#include +#include +#include + #include #define DT_RCC_NODE_NAME "rcc@50000000" diff --git a/drivers/st/ddr/stm32mp1_ddr.c b/drivers/st/ddr/stm32mp1_ddr.c index eed1d7613d..a2b0e9ec05 100644 --- a/drivers/st/ddr/stm32mp1_ddr.c +++ b/drivers/st/ddr/stm32mp1_ddr.c @@ -4,22 +4,25 @@ * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ +#include + #include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include -#include +#include +#include + +#include #include -#include -#include -#include -#include struct reg_desc { const char *name; diff --git a/drivers/st/ddr/stm32mp1_ddr_helpers.c b/drivers/st/ddr/stm32mp1_ddr_helpers.c index 325c0b897a..a8c1b7769a 100644 --- a/drivers/st/ddr/stm32mp1_ddr_helpers.c +++ b/drivers/st/ddr/stm32mp1_ddr_helpers.c @@ -4,10 +4,11 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include + +#include +#include +#include void ddr_enable_clock(void) { diff --git a/drivers/st/ddr/stm32mp1_ram.c b/drivers/st/ddr/stm32mp1_ram.c index 6d515ec76a..1c82179179 100644 --- a/drivers/st/ddr/stm32mp1_ram.c +++ b/drivers/st/ddr/stm32mp1_ram.c @@ -4,21 +4,25 @@ * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause */ -#include -#include -#include -#include #include + #include -#include + #include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include #include -#include -#include #define DDR_PATTERN 0xAAAAAAAAU #define DDR_ANTIPATTERN 0x55555555U diff --git a/drivers/st/gpio/stm32_gpio.c b/drivers/st/gpio/stm32_gpio.c index 200b47340a..9591e3738d 100644 --- a/drivers/st/gpio/stm32_gpio.c +++ b/drivers/st/gpio/stm32_gpio.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include -#include + +#include +#include +#include +#include static bool check_gpio(uint32_t bank, uint32_t pin) { diff --git a/drivers/st/io/io_mmc.c b/drivers/st/io/io_mmc.c index 1ed2620576..a239b5f3ad 100644 --- a/drivers/st/io/io_mmc.c +++ b/drivers/st/io/io_mmc.c @@ -5,15 +5,16 @@ */ #include -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include + /* SDMMC device functions */ static int mmc_dev_open(const uintptr_t init_params, io_dev_info_t **dev_info); static int mmc_block_open(io_dev_info_t *dev_info, const uintptr_t spec, diff --git a/drivers/st/io/io_stm32image.c b/drivers/st/io/io_stm32image.c index e6798e0479..ba612e2e93 100644 --- a/drivers/st/io/io_stm32image.c +++ b/drivers/st/io/io_stm32image.c @@ -5,17 +5,20 @@ */ #include -#include -#include #include -#include -#include -#include -#include -#include #include #include -#include + +#include + +#include +#include +#include +#include +#include +#include + +#include static uintptr_t backend_dev_handle; static uintptr_t backend_image_spec; diff --git a/drivers/st/mmc/stm32_sdmmc2.c b/drivers/st/mmc/stm32_sdmmc2.c index db51581568..787241d597 100644 --- a/drivers/st/mmc/stm32_sdmmc2.c +++ b/drivers/st/mmc/stm32_sdmmc2.c @@ -4,25 +4,27 @@ * SPDX-License-Identifier: BSD-3-Clause */ +#include +#include +#include + #include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include -#include -#include -#include +#include +#include +#include + #include -#include -#include -#include -#include /* Registers offsets */ #define SDMMC_POWER 0x00U diff --git a/drivers/st/pmic/stm32_i2c.c b/drivers/st/pmic/stm32_i2c.c index 0980139479..f861ba2963 100644 --- a/drivers/st/pmic/stm32_i2c.c +++ b/drivers/st/pmic/stm32_i2c.c @@ -4,13 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include #include #include -#include + +#include +#include +#include +#include /* STM32 I2C registers offsets */ #define I2C_CR1 0x00U diff --git a/drivers/st/pmic/stm32mp1_pmic.c b/drivers/st/pmic/stm32mp1_pmic.c index 958de08d97..ee4402762f 100644 --- a/drivers/st/pmic/stm32mp1_pmic.c +++ b/drivers/st/pmic/stm32mp1_pmic.c @@ -4,20 +4,24 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include +#include + #include -#include -#include + #include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include -#include -#include -#include /* I2C Timing hard-coded value, for I2C clock source is HSI at 64MHz */ #define I2C_TIMING 0x10D07DB5 diff --git a/drivers/st/pmic/stpmu1.c b/drivers/st/pmic/stpmu1.c index 5951899a1a..9c36bf64a7 100644 --- a/drivers/st/pmic/stpmu1.c +++ b/drivers/st/pmic/stpmu1.c @@ -4,11 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include -#include #include +#include +#include +#include + struct regul_struct { const char *dt_node_name; const uint16_t *voltage_table; diff --git a/drivers/st/reset/stm32mp1_reset.c b/drivers/st/reset/stm32mp1_reset.c index 106bbfe624..f58e10b27b 100644 --- a/drivers/st/reset/stm32mp1_reset.c +++ b/drivers/st/reset/stm32mp1_reset.c @@ -4,14 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include + #include -#include -#include -#include + +#include +#include +#include +#include +#include +#include #define RST_CLR_OFFSET 4U diff --git a/drivers/st/uart/aarch32/stm32_console.S b/drivers/st/uart/aarch32/stm32_console.S index 303d6bac75..4d00e68ab3 100644 --- a/drivers/st/uart/aarch32/stm32_console.S +++ b/drivers/st/uart/aarch32/stm32_console.S @@ -7,8 +7,8 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include -#include +#include +#include #define USART_TIMEOUT 0x1000 diff --git a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c index 716d15d18d..74677f64c3 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c +++ b/drivers/staging/renesas/rcar/ddr/ddr_a/ddr_init_e3.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ - #include -#include + +#include #include "boot_init_dram_regdef_e3.h" #include "ddr_init_e3.h" diff --git a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c index d7291315f6..841eeb4732 100644 --- a/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c +++ b/drivers/staging/renesas/rcar/ddr/ddr_b/boot_init_dram.c @@ -7,8 +7,10 @@ #include #include #include -#include -#include + +#include +#include + #include "ddr_regdef.h" #include "init_dram_tbl_h3.h" #include "init_dram_tbl_m3.h" diff --git a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c b/drivers/staging/renesas/rcar/ddr/dram_sub_func.c index 4bf6942e03..82aa7f84d0 100644 --- a/drivers/staging/renesas/rcar/ddr/dram_sub_func.c +++ b/drivers/staging/renesas/rcar/ddr/dram_sub_func.c @@ -4,8 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include +#include +#include + #include "dram_sub_func.h" #define PRR (0xFFF00044U) diff --git a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c index d75aa7c346..47fa837b3f 100644 --- a/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c +++ b/drivers/staging/renesas/rcar/pfc/E3/pfc_init_e3.c @@ -5,7 +5,9 @@ */ #include /* for uint32_t */ -#include + +#include + #include "pfc_init_e3.h" #include "rcar_def.h" diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c index 1c38f0600d..f31d99e569 100644 --- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c +++ b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v1.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include /* for uint32_t */ -#include +#include +#include /* GPIO base address */ #define GPIO_BASE (0xE6050000U) diff --git a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c index 3ed0cd3e41..e53235a20e 100644 --- a/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c +++ b/drivers/staging/renesas/rcar/pfc/H3/pfc_init_h3_v2.c @@ -5,7 +5,9 @@ */ #include /* for uint32_t */ -#include + +#include + #include "pfc_init_h3_v2.h" #include "rcar_def.h" diff --git a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c index 911ee8cc9c..f7e66f2458 100644 --- a/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c +++ b/drivers/staging/renesas/rcar/pfc/M3/pfc_init_m3.c @@ -5,7 +5,9 @@ */ #include /* for uint32_t */ -#include + +#include + #include "pfc_init_m3.h" #include "rcar_def.h" #include "rcar_private.h" diff --git a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c index a2b6b34a10..e6b8a4f284 100644 --- a/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c +++ b/drivers/staging/renesas/rcar/pfc/M3N/pfc_init_m3n.c @@ -5,7 +5,9 @@ */ #include /* for uint32_t */ -#include + +#include + #include "pfc_init_m3n.h" #include "rcar_def.h" diff --git a/drivers/staging/renesas/rcar/pfc/pfc_init.c b/drivers/staging/renesas/rcar/pfc/pfc_init.c index fceff3dddc..f20e8b0b55 100644 --- a/drivers/staging/renesas/rcar/pfc/pfc_init.c +++ b/drivers/staging/renesas/rcar/pfc/pfc_init.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include "rcar_def.h" #if RCAR_LSI == RCAR_AUTO #include "H3/pfc_init_h3_v1.h" diff --git a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c index efe0c754d3..593fefb624 100644 --- a/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c +++ b/drivers/staging/renesas/rcar/qos/E3/qos_init_e3_v10.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_e3_v10.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c index fd81187c88..21aa3df039 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v10.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "qos_init_h3_v10.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c index 1f65600506..5b7348ce0a 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v11.c @@ -5,8 +5,11 @@ */ #include -#include + +#include + #include + #include "../qos_common.h" #include "qos_init_h3_v11.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c index 6922360655..f27a7dce64 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v20.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_h3_v20.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c index 5986a39483..b3e65df940 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3_v30.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_h3_v30.h" diff --git a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c index 58c37160ed..e4909b9c1d 100644 --- a/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c +++ b/drivers/staging/renesas/rcar/qos/H3/qos_init_h3n_v30.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_h3n_v30.h" diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c index a0d1e14733..c0846d2e25 100644 --- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c +++ b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v10.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "qos_init_m3_v10.h" diff --git a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c index fc0d2cce1e..3186cf68f9 100644 --- a/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c +++ b/drivers/staging/renesas/rcar/qos/M3/qos_init_m3_v11.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_m3_v11.h" diff --git a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c index e9d66761ed..0be68c3cd6 100644 --- a/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c +++ b/drivers/staging/renesas/rcar/qos/M3N/qos_init_m3n_v10.c @@ -5,7 +5,9 @@ */ #include -#include + +#include + #include "../qos_common.h" #include "../qos_reg.h" #include "qos_init_m3n_v10.h" diff --git a/drivers/staging/renesas/rcar/qos/qos_init.c b/drivers/staging/renesas/rcar/qos/qos_init.c index 54c880309c..1d1bcd59f1 100644 --- a/drivers/staging/renesas/rcar/qos/qos_init.c +++ b/drivers/staging/renesas/rcar/qos/qos_init.c @@ -5,8 +5,10 @@ */ #include -#include -#include + +#include +#include + #include "qos_init.h" #include "qos_common.h" #if RCAR_LSI == RCAR_AUTO diff --git a/drivers/synopsys/emmc/dw_mmc.c b/drivers/synopsys/emmc/dw_mmc.c index eb428198ff..0c5c645701 100644 --- a/drivers/synopsys/emmc/dw_mmc.c +++ b/drivers/synopsys/emmc/dw_mmc.c @@ -4,17 +4,18 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include -#include #include -#include -#include -#include #include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include + #define DWMMC_CTRL (0x00) #define CTRL_IDMAC_EN (1 << 25) #define CTRL_DMA_EN (1 << 5) diff --git a/drivers/synopsys/ufs/dw_ufs.c b/drivers/synopsys/ufs/dw_ufs.c index b0ea3e7377..c7c8fc22d2 100644 --- a/drivers/synopsys/ufs/dw_ufs.c +++ b/drivers/synopsys/ufs/dw_ufs.c @@ -5,12 +5,13 @@ */ #include -#include -#include -#include #include #include -#include + +#include +#include +#include +#include static int dwufs_phy_init(ufs_params_t *params) { diff --git a/drivers/ti/uart/aarch64/16550_console.S b/drivers/ti/uart/aarch64/16550_console.S index 785b640dd2..3180593ad9 100644 --- a/drivers/ti/uart/aarch64/16550_console.S +++ b/drivers/ti/uart/aarch64/16550_console.S @@ -9,7 +9,7 @@ #include #define USE_FINISH_CONSOLE_REG_2 #include -#include +#include /* * "core" functions are low-level implementations that don't require diff --git a/drivers/ufs/ufs.c b/drivers/ufs/ufs.c index 515fc2785e..2351c9b04e 100644 --- a/drivers/ufs/ufs.c +++ b/drivers/ufs/ufs.c @@ -4,17 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include #include -#include -#include #include #include -#include -#include #include #include -#include + +#include + +#include +#include +#include +#include +#include #define CDB_ADDR_MASK 127 #define ALIGN_CDB(x) (((x) + CDB_ADDR_MASK) & ~CDB_ADDR_MASK) -- cgit v1.2.3