From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423717AbcFHJX4 (ORCPT ); Wed, 8 Jun 2016 05:23:56 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:35265 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161881AbcFHJVn (ORCPT ); Wed, 8 Jun 2016 05:21:43 -0400 From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, patrice.chotard@st.com, thierry.reding@gmail.com, robh+dt@kernel.org, linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, Lee Jones Subject: [PATCH v3 18/20] pwm: sti: It's now valid for number of PWM channels to be zero Date: Wed, 8 Jun 2016 10:21:33 +0100 Message-Id: <20160608092135.21184-19-lee.jones@linaro.org> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160608092135.21184-1-lee.jones@linaro.org> References: <20160608092135.21184-1-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Setting up the STI PWM IP as capture only, with zero PWM-out devices is a perfectly valued configuration. It is no longer okay to assume that there must be at least 1 PWM-out devices. In this patch we make the default number of PWM-out devices zero and only configure channels explicitly requested. Reported-by: Peter Griffin Signed-off-by: Lee Jones --- drivers/pwm/pwm-sti.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c index cecb6d4..64db5a5 100644 --- a/drivers/pwm/pwm-sti.c +++ b/drivers/pwm/pwm-sti.c @@ -483,6 +483,11 @@ static int sti_pwm_probe_dt(struct sti_pwm_chip *pc) if (!ret) cdata->cpt_num_devs = num_devs; + if (cdata->pwm_num_devs && !cdata->cpt_num_devs) { + dev_err(dev, "No channels configured\n"); + return -EINVAL; + } + reg_fields = cdata->reg_fields; pc->prescale_low = devm_regmap_field_alloc(dev, pc->regmap, @@ -573,7 +578,7 @@ static int sti_pwm_probe(struct platform_device *pdev) cdata->reg_fields = &sti_pwm_regfields[0]; cdata->max_prescale = 0xff; cdata->max_pwm_cnt = 255; - cdata->pwm_num_devs = 1; + cdata->pwm_num_devs = 0; cdata->cpt_num_devs = 0; pc->cdata = cdata; @@ -585,6 +590,9 @@ static int sti_pwm_probe(struct platform_device *pdev) if (ret) return ret; + if (!cdata->pwm_num_devs) + goto skip_pwm; + pc->pwm_clk = of_clk_get_by_name(dev->of_node, "pwm"); if (IS_ERR(pc->pwm_clk)) { dev_err(dev, "failed to get PWM clock\n"); @@ -597,6 +605,10 @@ static int sti_pwm_probe(struct platform_device *pdev) return ret; } +skip_pwm: + if (!cdata->cpt_num_devs) + goto skip_cpt; + pc->cpt_clk = of_clk_get_by_name(dev->of_node, "capture"); if (IS_ERR(pc->cpt_clk)) { dev_err(dev, "failed to get PWM capture clock\n"); @@ -609,6 +621,7 @@ static int sti_pwm_probe(struct platform_device *pdev) return ret; } +skip_cpt: pc->chip.dev = dev; pc->chip.ops = &sti_pwm_ops; pc->chip.base = -1; -- 2.8.3