diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-20 11:04:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-20 11:04:02 -0800 |
| commit | b648264cd490c811a9a6b43bd478e1656b44b447 (patch) | |
| tree | 5c059bc08b337e7842f88c63be100226575f7a59 | |
| parent | af215c980c1fbf1ca01675b128b0dd194745b880 (diff) | |
| parent | 13221496065fa12fac4f8a8e725444679ffddb78 (diff) | |
| download | linux-b648264cd490c811a9a6b43bd478e1656b44b447.tar.gz linux-b648264cd490c811a9a6b43bd478e1656b44b447.tar.bz2 linux-b648264cd490c811a9a6b43bd478e1656b44b447.zip | |
Merge tag 'regulator-fix-v6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown:
"The recently added regulator-uv-survival-time-ms property was renamed
during the review of the series that added it, but unfortunately only
in the DT binding and not in the code that parses the binding.
This brings the code in line with the binding, if someone started
using the original name we can add compat support for it but there's
nothing upstream yet and it's a very niche feature so hopefully not"
* tag 'regulator-fix-v6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
regulator: rename regulator-uv-survival-time-ms according to DT binding
| -rw-r--r-- | drivers/regulator/of_regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 3d85762beda6..e5b4b93c07e3 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c @@ -175,7 +175,7 @@ static int of_get_regulation_constraints(struct device *dev, if (!ret) constraints->enable_time = pval; - ret = of_property_read_u32(np, "regulator-uv-survival-time-ms", &pval); + ret = of_property_read_u32(np, "regulator-uv-less-critical-window-ms", &pval); if (!ret) constraints->uv_less_critical_window_ms = pval; else |