aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Dykes <mark.dykes@arm.com>2021-07-01 17:23:30 +0200
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2021-07-01 17:23:30 +0200
commit365e0f77649737679610e504dc840acec156bc5e (patch)
tree975e6a1b516b3c687d572a23de07f526b743ce71 /drivers
parent156a6e137cfe1d656fbf544406f642a96a8a4bdb (diff)
parentc2d18ca80f4bd32f58ba07f53d9bb2586df18fc0 (diff)
downloadtrusted-firmware-a-365e0f77649737679610e504dc840acec156bc5e.tar.gz
Merge changes from topic "st_fixes" into integration
* changes: fix(plat/st): correct IO compensation disabling fix(plat/st): correct BSEC error code management fix(drivers/st/pmic): missing error check fix(drivers/st/pmic): initialize i2c_state fix(drivers/st/clk): use correct return value
Diffstat (limited to 'drivers')
-rw-r--r--drivers/st/clk/stm32mp1_clk.c4
-rw-r--r--drivers/st/pmic/stm32mp_pmic.c6
2 files changed, 7 insertions, 3 deletions
diff --git a/drivers/st/clk/stm32mp1_clk.c b/drivers/st/clk/stm32mp1_clk.c
index 564bd87989..6ada96a520 100644
--- a/drivers/st/clk/stm32mp1_clk.c
+++ b/drivers/st/clk/stm32mp1_clk.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018-2020, STMicroelectronics - All Rights Reserved
+ * Copyright (C) 2018-2021, STMicroelectronics - All Rights Reserved
*
* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
*/
@@ -1737,7 +1737,7 @@ int stm32mp1_clk_init(void)
void *fdt;
if (fdt_get_address(&fdt) == 0) {
- return false;
+ return -FDT_ERR_NOTFOUND;
}
/* Check status field to disable security */
diff --git a/drivers/st/pmic/stm32mp_pmic.c b/drivers/st/pmic/stm32mp_pmic.c
index b2bb482f9d..be410a1f49 100644
--- a/drivers/st/pmic/stm32mp_pmic.c
+++ b/drivers/st/pmic/stm32mp_pmic.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019, STMicroelectronics - All Rights Reserved
+ * Copyright (c) 2017-2021, STMicroelectronics - All Rights Reserved
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -121,6 +121,9 @@ int dt_pmic_configure_boot_on_regulators(void)
}
regulators_node = fdt_subnode_offset(fdt, pmic_node, "regulators");
+ if (regulators_node < 0) {
+ return -ENOENT;
+ }
fdt_for_each_subnode(regulator_node, fdt, regulators_node) {
const fdt32_t *cuint;
@@ -204,6 +207,7 @@ bool initialize_pmic_i2c(void)
i2c->i2c_base_addr = i2c_info.base;
i2c->dt_status = i2c_info.status;
i2c->clock = i2c_info.clock;
+ i2c->i2c_state = I2C_STATE_RESET;
i2c_init.own_address1 = pmic_i2c_addr;
i2c_init.addressing_mode = I2C_ADDRESSINGMODE_7BIT;
i2c_init.dual_address_mode = I2C_DUALADDRESS_DISABLE;