Merge pull request #7480 from jernejsk/atf-fix

Allwinner: atf: Revert to old workaround
This commit is contained in:
Rudi Heitbaum 2023-02-09 10:59:08 +11:00 committed by GitHub
commit 07249c160a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 1 deletions

View File

@ -23,7 +23,7 @@ make_target() {
if [ "${DEVICE}" = "iMX8" ]; then if [ "${DEVICE}" = "iMX8" ]; then
CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="--no-warn-rwx-segments" CFLAGS="--param=min-pagesize=0" make PLAT=${ATF_PLATFORM} bl31 CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="--no-warn-rwx-segments" CFLAGS="--param=min-pagesize=0" make PLAT=${ATF_PLATFORM} bl31
else else
CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="--no-warn-rwx-segments" CFLAGS="" make SUNXI_SETUP_REGULATORS=0 PLAT=${ATF_PLATFORM} bl31 CROSS_COMPILE="${TARGET_KERNEL_PREFIX}" LDFLAGS="--no-warn-rwx-segments" CFLAGS="" make PLAT=${ATF_PLATFORM} bl31
fi fi
} }

View File

@ -0,0 +1,22 @@
From 89a2da7c8bae95cf9225015489736e2fc434f4d9 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Sat, 2 Jan 2021 16:35:31 +0100
Subject: [PATCH] sunxi: Don't enable referenced regulators
This break certain devices which need appropriate power on sequence.
---
drivers/allwinner/axp/common.c | 3 ---
1 file changed, 3 deletions(-)
--- a/drivers/allwinner/axp/common.c
+++ b/drivers/allwinner/axp/common.c
@@ -112,9 +112,6 @@ static bool should_enable_regulator(const void *fdt,
if (is_node_disabled(fdt, node)) {
return false;
}
- if (fdt_getprop(fdt, node, "phandle", NULL) != NULL) {
- return true;
- }
if (fdt_getprop(fdt, node, "regulator-always-on", NULL) != NULL) {
return true;
}