From patchwork Wed Mar 30 20:03:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris BREZILLON X-Patchwork-Id: 8703741 Return-Path: X-Original-To: patchwork-linux-fbdev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B064D9F44D for ; Wed, 30 Mar 2016 20:13:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C20F020384 for ; Wed, 30 Mar 2016 20:13:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB3B820361 for ; Wed, 30 Mar 2016 20:13:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755216AbcC3UND (ORCPT ); Wed, 30 Mar 2016 16:13:03 -0400 Received: from down.free-electrons.com ([37.187.137.238]:45510 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755277AbcC3UFe (ORCPT ); Wed, 30 Mar 2016 16:05:34 -0400 Received: by mail.free-electrons.com (Postfix, from userid 110) id AD1961836; Wed, 30 Mar 2016 22:05:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from localhost.localdomain (LFbn-1-2159-240.w90-76.abo.wanadoo.fr [90.76.216.240]) by mail.free-electrons.com (Postfix) with ESMTPSA id 2AB61184B; Wed, 30 Mar 2016 22:05:04 +0200 (CEST) From: Boris Brezillon To: Thierry Reding , linux-pwm@vger.kernel.org Cc: Mike Turquette , Stephen Boyd , linux-clk@vger.kernel.org, Mark Brown , Liam Girdwood , Kamil Debski , lm-sensors@lm-sensors.org, Jean Delvare , Guenter Roeck , Dmitry Torokhov , linux-input@vger.kernel.org, Bryan Wu , Richard Purdie , Jacek Anaszewski , linux-leds@vger.kernel.org, Maxime Ripard , Chen-Yu Tsai , linux-sunxi@googlegroups.com, Joachim Eastwood , Thomas Petazzoni , Heiko Stuebner , linux-rockchip@lists.infradead.org, Jingoo Han , Lee Jones , linux-fbdev@vger.kernel.org, Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Robert Jarzmik , Alexandre Belloni , Kukjin Kim , Krzysztof Kozlowski , linux-samsung-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula , Jonathan Corbet , linux-doc@vger.kernel.org, David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Hartley Sweeten , Ryan Mallon , Alexander Shiyan , Milo Kim , Boris Brezillon Subject: [PATCH v5 27/46] regulator: pwm: adjust PWM config at probe time Date: Wed, 30 Mar 2016 22:03:50 +0200 Message-Id: <1459368249-13241-28-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459368249-13241-1-git-send-email-boris.brezillon@free-electrons.com> References: <1459368249-13241-1-git-send-email-boris.brezillon@free-electrons.com> Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The PWM attached to a PWM regulator device might have been previously configured by the bootloader. Make sure the bootloader and linux config are in sync, and adjust the PWM config if that's not the case. Signed-off-by: Boris Brezillon Acked-by: Mark Brown --- drivers/regulator/pwm-regulator.c | 50 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c index 9154c47..9590fb0 100644 --- a/drivers/regulator/pwm-regulator.c +++ b/drivers/regulator/pwm-regulator.c @@ -240,6 +240,52 @@ static int pwm_regulator_init_continuous(struct platform_device *pdev, return 0; } +static int pwm_regulator_adjust_pwm_config(struct pwm_regulator_data *drvdata) +{ + struct pwm_state pstate = { }; + struct pwm_args pargs = { }; + + pwm_get_args(drvdata->pwm, &pargs); + pwm_get_state(drvdata->pwm, &pstate); + + /* + * if the current period is zero this either means the PWM driver + * does not support initial state retrieval or the PWM was not + * configured. + * In any case, we setup the new period and poloarity, and assign a + * duty_cycle of 0. + */ + if (!pstate.period) { + pstate.duty_cycle = 0; + pstate.period = pargs.period; + pstate.polarity = pargs.polarity; + + return pwm_apply_state(drvdata->pwm, &pstate); + } + + /* + * Adjust the PWM dutycycle/period based on the period value provided + * in PWM args. + */ + if (pargs.period != pstate.period) { + u64 dutycycle = (u64)pstate.duty_cycle * pargs.period; + + do_div(dutycycle, pstate.period); + pstate.duty_cycle = dutycycle; + pstate.period = pargs.period; + } + + /* + * If the polarity changed, we should also change the dutycycle value. + */ + if (pargs.polarity != pstate.polarity) { + pstate.polarity = pargs.polarity; + pstate.duty_cycle = pstate.period - pstate.duty_cycle; + } + + return pwm_apply_state(drvdata->pwm, &pstate); +} + static int pwm_regulator_probe(struct platform_device *pdev) { const struct regulator_init_data *init_data; @@ -283,6 +329,10 @@ static int pwm_regulator_probe(struct platform_device *pdev) return PTR_ERR(drvdata->pwm); } + ret = pwm_regulator_adjust_pwm_config(drvdata); + if (ret) + return ret; + regulator = devm_regulator_register(&pdev->dev, &drvdata->desc, &config); if (IS_ERR(regulator)) {