Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-19 02:54:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "feat(st-regulator): add support for regulator-always-on" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2022-01-28 16:20:08 +01:00 • committed by TrustedFirmware Code Review
commit a5e8c22233
1 changed files with 25 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
drivers/st/regulator/regulator_core.c
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, STMicroelectronics - All Rights Reserved * Copyright (c) 2021-2022, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
@ -156,6 +156,10 @@ int regulator_disable(struct rdev *rdev)
assert(rdev != NULL); assert(rdev != NULL);
if (rdev->flags & REGUL_ALWAYS_ON) {
return 0;
}
ret = __regulator_set_state(rdev, STATE_DISABLE); ret = __regulator_set_state(rdev, STATE_DISABLE);
udelay(rdev->enable_ramp_delay); udelay(rdev->enable_ramp_delay);
@ -412,6 +416,21 @@ int regulator_set_flag(struct rdev *rdev, uint16_t flag)
return 0; return 0;
} }
static int parse_properties(const void *fdt, struct rdev *rdev, int node)
{
int ret;
if (fdt_getprop(fdt, node, "regulator-always-on", NULL) != NULL) {
VERBOSE("%s: set regulator-always-on\n", rdev->desc->node_name);
ret = regulator_set_flag(rdev, REGUL_ALWAYS_ON);
if (ret != 0) {
return ret;
}
}
return 0;
}
/* /*
* Parse the device-tree for a regulator * Parse the device-tree for a regulator
* *
@ -476,6 +495,11 @@ static int parse_dt(struct rdev *rdev, int node)
return ret; return ret;
} }
ret = parse_properties(fdt, rdev, node);
if (ret != 0) {
return ret;
}
return 0; return 0;
} }