Revert "power-domain: Add refcounting"
Unfortunately this change breaks boot on K3 platform.
U-Boot will hang after:
U-Boot SPL 2025.04-01050-ga40fc5afaec0 (Apr 14 2025 - 07:31:32 +0000)
SYSFW ABI: 3.1 (firmware rev 0x0009 '9.2.7--v09.02.07 (Kool Koala)')
This reverts commit 197376fbf300e92afa0a1583815d9c9eb52d613a as
suggested in [1].
[1] https://lists.denx.de/pipermail/u-boot/2025-April/587032.html
Signed-off-by: Wadim Egorov <w.egorov@phytec.de>
Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
diff --git a/drivers/power/domain/power-domain-uclass.c b/drivers/power/domain/power-domain-uclass.c
index a6e5f9e..938bd8c 100644
--- a/drivers/power/domain/power-domain-uclass.c
+++ b/drivers/power/domain/power-domain-uclass.c
@@ -12,10 +12,6 @@
#include <power-domain-uclass.h>
#include <dm/device-internal.h>
-struct power_domain_priv {
- int on_count;
-};
-
static inline struct power_domain_ops *power_domain_dev_ops(struct udevice *dev)
{
return (struct power_domain_ops *)dev->driver->ops;
@@ -111,49 +107,22 @@
return ops->rfree ? ops->rfree(power_domain) : 0;
}
-int power_domain_on_lowlevel(struct power_domain *power_domain)
+int power_domain_on(struct power_domain *power_domain)
{
- struct power_domain_priv *priv = dev_get_uclass_priv(power_domain->dev);
struct power_domain_ops *ops = power_domain_dev_ops(power_domain->dev);
- int ret;
debug("%s(power_domain=%p)\n", __func__, power_domain);
- if (priv->on_count++ > 0)
- return -EALREADY;
-
- ret = ops->on ? ops->on(power_domain) : 0;
- if (ret) {
- priv->on_count--;
- return ret;
- }
-
- return 0;
+ return ops->on ? ops->on(power_domain) : 0;
}
-int power_domain_off_lowlevel(struct power_domain *power_domain)
+int power_domain_off(struct power_domain *power_domain)
{
- struct power_domain_priv *priv = dev_get_uclass_priv(power_domain->dev);
struct power_domain_ops *ops = power_domain_dev_ops(power_domain->dev);
- int ret;
debug("%s(power_domain=%p)\n", __func__, power_domain);
- if (priv->on_count <= 0) {
- debug("Power domain %s already off.\n", power_domain->dev->name);
- return -EALREADY;
- }
-
- if (priv->on_count-- > 1)
- return -EBUSY;
-
- ret = ops->off ? ops->off(power_domain) : 0;
- if (ret) {
- priv->on_count++;
- return ret;
- }
-
- return 0;
+ return ops->off ? ops->off(power_domain) : 0;
}
#if CONFIG_IS_ENABLED(OF_REAL)
@@ -211,5 +180,4 @@
UCLASS_DRIVER(power_domain) = {
.id = UCLASS_POWER_DOMAIN,
.name = "power_domain",
- .per_device_auto = sizeof(struct power_domain_priv),
};