Mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2026-06-13 15:03:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2021-05-17-assorted-fixes'

Browse Source
This commit is contained in:
Tom Rini
2021-05-18 14:17:54 -04:00
parent 7a1638c263 af02975eb9
commit 428bec7cf9
5 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/firmware/psci.c
View File

@@ -66,7 +66,7 @@ unsigned long __efi_runtime invoke_psci_fn
return res.a0;
}
static int psci_features(u32 psci_func_id)
static int request_psci_features(u32 psci_func_id)
{
return invoke_psci_fn(PSCI_1_0_FN_PSCI_FEATURES,
psci_func_id, 0, 0);
@@ -85,7 +85,8 @@ static bool psci_is_system_reset2_supported(void)
ver = psci_0_2_get_version();
if (PSCI_VERSION_MAJOR(ver) >= 1) {
ret = psci_features(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2));
ret = request_psci_features(PSCI_FN_NATIVE(1_1,
SYSTEM_RESET2));
if (ret != PSCI_RET_NOT_SUPPORTED)
return true;