Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752786AbbKPI7g (ORCPT ); Mon, 16 Nov 2015 03:59:36 -0500 Received: from down.free-electrons.com ([37.187.137.238]:34874 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752444AbbKPI5Q (ORCPT ); Mon, 16 Nov 2015 03:57:16 -0500 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 , Julia Lawall , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Boris Brezillon Subject: [PATCH v4 18/24] pwm: declare a default PWM state Date: Mon, 16 Nov 2015 09:56:41 +0100 Message-Id: <1447664207-24370-19-git-send-email-boris.brezillon@free-electrons.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1447664207-24370-1-git-send-email-boris.brezillon@free-electrons.com> References: <1447664207-24370-1-git-send-email-boris.brezillon@free-electrons.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2546 Lines: 71 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 Tested-by: Heiko Stuebner --- 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 398c58c..292e7da 100644 --- a/include/linux/pwm.h +++ b/include/linux/pwm.h @@ -103,6 +103,7 @@ struct pwm_state { * @chip_data: chip-private data associated with the PWM device * @lock: used to serialize accesses to the PWM device where necessary * @state: curent PWM channel state + * @default_state: default PWM channel state */ struct pwm_device { const char *label; @@ -114,6 +115,7 @@ struct pwm_device { struct mutex lock; struct pwm_state state; + struct pwm_state default_state; }; static inline bool pwm_is_enabled(const struct pwm_device *pwm) @@ -130,7 +132,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) @@ -140,7 +143,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) @@ -162,7 +165,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) -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/