From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3D40C2BC11 for ; Mon, 14 Sep 2020 14:25:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 683EF20EDD for ; Mon, 14 Sep 2020 14:25:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600093500; bh=VhAKm7/Wt9X1ioKpd2cDViKZseRDrXx25umwKfvJkaw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=01IXJkGgDxCpJhgbjyiTZG/tyh18nlghQoNyHg2XG3iAT5eCm2iJmhlA/nNYgWkTg xC6vEcRNgdXe2izZyxyFf6YRuIxgLDcV4GgNE9gs+7dTgnp4SGpspwleLjG13pONIa litWXwlrUMjqCNQQ1W0ktyIOFpXABWQAVjZqqEVw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726777AbgINOY5 (ORCPT ); Mon, 14 Sep 2020 10:24:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:32954 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726682AbgINNGf (ORCPT ); Mon, 14 Sep 2020 09:06:35 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 830EE221EB; Mon, 14 Sep 2020 13:05:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600088733; bh=VhAKm7/Wt9X1ioKpd2cDViKZseRDrXx25umwKfvJkaw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Um8PwnTOjY2MTyd4FsBxx8MWcJU13ej72yrT1rJNFypmojCfamqZ5KxMtGEhMr/8j f1v+X2V2Zfo2dExTkhC5240YtSC3FKW4NweUQjziZXTVHCP5+61nLmoqJwS6TMFHgQ MMpURbEX99f2OBHRtHWhmwUnO4Go39EMN6jsqC5U= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vincent Whitchurch , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 4.14 05/15] regulator: pwm: Fix machine constraints application Date: Mon, 14 Sep 2020 09:05:16 -0400 Message-Id: <20200914130526.1804913-5-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200914130526.1804913-1-sashal@kernel.org> References: <20200914130526.1804913-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vincent Whitchurch [ Upstream commit 59ae97a7a9e1499c2070e29841d1c4be4ae2994a ] If the zero duty cycle doesn't correspond to any voltage in the voltage table, the PWM regulator returns an -EINVAL from get_voltage_sel() which results in the core erroring out with a "failed to get the current voltage" and ending up not applying the machine constraints. Instead, return -ENOTRECOVERABLE which makes the core set the voltage since it's at an unknown value. For example, with this device tree: fooregulator { compatible = "pwm-regulator"; pwms = <&foopwm 0 100000>; regulator-min-microvolt = <2250000>; regulator-max-microvolt = <2250000>; regulator-name = "fooregulator"; regulator-always-on; regulator-boot-on; voltage-table = <2250000 30>; }; Before this patch: fooregulator: failed to get the current voltage(-22) After this patch: fooregulator: Setting 2250000-2250000uV fooregulator: 2250 mV Signed-off-by: Vincent Whitchurch Link: https://lore.kernel.org/r/20200902130952.24880-1-vincent.whitchurch@axis.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/regulator/pwm-regulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c index a2fd140eff81a..34f3b9778ffa1 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -285,7 +285,7 @@ static int pwm_regulator_init_table(struct platform_device *pdev, return ret; } - drvdata->state = -EINVAL; + drvdata->state = -ENOTRECOVERABLE; drvdata->duty_cycle_table = duty_cycle_table; memcpy(&drvdata->ops, &pwm_regulator_voltage_table_ops, sizeof(drvdata->ops)); -- 2.25.1