From patchwork Tue Feb 25 10:03:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Pargmann X-Patchwork-Id: 3714481 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 78988BF13A for ; Tue, 25 Feb 2014 10:05:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 88E4B2016C for ; Tue, 25 Feb 2014 10:05:49 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 97200200D4 for ; Tue, 25 Feb 2014 10:05:48 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIEso-0005s8-FQ; Tue, 25 Feb 2014 10:05:02 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIEsg-0003p6-3Z; Tue, 25 Feb 2014 10:04:54 +0000 Received: from metis.ext.pengutronix.de ([2001:6f8:1178:4:290:27ff:fe1d:cc33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WIEsH-0003l7-EQ for linux-arm-kernel@lists.infradead.org; Tue, 25 Feb 2014 10:04:32 +0000 Received: from dude.hi.pengutronix.de ([2001:6f8:1178:2:21e:67ff:fe11:9c5c]) by metis.ext.pengutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1WIErm-0005Cm-Jm; Tue, 25 Feb 2014 11:03:58 +0100 Received: from mpa by dude.hi.pengutronix.de with local (Exim 4.82) (envelope-from ) id 1WIErl-0001QF-SP; Tue, 25 Feb 2014 11:03:57 +0100 From: Markus Pargmann To: Mark Brown , Liam Girdwood Subject: [PATCH 2/2] regulator: core: Error on not always_on dummy regulators Date: Tue, 25 Feb 2014 11:03:47 +0100 Message-Id: <1393322627-26543-3-git-send-email-mpa@pengutronix.de> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1393322627-26543-1-git-send-email-mpa@pengutronix.de> References: <1393322627-26543-1-git-send-email-mpa@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:21e:67ff:fe11:9c5c X-SA-Exim-Mail-From: mpa@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140225_050429_930422_EBF64317 X-CRM114-Status: GOOD ( 18.75 ) X-Spam-Score: -1.9 (-) Cc: kernel@pengutronix.de, Markus Pargmann , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It does not make sense to have dummy/fixed regulators that are not always_on. This patch adds a check in the set_machine_constraints function for this case and returns -EINVAL if such a regulator is registered. This also removes the return -EINVAL from _regulator_do_enable() if the regulator can not be enabled. Signed-off-by: Markus Pargmann --- drivers/regulator/core.c | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 6f71985..cb10faf 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c @@ -954,6 +954,7 @@ static int machine_constraints_current(struct regulator_dev *rdev, } static int _regulator_do_enable(struct regulator_dev *rdev); +static bool regulator_can_enable(struct regulator_dev *rdev); /** * set_machine_constraints - sets regulator constraints @@ -1012,12 +1013,19 @@ static int set_machine_constraints(struct regulator_dev *rdev, } } + if (!rdev->constraints->always_on && !regulator_can_enable(rdev)) + { + rdev_err(rdev, "dummy regulator without always_on constraints is not valid\n"); + ret = -EINVAL; + goto out; + } + /* If the constraints say the regulator should be on at this point * and we have control then make sure it is enabled. */ if (rdev->constraints->always_on || rdev->constraints->boot_on) { ret = _regulator_do_enable(rdev); - if (ret < 0 && ret != -EINVAL) { + if (ret) { rdev_err(rdev, "failed to enable\n"); goto out; } @@ -1739,6 +1747,21 @@ static int regulator_ena_gpio_ctrl(struct regulator_dev *rdev, bool enable) return 0; } +/* + * Returns true if the regulator can be enabled through ops->enable or + * enable gpios. + */ +static bool regulator_can_enable(struct regulator_dev *rdev) +{ + if (rdev->desc->ops->enable) + return true; + + if (rdev->ena_pin) + return true; + + return false; +} + static int _regulator_do_enable(struct regulator_dev *rdev) { int ret, delay; @@ -1763,8 +1786,6 @@ static int _regulator_do_enable(struct regulator_dev *rdev) ret = rdev->desc->ops->enable(rdev); if (ret < 0) return ret; - } else { - return -EINVAL; } /* Allow the regulator to ramp; it would be useful to extend