lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regulator: rpmh-regulator: support parent supply specification in subnodes

Browse Source 
Add support for parent supply properties specified in regulator-
specific device tree subnodes.  This style can be used to avoid
false positive circular dependencies in the wait_for_supplier
logic.

Change-Id: Id9a96e27ea62ef37b4b5bbfb344ee206b439ee3f
Signed-off-by: David Collins <collinsd@codeaurora.org>
This commit is contained in:
David Collins 2020-01-14 18:00:30 -08:00
parent 3a4e5978ef
commit 29c41d5c47
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/regulator/rpmh-regulator.c
View File

@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only
/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved. */
/* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved. */
#define pr_fmt(fmt) "%s: " fmt, __func__
@ -1660,7 +1660,8 @@ static int rpmh_regulator_init_vreg_supply(struct rpmh_vreg *vreg)
return -ENOMEM;
scnprintf(buf, len, "%s-parent-supply", vreg->rdesc.name);
if (of_find_property(vreg->aggr_vreg->dev->of_node, buf, NULL)) {
if (of_find_property(vreg->aggr_vreg->dev->of_node, buf, NULL) ||
of_find_property(vreg->of_node, buf, NULL)) {
kfree(buf);
len = strlen(vreg->rdesc.name) + 10;
@ -1670,6 +1671,8 @@ static int rpmh_regulator_init_vreg_supply(struct rpmh_vreg *vreg)
scnprintf(buf, len, "%s-parent", vreg->rdesc.name);
vreg->rdesc.supply_name = buf;
} else if (of_find_property(vreg->of_node, "vin-supply", NULL)) {
vreg->rdesc.supply_name = "vin";
} else {
kfree(buf);
}