aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorManish Pandey <manish.pandey2@arm.com>2020-09-25 08:30:53 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-09-25 08:30:53 +0000
commite89b813129fca7276e23182d2c7ebbf774010d9d (patch)
tree633215c571a77098ab3f9f7f69ec7f9165bf5bfc /include
parent6b745042eaab45aa8ab7949bd5c7fdc5d5d9371f (diff)
parent1bb9072ab46993d8c04c119250dfabbf945cfe72 (diff)
downloadtrusted-firmware-a-e89b813129fca7276e23182d2c7ebbf774010d9d.tar.gz
Merge changes from topic "stm32_drivers_update" into integration
* changes: clk: stm32mp1: fix rcc mckprot status drivers: st: add missing includes in ETZPC header mmc: st: clear some flags before sending a command mmc: st: correct retries management nand: raw_nand: fix timeout issue in nand_wait_ready mtd: spi_nor: change message level on macronix detection gpio: stm32_gpio: check GPIO node status after checking DT crypto: stm32_hash: fix issue when restarting computation
Diffstat (limited to 'include')
-rw-r--r--include/drivers/raw_nand.h2
-rw-r--r--include/drivers/st/etzpc.h3
2 files changed, 4 insertions, 1 deletions
diff --git a/include/drivers/raw_nand.h b/include/drivers/raw_nand.h
index 9018f02428..7152300945 100644
--- a/include/drivers/raw_nand.h
+++ b/include/drivers/raw_nand.h
@@ -169,7 +169,7 @@ struct rawnand_device {
};
int nand_raw_init(unsigned long long *size, unsigned int *erase_size);
-int nand_wait_ready(unsigned long delay);
+int nand_wait_ready(unsigned int delay_ms);
int nand_read_page_cmd(unsigned int page, unsigned int offset,
uintptr_t buffer, unsigned int len);
int nand_change_read_column_cmd(unsigned int offset, uintptr_t buffer,
diff --git a/include/drivers/st/etzpc.h b/include/drivers/st/etzpc.h
index 6e3fec1ea7..4cd2b4e0bb 100644
--- a/include/drivers/st/etzpc.h
+++ b/include/drivers/st/etzpc.h
@@ -7,6 +7,9 @@
#ifndef DRIVERS_ST_ETZPC_H
#define DRIVERS_ST_ETZPC_H
+#include <stdbool.h>
+#include <stdint.h>
+
/* Define security level for each peripheral (DECPROT) */
enum etzpc_decprot_attributes {
ETZPC_DECPROT_S_RW = 0,