diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2019-10-03 13:32:45 +0000 |
|---|---|---|
| committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-10-03 13:32:45 +0000 |
| commit | 2d35bc1386ee80904be0df7dd5b3eb958dc685e2 (patch) | |
| tree | 46d9234a1d8608967f1e522d3a3a8f5badb1010a | |
| parent | 34c4f86a627f79b1f827e65d46675fca21987b62 (diff) | |
| parent | 243b61d15aaa59794e73769de7be64f02223cfad (diff) | |
Merge changes from topic "stm32mp_corrections_w40" into integration
* changes:
gpio: stm32_gpio: do not mix error code types
fdts: stm32mp1: move FDCAN to PLL4_R
mmc: increase delay between ACMD41 retries
crypto: stm32_hash: align stm32_hash_update() prototype
| -rw-r--r-- | drivers/mmc/mmc.c | 2 | ||||
| -rw-r--r-- | drivers/st/gpio/stm32_gpio.c | 2 | ||||
| -rw-r--r-- | fdts/stm32mp157a-avenger96.dts | 2 | ||||
| -rw-r--r-- | fdts/stm32mp157a-dk1.dts | 2 | ||||
| -rw-r--r-- | fdts/stm32mp157c-ed1.dts | 2 | ||||
| -rw-r--r-- | include/drivers/st/stm32_hash.h | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index db6f3f9e..b5f6a10d 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -361,7 +361,7 @@ static int sd_send_op_cond(void) return 0; } - mdelay(1); + mdelay(10); } ERROR("ACMD41 failed after %d retries\n", SEND_OP_COND_MAX_RETRIES); diff --git a/drivers/st/gpio/stm32_gpio.c b/drivers/st/gpio/stm32_gpio.c index 343ad6c1..a13c341a 100644 --- a/drivers/st/gpio/stm32_gpio.c +++ b/drivers/st/gpio/stm32_gpio.c @@ -165,7 +165,7 @@ int dt_set_pinctrl_config(int node) void *fdt; if (fdt_get_address(&fdt) == 0) { - return -ENOENT; + return -FDT_ERR_NOTFOUND; } if (status == DT_DISABLED) { diff --git a/fdts/stm32mp157a-avenger96.dts b/fdts/stm32mp157a-avenger96.dts index 9df72b44..907940c7 100644 --- a/fdts/stm32mp157a-avenger96.dts +++ b/fdts/stm32mp157a-avenger96.dts @@ -246,7 +246,7 @@ CLK_UART6_HSI CLK_UART78_HSI CLK_SPDIF_PLL4P - CLK_FDCAN_PLL4Q + CLK_FDCAN_PLL4R CLK_SAI1_PLL3Q CLK_SAI2_PLL3Q CLK_SAI3_PLL3Q diff --git a/fdts/stm32mp157a-dk1.dts b/fdts/stm32mp157a-dk1.dts index b17d5019..4ea83f7c 100644 --- a/fdts/stm32mp157a-dk1.dts +++ b/fdts/stm32mp157a-dk1.dts @@ -266,7 +266,7 @@ CLK_UART6_HSI CLK_UART78_HSI CLK_SPDIF_PLL4P - CLK_FDCAN_PLL4Q + CLK_FDCAN_PLL4R CLK_SAI1_PLL3Q CLK_SAI2_PLL3Q CLK_SAI3_PLL3Q diff --git a/fdts/stm32mp157c-ed1.dts b/fdts/stm32mp157c-ed1.dts index ed55725b..77949255 100644 --- a/fdts/stm32mp157c-ed1.dts +++ b/fdts/stm32mp157c-ed1.dts @@ -272,7 +272,7 @@ CLK_UART6_HSI CLK_UART78_HSI CLK_SPDIF_PLL4P - CLK_FDCAN_PLL4Q + CLK_FDCAN_PLL4R CLK_SAI1_PLL3Q CLK_SAI2_PLL3Q CLK_SAI3_PLL3Q diff --git a/include/drivers/st/stm32_hash.h b/include/drivers/st/stm32_hash.h index 969d7aa1..df04730d 100644 --- a/include/drivers/st/stm32_hash.h +++ b/include/drivers/st/stm32_hash.h @@ -14,7 +14,7 @@ enum stm32_hash_algo_mode { HASH_SHA256 }; -int stm32_hash_update(const uint8_t *buffer, uint32_t length); +int stm32_hash_update(const uint8_t *buffer, size_t length); int stm32_hash_final(uint8_t *digest); int stm32_hash_final_update(const uint8_t *buffer, uint32_t buf_length, uint8_t *digest); |