From: Olliver Schinagl <o.schinagl@ultimaker.com>
To: Olliver Schinagl <oliver@schinagl.nl>,
Thierry Reding <thierry.reding@gmail.com>,
Rob Herring <robh+dt@kernel.org>, Pawel Moll <pawel.moll@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Ian Campbell <ijc+devicetree@hellion.org.uk>,
Kumar Gala <galak@codeaurora.org>,
Joachim Eastwood <manabian@gmail.com>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Olliver Schinagl <oliver+list@schinagl.nl>,
linux-pwm@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/10] pwm: pwm_gpio: add pulse option
Date: Mon, 26 Oct 2015 22:32:40 +0100 [thread overview]
Message-ID: <1445895161-2317-10-git-send-email-o.schinagl@ultimaker.com> (raw)
In-Reply-To: <1445895161-2317-1-git-send-email-o.schinagl@ultimaker.com>
From: Olliver Schinagl <oliver@schinagl.nl>
With the newly added pwm_pulse option added to the PWM framework, this
patch adds the pulse functionality to the gpio_pwm driver.
Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
---
drivers/pwm/pwm-gpio.c | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/drivers/pwm/pwm-gpio.c b/drivers/pwm/pwm-gpio.c
index cf4b170..24c27b1 100644
--- a/drivers/pwm/pwm-gpio.c
+++ b/drivers/pwm/pwm-gpio.c
@@ -40,6 +40,8 @@ struct gpio_pwm_data {
bool pin_on;
int on_time;
int off_time;
+ unsigned int count;
+ bool pulse;
bool run;
};
@@ -80,6 +82,16 @@ enum hrtimer_restart gpio_pwm_timer(struct hrtimer *timer)
gpio_data->pin_on = false;
}
+ if (gpio_data->count > 0)
+ gpio_data->count--;
+ if (!gpio_data->count && gpio_data->pulse) {
+ struct pwm_device *pwm = container_of((void *)gpio_data,
+ struct pwm_device,
+ chip_data);
+ pwm_pulse_done(pwm);
+ return HRTIMER_NORESTART;
+ }
+
return HRTIMER_RESTART;
}
@@ -88,6 +100,10 @@ static int gpio_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm,
{
struct gpio_pwm_data *gpio_data = pwm_get_chip_data(pwm);
+ /* A full pulse is both the on and off time, and since counting each
+ * iteration of the timer is easy and clean, we need double the count.
+ */
+ gpio_data->count = count * 2;
gpio_data->on_time = duty_ns;
gpio_data->off_time = period_ns - duty_ns;
@@ -111,6 +127,9 @@ static int gpio_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
if (gpio_data->run)
return -EBUSY;
+ if (pwm->pulse_count)
+ gpio_data->pulse = true;
+ gpio_data->count = pwm->pulse_count;
gpio_data->run = true;
if (gpio_data->off_time) {
hrtimer_start(&gpio_data->timer, ktime_set(0, 0),
@@ -130,6 +149,7 @@ static void gpio_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
struct gpio_pwm_data *gpio_data = pwm_get_chip_data(pwm);
gpio_data->run = false;
+ gpio_data->pulse = false;
if (!gpio_data->off_time)
gpio_pwm_off(gpio_data);
}
@@ -196,6 +216,8 @@ static int gpio_pwm_probe(struct platform_device *pdev)
gpio_data->timer.function = &gpio_pwm_timer;
gpio_data->gpiod = gpiod;
gpio_data->pin_on = false;
+ gpio_data->count = 0;
+ gpio_data->pulse = false;
gpio_data->run = false;
if (hrtimer_is_hres_active(&gpio_data->timer))
--
2.6.1
next prev parent reply other threads:[~2015-10-26 21:34 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-26 21:32 [PATCH 00/10] Olliver Schinagl
2015-10-26 21:32 ` [PATCH 01/10] pwm: lpc18xx_pwm: use pwm_set_chip_data Olliver Schinagl
2015-10-26 21:58 ` Ezequiel Garcia
2015-10-27 7:22 ` Olliver Schinagl
2015-10-26 21:32 ` [PATCH 02/10] pwm: sunxi: fix whitespace issue Olliver Schinagl
2015-11-06 16:08 ` Thierry Reding
2015-10-26 21:32 ` [PATCH 03/10] pwm: sunxi: Yield some time to the pwm-block to become ready Olliver Schinagl
2015-11-06 16:12 ` Thierry Reding
2015-11-06 16:34 ` Chen-Yu Tsai
2015-10-26 21:32 ` [PATCH 04/10] pwm: core: use bitops Olliver Schinagl
2015-11-06 14:46 ` Thierry Reding
2015-11-06 14:49 ` Olliver Schinagl
2015-11-06 21:36 ` Andy Shevchenko
2015-10-26 21:32 ` [PATCH 05/10] pwm: sysfs: do not unnecessarily store result in var Olliver Schinagl
2015-11-06 14:51 ` Thierry Reding
2015-10-26 21:32 ` [PATCH 06/10] pwm: sysfs: make use of the DEVICE_ATTR_[RW][WO] macro's Olliver Schinagl
2015-11-06 14:52 ` Thierry Reding
2015-10-26 21:32 ` [PATCH 07/10] pwm: gpio: Add a generic gpio based PWM driver Olliver Schinagl
2015-10-27 7:42 ` Rob Herring
2015-10-27 8:50 ` Olliver Schinagl
2015-11-06 15:57 ` Thierry Reding
2015-10-26 21:32 ` [PATCH 08/10] pwm: core: add pulse feature to the PWM framework Olliver Schinagl
2015-10-26 21:59 ` kbuild test robot
2015-10-26 22:09 ` kbuild test robot
2015-10-26 22:10 ` kbuild test robot
2015-10-26 22:11 ` kbuild test robot
2015-10-26 23:06 ` kbuild test robot
2015-11-06 15:18 ` Thierry Reding
2015-11-06 15:46 ` Olliver Schinagl
2015-11-06 16:05 ` Thierry Reding
2015-11-06 16:18 ` Olliver Schinagl
2015-10-26 21:32 ` Olliver Schinagl [this message]
2015-10-26 21:32 ` [PATCH 10/10] pwm: sunxi: Add possibility to pulse the sunxi pwm output Olliver Schinagl
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=1445895161-2317-10-git-send-email-o.schinagl@ultimaker.com \
--to=o.schinagl@ultimaker.com \
--cc=alexandre.belloni@free-electrons.com \
--cc=devicetree@vger.kernel.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--cc=manabian@gmail.com \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@free-electrons.com \
--cc=oliver+list@schinagl.nl \
--cc=oliver@schinagl.nl \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®