From: Lee Jones <lee.jones@linaro.org> To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, patrice.chotard@st.com, thierry.reding@gmail.com, linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, Lee Jones <lee.jones@linaro.org> Subject: [PATCH v4 15/17] pwm: sti: It's now valid for number of PWM channels to be zero Date: Tue, 16 Aug 2016 10:35:06 +0100 [thread overview] Message-ID: <20160816093508.28307-16-lee.jones@linaro.org> (raw) In-Reply-To: <20160816093508.28307-1-lee.jones@linaro.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 <peter.griffin@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- 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 fcc80eb..a1319c0 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.9.0
WARNING: multiple messages have this Message-ID (diff)
From: lee.jones@linaro.org (Lee Jones) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 15/17] pwm: sti: It's now valid for number of PWM channels to be zero Date: Tue, 16 Aug 2016 10:35:06 +0100 [thread overview] Message-ID: <20160816093508.28307-16-lee.jones@linaro.org> (raw) In-Reply-To: <20160816093508.28307-1-lee.jones@linaro.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 <peter.griffin@linaro.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- 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 fcc80eb..a1319c0 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.9.0
next prev parent reply other threads:[~2016-08-16 9:36 UTC|newest] Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-08-16 9:34 [PATCH v4 00/17] pwm: Add support for PWM Capture Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` [PATCH v4 01/17] ARM: dts: STiH407: Supply PWM Capture IRQ Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` [PATCH v4 02/17] ARM: dts: STiH407: Declare PWM Capture data lines via Pinctrl Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` [PATCH v4 03/17] ARM: dts: STiH416: Supply PWM Capture IRQs Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` [PATCH v4 04/17] ARM: dts: STiH416: Declare PWM Capture data lines via Pinctrl Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` [PATCH v4 05/17] ARM: dts: STiH416: Define PWM Capture clock Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` [PATCH v4 06/17] ARM: dts: STiH416: Define the number of PWM Capture channels Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` [PATCH v4 07/17] pwm: sti: Rename channel => device Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-09-05 10:33 ` Thierry Reding 2016-09-05 10:33 ` Thierry Reding 2016-08-16 9:34 ` [PATCH v4 08/17] pwm: sti: Reorganise register names in preparation for new functionality Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-08-16 9:34 ` Lee Jones 2016-09-05 10:35 ` Thierry Reding 2016-09-05 10:35 ` Thierry Reding 2016-09-05 10:35 ` Thierry Reding 2016-08-16 9:35 ` [PATCH v4 09/17] pwm: sti: Only request clock rate when you need to Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-09-05 10:36 ` Thierry Reding 2016-09-05 10:36 ` Thierry Reding 2016-08-16 9:35 ` [PATCH v4 10/17] pwm: sti: Supply PWM Capture register addresses and bit locations Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-09-05 10:41 ` Thierry Reding 2016-09-05 10:41 ` Thierry Reding 2016-08-16 9:35 ` [PATCH v4 11/17] pwm: sti: Supply PWM Capture clock handling Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-09-05 10:42 ` Thierry Reding 2016-09-05 10:42 ` Thierry Reding 2016-09-05 10:42 ` Thierry Reding 2016-08-16 9:35 ` [PATCH v4 12/17] pwm: sti: Initialise PWM Capture device data Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-09-05 10:50 ` Thierry Reding 2016-09-05 10:50 ` Thierry Reding 2016-08-16 9:35 ` [PATCH v4 13/17] pwm: sti: Add support for PWM Capture IRQs Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-09-05 10:53 ` Thierry Reding 2016-09-05 10:53 ` Thierry Reding 2016-09-05 10:53 ` Thierry Reding 2016-08-16 9:35 ` [PATCH v4 14/17] pwm: sti: Add PWM Capture call-back Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-09-05 11:10 ` Thierry Reding 2016-09-05 11:10 ` Thierry Reding 2016-08-16 9:35 ` Lee Jones [this message] 2016-08-16 9:35 ` [PATCH v4 15/17] pwm: sti: It's now valid for number of PWM channels to be zero Lee Jones 2016-09-05 11:20 ` Thierry Reding 2016-09-05 11:20 ` Thierry Reding 2016-09-05 11:20 ` Thierry Reding 2016-08-16 9:35 ` [PATCH v4 16/17] pwm: sti: Take the opportunity to conduct a little house keeping Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-09-05 11:37 ` Thierry Reding 2016-09-05 11:37 ` Thierry Reding 2016-08-16 9:35 ` [PATCH v4 17/17] dt-bindings: pwm: sti: Update DT bindings with recent changes Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-08-16 9:35 ` Lee Jones 2016-08-18 19:20 ` Rob Herring 2016-08-18 19:20 ` Rob Herring 2016-08-18 19:20 ` Rob Herring 2016-08-19 8:35 ` Lee Jones 2016-08-19 8:35 ` Lee Jones 2016-08-19 12:45 ` Rob Herring 2016-08-19 12:45 ` Rob Herring 2016-08-19 12:45 ` Rob Herring 2016-09-05 10:29 ` Thierry Reding 2016-09-05 10:29 ` Thierry Reding 2016-08-25 11:51 ` [STLinux Kernel] [PATCH v4 00/17] pwm: Add support for PWM Capture Peter Griffin 2016-08-25 11:51 ` Peter Griffin
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20160816093508.28307-16-lee.jones@linaro.org \ --to=lee.jones@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=kernel@stlinux.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-pwm@vger.kernel.org \ --cc=patrice.chotard@st.com \ --cc=thierry.reding@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.