All of lore.kernel.org
 help / color / mirror / Atom feed
From: Boris Brezillon <boris.brezillon@free-electrons.com>
To: Thierry Reding <thierry.reding@gmail.com>,
	linux-pwm@vger.kernel.org, Mark Brown <broonie@kernel.org>,
	Liam Girdwood <lgirdwood@gmail.com>
Cc: Heiko Stuebner <heiko@sntech.de>,
	linux-rockchip@lists.infradead.org,
	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>,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Milo Kim <milo.kim@ti.com>,
	Doug Anderson <dianders@google.com>,
	Caesar Wang <wxt@rock-chips.com>,
	Stephen Barber <smbarber@chromium.org>,
	Brian Norris <briannorris@chromium.org>,
	Ajit Pal Singh <ajitpal.singh@st.com>,
	Srinivas Kandagatla <srinivas.kandagatla@gmail.com>,
	Maxime Coquelin <maxime.coquelin@st.com>,
	Patrice Chotard <patrice.chotard@st.com>,
	kernel@stlinux.com,
	Boris Brezillon <boris.brezillon@free-electrons.com>
Subject: [PATCH 07/14] pwm: sti: Add support for hardware readout
Date: Fri,  3 Jun 2016 10:23:05 +0200	[thread overview]
Message-ID: <1464942192-25967-8-git-send-email-boris.brezillon@free-electrons.com> (raw)
In-Reply-To: <1464942192-25967-1-git-send-email-boris.brezillon@free-electrons.com>

Implement ->get_state() to provide support for initial state retrieval.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 drivers/pwm/pwm-sti.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index 92abbd5..6300d3e 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -238,6 +238,43 @@ static void sti_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 	mutex_unlock(&pc->sti_pwm_lock);
 }
 
+static void sti_pwm_get_state(struct pwm_chip *chip,
+			      struct pwm_device *pwm,
+			      struct pwm_state *state)
+{
+	struct sti_pwm_chip *pc = to_sti_pwmchip(chip);
+	unsigned int regval, prescaler;
+	int ret;
+
+	/* The clock has to be enabled to access PWM registers */
+	ret = clk_enable(pc->clk);
+	if (ret) {
+		dev_err(chip->dev, "Failed to enable PWM clk");
+		return;
+	}
+
+	regmap_field_read(pc->prescale_high, &regval);
+	prescaler = regval << 4;
+	regmap_field_read(pc->prescale_low, &regval);
+	prescaler |= regval;
+	state->period = DIV_ROUND_CLOSEST_ULL((u64)(prescaler + 1) *
+					      NSEC_PER_SEC *
+					      (pc->cdata->max_pwm_cnt + 1),
+					      pc->clk_rate);
+
+	regmap_read(pc->regmap, STI_DS_REG(pwm->hwpwm), &regval);
+	state->duty_cycle = DIV_ROUND_CLOSEST_ULL((u64)(regval + 1) *
+						  state->period,
+						  pc->cdata->max_pwm_cnt + 1);
+
+	regmap_field_read(pc->pwm_en, &regval);
+	state->enabled = regval;
+
+	state->polarity = PWM_POLARITY_NORMAL;
+
+	clk_disable(pc->clk);
+}
+
 static void sti_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
 {
 	struct sti_pwm_chip *pc = to_sti_pwmchip(chip);
@@ -249,6 +286,7 @@ static const struct pwm_ops sti_pwm_ops = {
 	.config = sti_pwm_config,
 	.enable = sti_pwm_enable,
 	.disable = sti_pwm_disable,
+	.get_state = sti_pwm_get_state,
 	.free = sti_pwm_free,
 	.owner = THIS_MODULE,
 };
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
To: Thierry Reding
	<thierry.reding-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	linux-pwm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	Liam Girdwood <lgirdwood-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org>,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>,
	Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org>,
	Ian Campbell
	<ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org>,
	Srinivas Kandagatla
	<srinivas.kandagatla-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	Brian Norris
	<briannorris-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Patrice Chotard <patrice.chotard-qxv4g6HH51o@public.gmane.org>,
	Doug Anderson <dianders-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org>,
	Milo Kim <milo.kim-l0cyMroinI0@public.gmane.org>,
	linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	kernel-F5mvAk5X5gdBDgjK7y7TUQ@public.gmane.org,
	Boris Brezillon
	<boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>,
	Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>,
	Maxime Coquelin <maxime.coquelin-qxv4g6HH51o@public.gmane.org>,
	Stephen Barber <smbarber-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>,
	Ajit Pal Singh <ajitpal.singh-qxv4g6HH51o@public.gmane.org>,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	Caesar Wang <wxt-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
Subject: [PATCH 07/14] pwm: sti: Add support for hardware readout
Date: Fri,  3 Jun 2016 10:23:05 +0200	[thread overview]
Message-ID: <1464942192-25967-8-git-send-email-boris.brezillon@free-electrons.com> (raw)
In-Reply-To: <1464942192-25967-1-git-send-email-boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>

Implement ->get_state() to provide support for initial state retrieval.

Signed-off-by: Boris Brezillon <boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
 drivers/pwm/pwm-sti.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index 92abbd5..6300d3e 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -238,6 +238,43 @@ static void sti_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 	mutex_unlock(&pc->sti_pwm_lock);
 }
 
+static void sti_pwm_get_state(struct pwm_chip *chip,
+			      struct pwm_device *pwm,
+			      struct pwm_state *state)
+{
+	struct sti_pwm_chip *pc = to_sti_pwmchip(chip);
+	unsigned int regval, prescaler;
+	int ret;
+
+	/* The clock has to be enabled to access PWM registers */
+	ret = clk_enable(pc->clk);
+	if (ret) {
+		dev_err(chip->dev, "Failed to enable PWM clk");
+		return;
+	}
+
+	regmap_field_read(pc->prescale_high, &regval);
+	prescaler = regval << 4;
+	regmap_field_read(pc->prescale_low, &regval);
+	prescaler |= regval;
+	state->period = DIV_ROUND_CLOSEST_ULL((u64)(prescaler + 1) *
+					      NSEC_PER_SEC *
+					      (pc->cdata->max_pwm_cnt + 1),
+					      pc->clk_rate);
+
+	regmap_read(pc->regmap, STI_DS_REG(pwm->hwpwm), &regval);
+	state->duty_cycle = DIV_ROUND_CLOSEST_ULL((u64)(regval + 1) *
+						  state->period,
+						  pc->cdata->max_pwm_cnt + 1);
+
+	regmap_field_read(pc->pwm_en, &regval);
+	state->enabled = regval;
+
+	state->polarity = PWM_POLARITY_NORMAL;
+
+	clk_disable(pc->clk);
+}
+
 static void sti_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
 {
 	struct sti_pwm_chip *pc = to_sti_pwmchip(chip);
@@ -249,6 +286,7 @@ static const struct pwm_ops sti_pwm_ops = {
 	.config = sti_pwm_config,
 	.enable = sti_pwm_enable,
 	.disable = sti_pwm_disable,
+	.get_state = sti_pwm_get_state,
 	.free = sti_pwm_free,
 	.owner = THIS_MODULE,
 };
-- 
2.7.4

WARNING: multiple messages have this Message-ID (diff)
From: boris.brezillon@free-electrons.com (Boris Brezillon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/14] pwm: sti: Add support for hardware readout
Date: Fri,  3 Jun 2016 10:23:05 +0200	[thread overview]
Message-ID: <1464942192-25967-8-git-send-email-boris.brezillon@free-electrons.com> (raw)
In-Reply-To: <1464942192-25967-1-git-send-email-boris.brezillon@free-electrons.com>

Implement ->get_state() to provide support for initial state retrieval.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
---
 drivers/pwm/pwm-sti.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/drivers/pwm/pwm-sti.c b/drivers/pwm/pwm-sti.c
index 92abbd5..6300d3e 100644
--- a/drivers/pwm/pwm-sti.c
+++ b/drivers/pwm/pwm-sti.c
@@ -238,6 +238,43 @@ static void sti_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 	mutex_unlock(&pc->sti_pwm_lock);
 }
 
+static void sti_pwm_get_state(struct pwm_chip *chip,
+			      struct pwm_device *pwm,
+			      struct pwm_state *state)
+{
+	struct sti_pwm_chip *pc = to_sti_pwmchip(chip);
+	unsigned int regval, prescaler;
+	int ret;
+
+	/* The clock has to be enabled to access PWM registers */
+	ret = clk_enable(pc->clk);
+	if (ret) {
+		dev_err(chip->dev, "Failed to enable PWM clk");
+		return;
+	}
+
+	regmap_field_read(pc->prescale_high, &regval);
+	prescaler = regval << 4;
+	regmap_field_read(pc->prescale_low, &regval);
+	prescaler |= regval;
+	state->period = DIV_ROUND_CLOSEST_ULL((u64)(prescaler + 1) *
+					      NSEC_PER_SEC *
+					      (pc->cdata->max_pwm_cnt + 1),
+					      pc->clk_rate);
+
+	regmap_read(pc->regmap, STI_DS_REG(pwm->hwpwm), &regval);
+	state->duty_cycle = DIV_ROUND_CLOSEST_ULL((u64)(regval + 1) *
+						  state->period,
+						  pc->cdata->max_pwm_cnt + 1);
+
+	regmap_field_read(pc->pwm_en, &regval);
+	state->enabled = regval;
+
+	state->polarity = PWM_POLARITY_NORMAL;
+
+	clk_disable(pc->clk);
+}
+
 static void sti_pwm_free(struct pwm_chip *chip, struct pwm_device *pwm)
 {
 	struct sti_pwm_chip *pc = to_sti_pwmchip(chip);
@@ -249,6 +286,7 @@ static const struct pwm_ops sti_pwm_ops = {
 	.config = sti_pwm_config,
 	.enable = sti_pwm_enable,
 	.disable = sti_pwm_disable,
+	.get_state = sti_pwm_get_state,
 	.free = sti_pwm_free,
 	.owner = THIS_MODULE,
 };
-- 
2.7.4

  parent reply	other threads:[~2016-06-03  8:27 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-03  8:22 [PATCH 00/14] regulator: pwm: various improvements Boris Brezillon
2016-06-03  8:22 ` Boris Brezillon
2016-06-03  8:22 ` Boris Brezillon
2016-06-03  8:22 ` [PATCH 01/14] pwm: Add new helpers to create/manipulate PWM states Boris Brezillon
2016-06-03  8:22   ` Boris Brezillon
2016-06-03  8:23 ` [PATCH 02/14] regulator: pwm: Drop unneeded pwm_enable() call Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 11:08   ` Applied "regulator: pwm: Drop unneeded pwm_enable() call" to the regulator tree Mark Brown
2016-06-03 11:08     ` Mark Brown
2016-06-03 11:08     ` Mark Brown
2016-06-03 11:08     ` Mark Brown
2016-06-03  8:23 ` [PATCH 03/14] pwm: rockchip: Fix period and duty_cycle approximation Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:03   ` Brian Norris
2016-06-03 20:03     ` Brian Norris
2016-06-04  6:19     ` Boris Brezillon
2016-06-04  6:19       ` Boris Brezillon
2016-06-07 17:25       ` Brian Norris
2016-06-07 17:25         ` Brian Norris
2016-06-03  8:23 ` [PATCH 04/14] pwm: rockchip: Add support for hardware readout Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:07   ` Brian Norris
2016-06-03 20:07     ` Brian Norris
2016-06-03 20:20   ` Brian Norris
2016-06-03 20:20     ` Brian Norris
2016-06-04  6:24     ` Boris Brezillon
2016-06-04  6:24       ` Boris Brezillon
2016-06-07 17:26       ` Brian Norris
2016-06-07 17:26         ` Brian Norris
2016-06-03  8:23 ` [PATCH 05/14] pwm: rockchip: Avoid glitches on already running PWMs Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:28   ` Brian Norris
2016-06-03 20:28     ` Brian Norris
2016-06-04  6:26     ` Boris Brezillon
2016-06-04  6:26       ` Boris Brezillon
2016-06-03  8:23 ` [PATCH 06/14] pwm: rockchip: Add support for atomic update Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:37   ` Brian Norris
2016-06-03 20:37     ` Brian Norris
2016-06-03 20:37     ` Brian Norris
2016-06-03  8:23 ` Boris Brezillon [this message]
2016-06-03  8:23   ` [PATCH 07/14] pwm: sti: Add support for hardware readout Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23 ` [PATCH 08/14] pwm: sti: Avoid glitches on already running PWMs Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:38   ` Brian Norris
2016-06-03 20:38     ` Brian Norris
2016-06-03 20:38     ` Brian Norris
2016-06-03  8:23 ` [PATCH 09/14] regulator: pwm: Adjust PWM config at probe time Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:41   ` Brian Norris
2016-06-03 20:41     ` Brian Norris
2016-06-03  8:23 ` [PATCH 10/14] regulator: pwm: Switch to the atomic PWM API Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:50   ` Brian Norris
2016-06-03 20:50     ` Brian Norris
2016-06-03 20:50     ` Brian Norris
2016-06-04  6:28     ` Boris Brezillon
2016-06-04  6:28       ` Boris Brezillon
2016-06-06  6:14       ` Laxman Dewangan
2016-06-06  6:14         ` Laxman Dewangan
2016-06-06  6:14         ` Laxman Dewangan
2016-06-03  8:23 ` [PATCH 11/14] regulator: pwm: properly initialize the ->state field Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:51   ` Brian Norris
2016-06-03 20:51     ` Brian Norris
2016-06-03  8:23 ` [PATCH 12/14] regulator: pwm: Retrieve correct voltage Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 20:55   ` Brian Norris
2016-06-03 20:55     ` Brian Norris
2016-06-03  8:23 ` [PATCH 13/14] regulator: pwm: Support extra continuous mode cases Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 21:03   ` Brian Norris
2016-06-03 21:03     ` Brian Norris
2016-06-04  6:30     ` Boris Brezillon
2016-06-04  6:30       ` Boris Brezillon
2016-06-03  8:23 ` [PATCH 14/14] regulator: pwm: Document pwm-dutycycle-unit and pwm-dutycycle-range Boris Brezillon
2016-06-03  8:23   ` Boris Brezillon
2016-06-03 21:04   ` Brian Norris
2016-06-03 21:04     ` Brian Norris
2016-06-03 21:04     ` Brian Norris
2016-06-06 14:09   ` Rob Herring
2016-06-06 14:09     ` Rob Herring

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=1464942192-25967-8-git-send-email-boris.brezillon@free-electrons.com \
    --to=boris.brezillon@free-electrons.com \
    --cc=ajitpal.singh@st.com \
    --cc=briannorris@chromium.org \
    --cc=broonie@kernel.org \
    --cc=devicetree@vger.kernel.org \
    --cc=dianders@google.com \
    --cc=galak@codeaurora.org \
    --cc=heiko@sntech.de \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=kernel@stlinux.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=mark.rutland@arm.com \
    --cc=maxime.coquelin@st.com \
    --cc=milo.kim@ti.com \
    --cc=patrice.chotard@st.com \
    --cc=pawel.moll@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=smbarber@chromium.org \
    --cc=srinivas.kandagatla@gmail.com \
    --cc=thierry.reding@gmail.com \
    --cc=wxt@rock-chips.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.