From e0a8ce5d0d1395da3b442c7c019ba62d1361e92b Mon Sep 17 00:00:00 2001 From: Yann Gautier <yann.gautier@st.com> Date: Thu, 14 Feb 2019 11:13:50 +0100 Subject: [PATCH] stm32mp1: remove some dependencies on clocks and reset in drivers Include all RCC, clocks and reset headers from stm32mp1_def.h which if exported to the firmware through platform_def.h. The same dependency removal is done in common code as well. Some useless includes are also removed in stm32_sdmmc2 driver. Change-Id: I731ea5775c3fdb7f7b0c388b93923ed5e84b8d3f Signed-off-by: Yann Gautier <yann.gautier@st.com> --- drivers/st/ddr/stm32mp1_ddr.c | 3 --- drivers/st/ddr/stm32mp1_ddr_helpers.c | 3 +-- drivers/st/ddr/stm32mp1_ram.c | 3 --- drivers/st/gpio/stm32_gpio.c | 1 - drivers/st/mmc/stm32_sdmmc2.c | 4 ---- drivers/st/pmic/stm32mp_pmic.c | 1 - drivers/st/reset/stm32mp1_reset.c | 1 - plat/st/common/bl2_io_storage.c | 1 - plat/st/common/stm32mp_common.c | 1 - plat/st/common/stm32mp_dt.c | 1 - plat/st/stm32mp1/bl2_plat_setup.c | 1 - plat/st/stm32mp1/stm32mp1_def.h | 5 +++++ plat/st/stm32mp1/stm32mp1_helper.S | 1 - plat/st/stm32mp1/stm32mp1_pm.c | 1 - plat/st/stm32mp1/stm32mp1_security.c | 1 - 15 files changed, 6 insertions(+), 22 deletions(-) diff --git a/drivers/st/ddr/stm32mp1_ddr.c b/drivers/st/ddr/stm32mp1_ddr.c index b9347540d..26a5a4d91 100644 --- a/drivers/st/ddr/stm32mp1_ddr.c +++ b/drivers/st/ddr/stm32mp1_ddr.c @@ -14,13 +14,10 @@ #include <common/debug.h> #include <drivers/delay_timer.h> #include <drivers/st/stm32mp_pmic.h> -#include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_ddr.h> #include <drivers/st/stm32mp1_ddr_regs.h> #include <drivers/st/stm32mp1_pwr.h> #include <drivers/st/stm32mp1_ram.h> -#include <drivers/st/stm32mp1_rcc.h> -#include <dt-bindings/clock/stm32mp1-clks.h> #include <lib/mmio.h> #include <plat/common/platform.h> diff --git a/drivers/st/ddr/stm32mp1_ddr_helpers.c b/drivers/st/ddr/stm32mp1_ddr_helpers.c index a8c1b7769..e50b27be8 100644 --- a/drivers/st/ddr/stm32mp1_ddr_helpers.c +++ b/drivers/st/ddr/stm32mp1_ddr_helpers.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018, STMicroelectronics - All Rights Reserved + * Copyright (c) 2017-2019, STMicroelectronics - All Rights Reserved * * SPDX-License-Identifier: BSD-3-Clause */ @@ -7,7 +7,6 @@ #include <platform_def.h> #include <drivers/st/stm32mp1_ddr_helpers.h> -#include <drivers/st/stm32mp1_rcc.h> #include <lib/mmio.h> void ddr_enable_clock(void) diff --git a/drivers/st/ddr/stm32mp1_ram.c b/drivers/st/ddr/stm32mp1_ram.c index 532062e01..7b13385fc 100644 --- a/drivers/st/ddr/stm32mp1_ram.c +++ b/drivers/st/ddr/stm32mp1_ram.c @@ -12,12 +12,9 @@ #include <arch_helpers.h> #include <common/debug.h> -#include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_ddr.h> #include <drivers/st/stm32mp1_ddr_helpers.h> #include <drivers/st/stm32mp1_ram.h> -#include <drivers/st/stm32mp1_rcc.h> -#include <dt-bindings/clock/stm32mp1-clks.h> #include <lib/mmio.h> #define DDR_PATTERN 0xAAAAAAAAU diff --git a/drivers/st/gpio/stm32_gpio.c b/drivers/st/gpio/stm32_gpio.c index 1d8111a1b..5733046d0 100644 --- a/drivers/st/gpio/stm32_gpio.c +++ b/drivers/st/gpio/stm32_gpio.c @@ -15,7 +15,6 @@ #include <common/bl_common.h> #include <common/debug.h> #include <drivers/st/stm32_gpio.h> -#include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_clkfunc.h> #include <lib/mmio.h> #include <lib/utils_def.h> diff --git a/drivers/st/mmc/stm32_sdmmc2.c b/drivers/st/mmc/stm32_sdmmc2.c index 10fd5f5d0..dce8345b0 100644 --- a/drivers/st/mmc/stm32_sdmmc2.c +++ b/drivers/st/mmc/stm32_sdmmc2.c @@ -20,10 +20,6 @@ #include <drivers/st/stm32_gpio.h> #include <drivers/st/stm32_sdmmc2.h> #include <drivers/st/stm32mp_reset.h> -#include <drivers/st/stm32mp1_clk.h> -#include <drivers/st/stm32mp1_rcc.h> -#include <dt-bindings/clock/stm32mp1-clks.h> -#include <dt-bindings/reset/stm32mp1-resets.h> #include <lib/mmio.h> #include <lib/utils.h> #include <plat/common/platform.h> diff --git a/drivers/st/pmic/stm32mp_pmic.c b/drivers/st/pmic/stm32mp_pmic.c index eb5c6e66d..52f712f10 100644 --- a/drivers/st/pmic/stm32mp_pmic.c +++ b/drivers/st/pmic/stm32mp_pmic.c @@ -15,7 +15,6 @@ #include <drivers/delay_timer.h> #include <drivers/st/stm32mp_pmic.h> #include <drivers/st/stm32_gpio.h> -#include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stpmic1.h> #include <lib/mmio.h> #include <lib/utils_def.h> diff --git a/drivers/st/reset/stm32mp1_reset.c b/drivers/st/reset/stm32mp1_reset.c index aac74e15d..b9a7ac7c9 100644 --- a/drivers/st/reset/stm32mp1_reset.c +++ b/drivers/st/reset/stm32mp1_reset.c @@ -11,7 +11,6 @@ #include <common/bl_common.h> #include <common/debug.h> #include <drivers/st/stm32mp_reset.h> -#include <drivers/st/stm32mp1_rcc.h> #include <lib/mmio.h> #include <lib/utils_def.h> diff --git a/plat/st/common/bl2_io_storage.c b/plat/st/common/bl2_io_storage.c index 5b649a342..c8bb559f4 100644 --- a/plat/st/common/bl2_io_storage.c +++ b/plat/st/common/bl2_io_storage.c @@ -20,7 +20,6 @@ #include <drivers/st/io_mmc.h> #include <drivers/st/io_stm32image.h> #include <drivers/st/stm32_sdmmc2.h> -#include <drivers/st/stm32mp1_rcc.h> #include <lib/mmio.h> #include <lib/utils.h> #include <plat/common/platform.h> diff --git a/plat/st/common/stm32mp_common.c b/plat/st/common/stm32mp_common.c index 20aa57da1..aecef4718 100644 --- a/plat/st/common/stm32mp_common.c +++ b/plat/st/common/stm32mp_common.c @@ -10,7 +10,6 @@ #include <arch_helpers.h> #include <common/debug.h> -#include <dt-bindings/clock/stm32mp1-clks.h> #include <plat/common/platform.h> uintptr_t plat_get_ns_image_entrypoint(void) diff --git a/plat/st/common/stm32mp_dt.c b/plat/st/common/stm32mp_dt.c index 0b6a0d32f..c0b0518d9 100644 --- a/plat/st/common/stm32mp_dt.c +++ b/plat/st/common/stm32mp_dt.c @@ -13,7 +13,6 @@ #include <common/debug.h> #include <drivers/st/stm32_gpio.h> -#include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_ddr.h> #include <drivers/st/stm32mp1_ram.h> diff --git a/plat/st/stm32mp1/bl2_plat_setup.c b/plat/st/stm32mp1/bl2_plat_setup.c index beea69a9d..bcf1aa9ed 100644 --- a/plat/st/stm32mp1/bl2_plat_setup.c +++ b/plat/st/stm32mp1/bl2_plat_setup.c @@ -21,7 +21,6 @@ #include <drivers/st/stm32mp1_clk.h> #include <drivers/st/stm32mp1_pwr.h> #include <drivers/st/stm32mp1_ram.h> -#include <drivers/st/stm32mp1_rcc.h> #include <lib/mmio.h> #include <lib/xlat_tables/xlat_tables_v2.h> #include <plat/common/platform.h> diff --git a/plat/st/stm32mp1/stm32mp1_def.h b/plat/st/stm32mp1/stm32mp1_def.h index a456f263b..95d341252 100644 --- a/plat/st/stm32mp1/stm32mp1_def.h +++ b/plat/st/stm32mp1/stm32mp1_def.h @@ -8,10 +8,15 @@ #define STM32MP1_DEF_H #include <common/tbbr/tbbr_img_def.h> +#include <drivers/st/stm32mp1_rcc.h> +#include <dt-bindings/clock/stm32mp1-clks.h> +#include <dt-bindings/reset/stm32mp1-resets.h> #include <lib/utils_def.h> #include <lib/xlat_tables/xlat_tables_defs.h> #ifndef __ASSEMBLY__ +#include <drivers/st/stm32mp1_clk.h> + #include <boot_api.h> #include <stm32mp_common.h> #include <stm32mp_dt.h> diff --git a/plat/st/stm32mp1/stm32mp1_helper.S b/plat/st/stm32mp1/stm32mp1_helper.S index c6759655a..bfcd991a3 100644 --- a/plat/st/stm32mp1/stm32mp1_helper.S +++ b/plat/st/stm32mp1/stm32mp1_helper.S @@ -10,7 +10,6 @@ #include <asm_macros.S> #include <common/bl_common.h> #include <drivers/st/stm32_gpio.h> -#include <drivers/st/stm32mp1_rcc.h> #define GPIO_TX_SHIFT (DEBUG_UART_TX_GPIO_PORT << 1) #define GPIO_TX_ALT_SHIFT ((DEBUG_UART_TX_GPIO_PORT - GPIO_ALT_LOWER_LIMIT) << 2) diff --git a/plat/st/stm32mp1/stm32mp1_pm.c b/plat/st/stm32mp1/stm32mp1_pm.c index 18921ef00..c4d023271 100644 --- a/plat/st/stm32mp1/stm32mp1_pm.c +++ b/plat/st/stm32mp1/stm32mp1_pm.c @@ -14,7 +14,6 @@ #include <drivers/arm/gic_common.h> #include <drivers/arm/gicv2.h> #include <drivers/st/stm32mp1_clk.h> -#include <drivers/st/stm32mp1_rcc.h> #include <dt-bindings/clock/stm32mp1-clks.h> #include <lib/mmio.h> #include <lib/psci/psci.h> diff --git a/plat/st/stm32mp1/stm32mp1_security.c b/plat/st/stm32mp1/stm32mp1_security.c index bb66b4b5a..baa3916d0 100644 --- a/plat/st/stm32mp1/stm32mp1_security.c +++ b/plat/st/stm32mp1/stm32mp1_security.c @@ -11,7 +11,6 @@ #include <common/debug.h> #include <drivers/arm/tzc400.h> #include <drivers/st/stm32mp1_clk.h> -#include <drivers/st/stm32mp1_rcc.h> #include <dt-bindings/clock/stm32mp1-clks.h> #include <lib/mmio.h> -- GitLab