From patchwork Wed Mar 19 13:22:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lothar_Wa=C3=9Fmann?= X-Patchwork-Id: 331725 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 992F72C00A8 for ; Thu, 20 Mar 2014 00:25:32 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934171AbaCSNYR (ORCPT ); Wed, 19 Mar 2014 09:24:17 -0400 Received: from mail.karo-electronics.de ([81.173.242.67]:50166 "EHLO mail.karo-electronics.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934024AbaCSNYQ (ORCPT ); Wed, 19 Mar 2014 09:24:16 -0400 From: =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= To: Thierry Reding , linux-kernel@vger.kernel.org, linux-pwm@vger.kernel.org, =?UTF-8?q?Lothar=20Wa=C3=9Fmann?= Subject: [PATCHv3 1/3] pwm: make the PWM_POLARITY flag in DTB optional Date: Wed, 19 Mar 2014 14:22:53 +0100 Message-Id: <1395235375-12925-2-git-send-email-LW@KARO-electronics.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395235375-12925-1-git-send-email-LW@KARO-electronics.de> References: <1395235375-12925-1-git-send-email-LW@KARO-electronics.de> MIME-Version: 1.0 Sender: linux-pwm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pwm@vger.kernel.org Change the pwm chip driver registration, so that a chip driver that supports polarity inversion can still be used with DTBs that don't provide the 'PWM_POLARITY' flag. This is done to provide polarity inversion support for the pwm-imx driver without having to modify all existing DTS files. Signed-off-by: Lothar Waßmann --- drivers/pwm/core.c | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/drivers/pwm/core.c b/drivers/pwm/core.c index a804713..dc15543 100644 --- a/drivers/pwm/core.c +++ b/drivers/pwm/core.c @@ -131,12 +131,12 @@ static int pwm_device_request(struct pwm_device *pwm, const char *label) return 0; } -struct pwm_device * -of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) +struct pwm_device *of_pwm_xlate(struct pwm_chip *pc, + const struct of_phandle_args *args) { struct pwm_device *pwm; - if (pc->of_pwm_n_cells < 3) + if (pc->of_pwm_n_cells < 2) return ERR_PTR(-EINVAL); if (args->args[0] >= pc->npwm) @@ -148,6 +148,9 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) pwm_set_period(pwm, args->args[1]); + if (pc->of_pwm_n_cells < 3) + return pwm; + if (args->args[2] & PWM_POLARITY_INVERTED) pwm_set_polarity(pwm, PWM_POLARITY_INVERSED); else @@ -155,27 +158,14 @@ of_pwm_xlate_with_flags(struct pwm_chip *pc, const struct of_phandle_args *args) return pwm; } -EXPORT_SYMBOL_GPL(of_pwm_xlate_with_flags); -static struct pwm_device * -of_pwm_simple_xlate(struct pwm_chip *pc, const struct of_phandle_args *args) +struct pwm_device * +of_pwm_xlate_with_flags(struct pwm_chip *pc, + const struct of_phandle_args *args) { - struct pwm_device *pwm; - - if (pc->of_pwm_n_cells < 2) - return ERR_PTR(-EINVAL); - - if (args->args[0] >= pc->npwm) - return ERR_PTR(-EINVAL); - - pwm = pwm_request_from_chip(pc, args->args[0], NULL); - if (IS_ERR(pwm)) - return pwm; - - pwm_set_period(pwm, args->args[1]); - - return pwm; + return of_pwm_xlate(pc, args); } +EXPORT_SYMBOL_GPL(of_pwm_xlate_with_flags); static void of_pwmchip_add(struct pwm_chip *chip) { @@ -183,8 +173,11 @@ static void of_pwmchip_add(struct pwm_chip *chip) return; if (!chip->of_xlate) { - chip->of_xlate = of_pwm_simple_xlate; - chip->of_pwm_n_cells = 2; + chip->of_xlate = of_pwm_xlate; + if (chip->ops->set_polarity) + chip->of_pwm_n_cells = 3; + else + chip->of_pwm_n_cells = 2; } of_node_get(chip->dev->of_node); @@ -536,13 +529,6 @@ struct pwm_device *of_pwm_get(struct device_node *np, const char *con_id) goto put; } - if (args.args_count != pc->of_pwm_n_cells) { - pr_debug("%s: wrong #pwm-cells for %s\n", np->full_name, - args.np->full_name); - pwm = ERR_PTR(-EINVAL); - goto put; - } - pwm = pc->of_xlate(pc, &args); if (IS_ERR(pwm)) goto put;