diff options
| -rw-r--r-- | drivers/st/clk/stm32mp1_clk.c | 4 | ||||
| -rw-r--r-- | drivers/st/clk/stm32mp1_clkfunc.c | 6 | ||||
| -rw-r--r-- | include/drivers/st/stm32mp1_clkfunc.h | 3 | ||||
| -rw-r--r-- | plat/st/stm32mp1/bl2_io_storage.c | 2 | ||||
| -rw-r--r-- | plat/st/stm32mp1/plat_image_load.c | 1 |
5 files changed, 9 insertions, 7 deletions
diff --git a/drivers/st/clk/stm32mp1_clk.c b/drivers/st/clk/stm32mp1_clk.c index f0bf363e2..b8457cb37 100644 --- a/drivers/st/clk/stm32mp1_clk.c +++ b/drivers/st/clk/stm32mp1_clk.c @@ -1323,7 +1323,7 @@ int stm32mp1_clk_init(void) int ret, len; enum stm32mp1_pll_id i; bool lse_css = false; - const uint32_t *pkcs_cell; + const fdt32_t *pkcs_cell; /* Check status field to disable security */ if (!fdt_get_rcc_secure_status()) { @@ -1529,7 +1529,7 @@ int stm32mp1_clk_init(void) priv->pkcs_usb_value = 0; for (j = 0; j < ((uint32_t)len / sizeof(uint32_t)); j++) { - uint32_t pkcs = (uint32_t)fdt32_to_cpu(pkcs_cell[j]); + uint32_t pkcs = fdt32_to_cpu(pkcs_cell[j]); if (pkcs == (uint32_t)CLK_CKPER_DISABLED) { ckper_disabled = true; diff --git a/drivers/st/clk/stm32mp1_clkfunc.c b/drivers/st/clk/stm32mp1_clkfunc.c index d4c69cb4e..078d803e7 100644 --- a/drivers/st/clk/stm32mp1_clkfunc.c +++ b/drivers/st/clk/stm32mp1_clkfunc.c @@ -265,11 +265,11 @@ int fdt_rcc_subnode_offset(const char *name) * This function gets the pointer to a rcc-clk property from its name. * It reads the values indicated inside the device tree. * Length of the property is stored in the second parameter. - * Returns pointer if success, and NULL value else. + * Returns pointer on success, and NULL value on failure. ******************************************************************************/ -const uint32_t *fdt_rcc_read_prop(const char *prop_name, int *lenp) +const fdt32_t *fdt_rcc_read_prop(const char *prop_name, int *lenp) { - const uint32_t *cuint; + const fdt32_t *cuint; int node, len; void *fdt; diff --git a/include/drivers/st/stm32mp1_clkfunc.h b/include/drivers/st/stm32mp1_clkfunc.h index b11ccf860..2467af9bb 100644 --- a/include/drivers/st/stm32mp1_clkfunc.h +++ b/include/drivers/st/stm32mp1_clkfunc.h @@ -7,6 +7,7 @@ #ifndef STM32MP1_CLKFUNC_H #define STM32MP1_CLKFUNC_H +#include <libfdt.h> #include <stdbool.h> enum stm32mp_osc_id { @@ -33,7 +34,7 @@ uint32_t fdt_rcc_read_addr(void); int fdt_rcc_read_uint32_array(const char *prop_name, uint32_t *array, uint32_t count); int fdt_rcc_subnode_offset(const char *name); -const uint32_t *fdt_rcc_read_prop(const char *prop_name, int *lenp); +const fdt32_t *fdt_rcc_read_prop(const char *prop_name, int *lenp); bool fdt_get_rcc_secure_status(void); uintptr_t fdt_get_stgen_base(void); diff --git a/plat/st/stm32mp1/bl2_io_storage.c b/plat/st/stm32mp1/bl2_io_storage.c index 9a023124c..fdbd4bfd0 100644 --- a/plat/st/stm32mp1/bl2_io_storage.c +++ b/plat/st/stm32mp1/bl2_io_storage.c @@ -37,7 +37,7 @@ static io_block_spec_t gpt_block_spec = { .length = 34 * MMC_BLOCK_SIZE, /* Size of GPT table */ }; -uint32_t block_buffer[MMC_BLOCK_SIZE] __aligned(MMC_BLOCK_SIZE); +static uint32_t block_buffer[MMC_BLOCK_SIZE] __aligned(MMC_BLOCK_SIZE); static const io_block_dev_spec_t mmc_block_dev_spec = { /* It's used as temp buffer in block driver */ diff --git a/plat/st/stm32mp1/plat_image_load.c b/plat/st/stm32mp1/plat_image_load.c index 3c6d677a0..d5b328e3c 100644 --- a/plat/st/stm32mp1/plat_image_load.c +++ b/plat/st/stm32mp1/plat_image_load.c @@ -5,6 +5,7 @@ */ #include <desc_image_load.h> +#include <platform.h> /******************************************************************************* * This function flushes the data structures so that they are visible |