Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

regulator: Fix for v6.13

Browse Source 
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 change
 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.
 -----BEGIN PGP SIGNATURE-----
 
 iQEyBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmdlaBkACgkQJNaLcl1U
 h9Cmwgf460ZZQ7hZ0oEPN8O5jdSYLqfYsqdwKgHcFjtGE34CbA60vJ2lG7CyxYdK
 FtNx2Bi2MBKTh9B8B0z34qFMlAYe9WVQu90p/oqdPyKbmyFyRzkwP3v9slyJn9qn
 h+aXOTD1JXR9GNsU0/KdL+3ULbaGe6f5g2P17odiys+5zOsJsKKBURiyb+4HlgG0
 LJc+qO8onkj7zYmrrW8oBTiAUUe2PWis4ME/paaF+3rOIMHkEURWag78Z3a9MZ3/
 vxXpStI+rBtj6wEDJ9ACXywCbgFpD3jPooFer862pojcCGePIJzsYkzIJ75lBbsV
 5zSBZm1Bv0XcBdt/+ZdRoH5VsMBe
 =Q2bE
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2024-12-20 11:04:02 -08:00
commit b648264cd4
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/of_regulator.c
View File

@ -175,7 +175,7 @@ static int of_get_regulation_constraints(struct device *dev,
if (!ret) if (!ret)
constraints->enable_time = pval; 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) if (!ret)
constraints->uv_less_critical_window_ms = pval; constraints->uv_less_critical_window_ms = pval;
else else