A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
qctecmdr 2020-01-29 20:50:45 -08:00 • committed by Gerrit - the friendly Code Review server
commit e9130c5963
1 changed files with 5 additions and 2 deletions
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);
}