Commit b648264c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v6.13-rc3' of... 

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
parents af215c98 13221496

drivers/regulator/of_regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -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