From: Ben Dooks <ben.dooks@sifive.com>
To: linux-pwm@vger.kernel.org
Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
Lee Jones <lee.jones@linaro.org>,
u.kleine-koenig@pengutronix.de,
Thierry Reding <thierry.reding@gmail.com>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Greentime Hu <greentime.hu@sifive.com>,
jarkko.nikula@linux.intel.com,
William Salmon <william.salmon@sifive.com>,
Jude Onyenegecha <jude.onyenegecha@sifive.com>,
Ben Dooks <ben.dooks@sifive.com>
Subject: [RFC v4 07/10] pwm: dwc: make timer clock configurable
Date: Tue, 16 Aug 2022 22:14:51 +0100 [thread overview]
Message-ID: <20220816211454.237751-8-ben.dooks@sifive.com> (raw)
In-Reply-To: <20220816211454.237751-1-ben.dooks@sifive.com>
Add a configurable clock base rate for the pwm as when being built
for non-PCI the block may be sourced from an internal clock.
Signed-off-by: Ben Dooks <ben.dooks@sifive.com>
---
v4:
- moved earlier before the of changes to make the of changes one patch
v2:
- removed the ifdef and merged the other clock patch in here
---
drivers/pwm/pwm-dwc-pci.c | 1 +
drivers/pwm/pwm-dwc.c | 10 ++++++----
drivers/pwm/pwm-dwc.h | 2 ++
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/pwm/pwm-dwc-pci.c b/drivers/pwm/pwm-dwc-pci.c
index 2213d0e7f3c8..949423e368f9 100644
--- a/drivers/pwm/pwm-dwc-pci.c
+++ b/drivers/pwm/pwm-dwc-pci.c
@@ -20,6 +20,7 @@
#include <linux/pci.h>
#include <linux/pm_runtime.h>
#include <linux/pwm.h>
+#include <linux/clk.h>
#include "pwm-dwc.h"
diff --git a/drivers/pwm/pwm-dwc.c b/drivers/pwm/pwm-dwc.c
index 90a8ae1252a1..1251620ab771 100644
--- a/drivers/pwm/pwm-dwc.c
+++ b/drivers/pwm/pwm-dwc.c
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
+#include <linux/clk.h>
#include <linux/pm_runtime.h>
#include <linux/pwm.h>
@@ -47,13 +48,13 @@ static int __dwc_pwm_configure_timer(struct dwc_pwm *dwc,
* periods and check are the result within HW limits between 1 and
* 2^32 periods.
*/
- tmp = DIV_ROUND_CLOSEST_ULL(state->duty_cycle, DWC_CLK_PERIOD_NS);
+ tmp = DIV_ROUND_CLOSEST_ULL(state->duty_cycle, dwc->clk_ns);
if (tmp < 1 || tmp > (1ULL << 32))
return -ERANGE;
low = tmp - 1;
tmp = DIV_ROUND_CLOSEST_ULL(state->period - state->duty_cycle,
- DWC_CLK_PERIOD_NS);
+ dwc->clk_ns);
if (tmp < 1 || tmp > (1ULL << 32))
return -ERANGE;
high = tmp - 1;
@@ -128,12 +129,12 @@ static void dwc_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm,
duty = dwc_pwm_readl(dwc, DWC_TIM_LD_CNT(pwm->hwpwm));
duty += 1;
- duty *= DWC_CLK_PERIOD_NS;
+ duty *= dwc->clk_ns;
state->duty_cycle = duty;
period = dwc_pwm_readl(dwc, DWC_TIM_LD_CNT2(pwm->hwpwm));
period += 1;
- period *= DWC_CLK_PERIOD_NS;
+ period *= dwc->clk_ns;
period += duty;
state->period = period;
@@ -156,6 +157,7 @@ struct dwc_pwm *dwc_pwm_alloc(struct device *dev)
if (!dwc)
return NULL;
+ dwc->clk_ns = 10;
dwc->chip.dev = dev;
dwc->chip.ops = &dwc_pwm_ops;
dwc->chip.npwm = DWC_TIMERS_TOTAL;
diff --git a/drivers/pwm/pwm-dwc.h b/drivers/pwm/pwm-dwc.h
index 68f98eb76152..e5a1f7be7bc8 100644
--- a/drivers/pwm/pwm-dwc.h
+++ b/drivers/pwm/pwm-dwc.h
@@ -41,6 +41,8 @@ struct dwc_pwm_ctx {
struct dwc_pwm {
struct pwm_chip chip;
void __iomem *base;
+ struct clk *clk;
+ unsigned int clk_ns;
struct dwc_pwm_ctx ctx[DWC_TIMERS_TOTAL];
};
#define to_dwc_pwm(p) (container_of((p), struct dwc_pwm, chip))
--
2.35.1
next prev parent reply other threads:[~2022-08-16 21:15 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-16 21:14 [RFC v4 00/10] RFC on synpsys pwm driver changes Ben Dooks
2022-08-16 21:14 ` [RFC v4 01/10] dt-bindings: pwm: Document Synopsys DesignWare snps,pwm-dw-apb-timers-pwm2 Ben Dooks
2022-08-17 5:58 ` Krzysztof Kozlowski
2022-08-18 13:43 ` Ben Dooks
2022-08-18 14:05 ` Krzysztof Kozlowski
2022-08-16 21:14 ` [RFC v4 02/10] pwm: dwc: allow driver to be built with COMPILE_TEST Ben Dooks
2022-09-14 16:11 ` Uwe Kleine-König
2022-09-30 15:47 ` Uwe Kleine-König
2022-08-16 21:14 ` [RFC v4 03/10] pwm: dwc: change &pci->dev to dev in probe Ben Dooks
2022-08-16 21:14 ` [RFC v4 04/10] pwm: dwc: move memory alloc to own function Ben Dooks
2022-08-16 21:14 ` [RFC v4 05/10] pwm: dwc: use devm_pwmchip_add Ben Dooks
2022-09-14 16:14 ` Uwe Kleine-König
2022-08-16 21:14 ` [RFC v4 06/10] pwm: dwc: split pci out of core driver Ben Dooks
2022-08-19 13:38 ` Jarkko Nikula
2022-08-19 16:56 ` Ben Dooks
2022-08-16 21:14 ` Ben Dooks [this message]
2022-09-14 16:17 ` [RFC v4 07/10] pwm: dwc: make timer clock configurable Uwe Kleine-König
2022-08-16 21:14 ` [RFC v4 08/10] pwm: dwc: add of/platform support Ben Dooks
2022-09-14 16:47 ` Uwe Kleine-König
2022-09-19 22:30 ` Ben Dooks
2022-09-15 7:24 ` Uwe Kleine-König
2022-09-19 22:06 ` Ben Dooks
2022-08-16 21:14 ` [RFC v4 09/10] pwm: dwc: add snps,pwm-number to limit pwm count Ben Dooks
2022-09-14 16:54 ` Uwe Kleine-König
2022-08-16 21:14 ` [RFC v4 10/10] pwm: dwc: add PWM bit unset in get_state call Ben Dooks
2022-09-27 16:47 ` [RFC v4 00/10] RFC on synpsys pwm driver changes Uwe Kleine-König
2022-09-27 18:43 ` Ben Dooks
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=20220816211454.237751-8-ben.dooks@sifive.com \
--to=ben.dooks@sifive.com \
--cc=devicetree@vger.kernel.org \
--cc=greentime.hu@sifive.com \
--cc=jarkko.nikula@linux.intel.com \
--cc=jude.onyenegecha@sifive.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lee.jones@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=thierry.reding@gmail.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=william.salmon@sifive.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: link
Be 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.