From patchwork Mon Sep 21 09:33:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 520218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6BE72140187 for ; Mon, 21 Sep 2015 19:37:46 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756409AbbIUJeV (ORCPT ); Mon, 21 Sep 2015 05:34:21 -0400 Received: from down.free-electrons.com ([37.187.137.238]:54229 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756162AbbIUJeP (ORCPT ); Mon, 21 Sep 2015 05:34:15 -0400 Received: by mail.free-electrons.com (Postfix, from userid 110) id 5C0F92129; Mon, 21 Sep 2015 11:34:14 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (col31-4-88-188-80-5.fbx.proxad.net [88.188.80.5]) by mail.free-electrons.com (Postfix) with ESMTPSA id E3B201D3A; Mon, 21 Sep 2015 11:33:38 +0200 (CEST) From: Boris Brezillon To: Thierry Reding , linux-pwm@vger.kernel.org, Mark Brown , Liam Girdwood , Jingoo Han , Lee Jones , linux-fbdev@vger.kernel.org, Bryan Wu , Richard Purdie , Jacek Anaszewski , linux-leds@vger.kernel.org, Maxime Ripard , linux-sunxi@googlegroups.com, Heiko Stuebner , linux-rockchip@lists.infradead.org, Jean-Christophe Plagniol-Villard , Tomi Valkeinen , Daniel Mack , Haojian Zhuang , Robert Jarzmik Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Doug Anderson , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Boris Brezillon Subject: [PATCH v3 05/12] pwm: declare a default PWM state Date: Mon, 21 Sep 2015 11:33:22 +0200 Message-Id: <1442828009-6241-6-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442828009-6241-1-git-send-email-boris.brezillon@free-electrons.com> References: <1442828009-6241-1-git-send-email-boris.brezillon@free-electrons.com> Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Prepare the addition of the PWM initial state retrieval by adding a default state where all the parameters retrieved from DT, platform data or statically forced by the hardware will be stored. Once done we will be able to store the initial state in the ->state field without risking to loose the default parameters. Update the pwm_set/get_default_xxx helpers accordingly. Signed-off-by: Boris Brezillon --- include/linux/pwm.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/linux/pwm.h b/include/linux/pwm.h index 433a097..f8cc460 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -101,6 +101,7 @@ struct pwm_state { * @chip: PWM chip providing this PWM device * @chip_data: chip-private data associated with the PWM device * @state: curent PWM channel state + * @default_state: default PWM channel state */ struct pwm_device { const char *label; @@ -111,6 +112,7 @@ struct pwm_device { void *chip_data; struct pwm_state state; + struct pwm_state default_state; }; static inline bool pwm_is_enabled(const struct pwm_device *pwm) @@ -127,7 +129,8 @@ static inline void pwm_set_period(struct pwm_device *pwm, unsigned int period) static inline void pwm_set_default_period(struct pwm_device *pwm, unsigned int period) { - pwm_set_period(pwm, period); + if (pwm) + pwm->default_state.period = period; } static inline unsigned int pwm_get_period(const struct pwm_device *pwm) @@ -137,7 +140,7 @@ static inline unsigned int pwm_get_period(const struct pwm_device *pwm) static inline unsigned int pwm_get_default_period(const struct pwm_device *pwm) { - return pwm_get_period(pwm); + return pwm ? pwm->default_state.period : 0; } static inline void pwm_set_duty_cycle(struct pwm_device *pwm, unsigned int duty) @@ -159,7 +162,8 @@ int pwm_set_polarity(struct pwm_device *pwm, enum pwm_polarity polarity); static inline void pwm_set_default_polarity(struct pwm_device *pwm, enum pwm_polarity polarity) { - pwm_set_polarity(pwm, polarity); + if (pwm) + pwm->default_state.polarity = polarity; } static inline enum pwm_polarity pwm_get_polarity(const struct pwm_device *pwm)