Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5BCE9EB64DC for ; Tue, 18 Jul 2023 07:05:36 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1637B86728; Tue, 18 Jul 2023 09:05:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="CUpO2Uee"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7CAB186712; Tue, 18 Jul 2023 09:05:17 +0200 (CEST) Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id D15B5866D6 for ; Tue, 18 Jul 2023 09:05:13 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=clamor95@gmail.com Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3fbc656873eso55307325e9.1 for ; Tue, 18 Jul 2023 00:05:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689663913; x=1692255913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=IKqUzXTzYjYAE8sUPlOBQdG6Q7E1DH2PAP55cGMJcaM=; b=CUpO2UeeoFjFSwb2fMlCpvJ6CFfZCHgQVeIRF5LUW4a9mdizYhCf6KCc7+BlfL+hJV z1QCN9NMkCMN3M4UwzPYcdwoZlk8f81jSOUFZID/ZEjB5foShwm6Os4v8OKuIdG8XNd5 xaJn3pGVgrGSV4jvpzhufnOTa4gdqDtj7Cjuzjzu/xhQbZDjtv1JMLKtKEP6HdQ2wEiM djH36oMnsGusL9AI0CRtcRFuSu127TQKmFM8+wYh6Vdf9bZQZTrES2VQnKi5hTaBNF8Q S41bt5JH/Dbn5YZpAa1JFMYeirMh1fBZd6qJ4nusHqjIpFbnFqlNDR5Jjr9vzdyZqFbQ dHaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689663913; x=1692255913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IKqUzXTzYjYAE8sUPlOBQdG6Q7E1DH2PAP55cGMJcaM=; b=Xh1sOzqH9/oV4vI/OJ5K+g2XMdCZdSvNYcQhAhAldx2fT27ozx4/N5V8bZxh4sCO+1 GgFA3Id57e7Djr1tYrgihXbKxQwi2JRUNrbY7zKyT/oRJfDBiy0Kjd5pbwatECF8UmBt +Fkd5z3c4ynoweKbDMaByPy98IUbrJE9QJ/kglh3m9hgox7+rXRcQJxRylbR0hDppQk7 MXxIVFzST1YJaOlZxPys/+1VYEq7P4T4VFQBsdBAnXfeJmMEr0JqcrOokGDHO8I8MgKB 1Ka4pVqXzi6fLn7ocoSUDNaiKrXnzYpeS8Jr+fP7MJszNgIzCK5irZgO7NKbPb1NVCEr eiDA== X-Gm-Message-State: ABy/qLbaU537Ly40wLgQBERwLdFgoX04n9l8tPGVsEieKeRctL01p82o fRiwrzW/eySSqBM50uEXU/c= X-Google-Smtp-Source: APBJJlHFRcjZbLadG5DmpE39Y3cv3MQjHA+a7zncgqiAypZRVtCqNtsR/suByc1bhT29/sUHJjBD1Q== X-Received: by 2002:a05:600c:11c8:b0:3fb:fa26:45a8 with SMTP id b8-20020a05600c11c800b003fbfa2645a8mr1303292wmi.28.1689663912982; Tue, 18 Jul 2023 00:05:12 -0700 (PDT) Received: from xeon.. ([188.163.112.64]) by smtp.gmail.com with ESMTPSA id z10-20020a05600c220a00b003fbfea1afffsm1343644wml.27.2023.07.18.00.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 00:05:12 -0700 (PDT) From: Svyatoslav Ryhel To: Simon Glass , Philipp Tomsich , Kever Yang , Kostya Porotchkin , Neil Armstrong , Marek Vasut , Patrick Delaunay , Patrice Chotard , Jagan Teki , Matteo Lisi , Jaehoon Chung , Anatolij Gustschin , Jonas Karlman , Quentin Schulz , Svyatoslav Ryhel , Eugen Hristev Cc: u-boot@lists.denx.de, u-boot-amlogic@groups.io, u-boot@dh-electronics.com, uboot-stm32@st-md-mailman.stormreply.com Subject: [PATCH v1 1/4] power: regulator: expand basic reference counter onto all uclass Date: Tue, 18 Jul 2023 10:05:01 +0300 Message-Id: <20230718070504.19810-2-clamor95@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230718070504.19810-1-clamor95@gmail.com> References: <20230718070504.19810-1-clamor95@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Commit is based on 4fcba5d ("regulator: implement basic reference counter") but expands the idea to all regulators instead of just fixed/gpio regulators. Signed-off-by: Svyatoslav Ryhel --- drivers/power/regulator/regulator-uclass.c | 22 ++++++++++++++++++++++ drivers/power/regulator/regulator_common.c | 22 ---------------------- drivers/power/regulator/regulator_common.h | 21 --------------------- include/power/regulator.h | 2 ++ 4 files changed, 24 insertions(+), 43 deletions(-) diff --git a/drivers/power/regulator/regulator-uclass.c b/drivers/power/regulator/regulator-uclass.c index 3a6ba69f6d..c9194fe95c 100644 --- a/drivers/power/regulator/regulator-uclass.c +++ b/drivers/power/regulator/regulator-uclass.c @@ -172,6 +172,23 @@ int regulator_set_enable(struct udevice *dev, bool enable) if (!enable && uc_pdata->always_on) return -EACCES; + /* If previously enabled, increase count */ + if (enable && uc_pdata->enable_count > 0) { + uc_pdata->enable_count++; + return -EALREADY; + } + + if (!enable) { + if (uc_pdata->enable_count > 1) { + /* If enabled multiple times, decrease count */ + uc_pdata->enable_count--; + return -EBUSY; + } else if (!uc_pdata->enable_count) { + /* If already disabled, do nothing */ + return -EALREADY; + } + } + if (uc_pdata->ramp_delay) old_enable = regulator_get_enable(dev); @@ -187,6 +204,11 @@ int regulator_set_enable(struct udevice *dev, bool enable) } } + if (enable) + uc_pdata->enable_count++; + else + uc_pdata->enable_count--; + return ret; } diff --git a/drivers/power/regulator/regulator_common.c b/drivers/power/regulator/regulator_common.c index e26f5ebec3..d88bc6f6de 100644 --- a/drivers/power/regulator/regulator_common.c +++ b/drivers/power/regulator/regulator_common.c @@ -72,23 +72,6 @@ int regulator_common_set_enable(const struct udevice *dev, return 0; } - /* If previously enabled, increase count */ - if (enable && plat->enable_count > 0) { - plat->enable_count++; - return -EALREADY; - } - - if (!enable) { - if (plat->enable_count > 1) { - /* If enabled multiple times, decrease count */ - plat->enable_count--; - return -EBUSY; - } else if (!plat->enable_count) { - /* If already disabled, do nothing */ - return -EALREADY; - } - } - ret = dm_gpio_set_value(&plat->gpio, enable); if (ret) { pr_err("Can't set regulator : %s gpio to: %d\n", dev->name, @@ -103,10 +86,5 @@ int regulator_common_set_enable(const struct udevice *dev, if (!enable && plat->off_on_delay_us) udelay(plat->off_on_delay_us); - if (enable) - plat->enable_count++; - else - plat->enable_count--; - return 0; } diff --git a/drivers/power/regulator/regulator_common.h b/drivers/power/regulator/regulator_common.h index d4962899d8..15f1fa4c93 100644 --- a/drivers/power/regulator/regulator_common.h +++ b/drivers/power/regulator/regulator_common.h @@ -13,7 +13,6 @@ struct regulator_common_plat { struct gpio_desc gpio; /* GPIO for regulator enable control */ unsigned int startup_delay_us; unsigned int off_on_delay_us; - unsigned int enable_count; }; int regulator_common_of_to_plat(struct udevice *dev, @@ -21,26 +20,6 @@ int regulator_common_of_to_plat(struct udevice *dev, char *enable_gpio_name); int regulator_common_get_enable(const struct udevice *dev, struct regulator_common_plat *plat); -/* - * Enable or Disable a regulator - * - * This is a reentrant function and subsequent calls that enable will - * increase an internal counter, and disable calls will decrease the counter. - * The actual resource will be enabled when the counter gets to 1 coming from 0, - * and disabled when it reaches 0 coming from 1. - * - * @dev: regulator device - * @plat: Platform data - * @enable: bool indicating whether to enable or disable the regulator - * @return: - * 0 on Success - * -EBUSY if the regulator cannot be disabled because it's requested by - * another device - * -EALREADY if the regulator has already been enabled or has already been - * disabled - * -EACCES if there is no possibility to enable/disable the regulator - * -ve on different error situation - */ int regulator_common_set_enable(const struct udevice *dev, struct regulator_common_plat *plat, bool enable); diff --git a/include/power/regulator.h b/include/power/regulator.h index ff1bfc2435..727776a8cf 100644 --- a/include/power/regulator.h +++ b/include/power/regulator.h @@ -158,6 +158,7 @@ enum regulator_flag { * @name** - fdt regulator name - should be taken from the device tree * ctrl_reg: - Control register offset used to enable/disable regulator * volt_reg: - register offset for writing voltage vsel values + * enable_count - counter of enable calls for this regulator * * Note: * * - set automatically on device probe by the uclass's '.pre_probe' method. @@ -184,6 +185,7 @@ struct dm_regulator_uclass_plat { u8 volt_reg; bool suspend_on; u32 suspend_uV; + u32 enable_count; }; /* Regulator device operations */ -- 2.39.2