enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert resolving supplies after creating regulator for rockchip64-dev

Browse Source 
With the reverted commit rk3399 boards do not boot as rk808 fails to be probed.
aea6cb9970
This commit is contained in:
Piotr Szczepanik 2020-10-30 23:17:01 +01:00
parent 0f1f9bd18d
commit ea0ea31632
No known key found for this signature in database
GPG Key ID: 0305358EB314F205
1 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
patch/kernel/rockchip64-dev/general-resolve-regulator-before-create.patch Normal file
View File

@ -0,0 +1,38 @@
This patch reverts https://github.com/torvalds/linux/commit/aea6cb99703e17019e025aa71643b4d3e0a24413
that got backported into both 5.8.17 and 5.9.2
Without it rk808 used by all rk3399 boards fails to be probed.
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 4859cf84c..b6dcbb779 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -5256,20 +5256,15 @@ regulator_register(const struct regulator_desc *regulator_desc,
else if (regulator_desc->supply_name)
rdev->supply_name = regulator_desc->supply_name;
+ /*
+ * Attempt to resolve the regulator supply, if specified,
+ * but don't return an error if we fail because we will try
+ * to resolve it again later as more regulators are added.
+ */
+ if (regulator_resolve_supply(rdev))
+ rdev_dbg(rdev, "unable to resolve supply\n");
+
ret = set_machine_constraints(rdev, constraints);
- if (ret == -EPROBE_DEFER) {
- /* Regulator might be in bypass mode and so needs its supply
- * to set the constraints */
- /* FIXME: this currently triggers a chicken-and-egg problem
- * when creating -SUPPLY symlink in sysfs to a regulator
- * that is just being created */
- ret = regulator_resolve_supply(rdev);
- if (!ret)
- ret = set_machine_constraints(rdev, constraints);
- else
- rdev_dbg(rdev, "unable to resolve supply early: %pe\n",
- ERR_PTR(ret));
- }
if (ret < 0)
goto wash;