linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lukasz Majewski <lukma@denx.de>
To: Thierry Reding <thierry.reding@gmail.com>,
	Sascha Hauer <s.hauer@pengutronix.de>,
	Stefan Agner <stefan@agner.ch>,
	Boris Brezillon <boris.brezillon@free-electrons.com>,
	linux-pwm@vger.kernel.org,
	Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>,
	linux-kernel@vger.kernel.org
Cc: "Lothar Wassmann" <LW@karo-electronics.de>,
	kernel@pengutronix.de, "Fabio Estevam" <fabio.estevam@nxp.com>,
	"Lukasz Majewski" <l.majewski@majess.pl>,
	"Lothar Waßmann" <LW@karo-electronics.de>
Subject: [PATCH v4 03/11] pwm: imx: Add separate set of pwm ops for PWMv1 and PWMv2
Date: Thu,  5 Jan 2017 00:36:46 +0100	[thread overview]
Message-ID: <1483573014-13185-4-git-send-email-lukma@denx.de> (raw)
In-Reply-To: <1483573014-13185-1-git-send-email-lukma@denx.de>

From: Lukasz Majewski <l.majewski@majess.pl>

This patch provides separate set of pwm ops utilized by
i.MX's PWMv1 and PWMv2.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Bhuvanchandra DV <bhuvanchandra.dv@toradex.com>
Signed-off-by: Lukasz Majewski <l.majewski@majess.pl>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
---
Changes for v4:
- None

Changes for v3:
- Adjust the code to work with ipg clock removed

Changes for v2:
- New patch
---
 drivers/pwm/pwm-imx.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/pwm/pwm-imx.c b/drivers/pwm/pwm-imx.c
index b1d1e50..0fa480d 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -239,7 +239,14 @@ static void imx_pwm_disable(struct pwm_chip *chip, struct pwm_device *pwm)
 	clk_disable_unprepare(imx->clk_per);
 }
 
-static struct pwm_ops imx_pwm_ops = {
+static struct pwm_ops imx_pwm_ops_v1 = {
+	.enable = imx_pwm_enable,
+	.disable = imx_pwm_disable,
+	.config = imx_pwm_config,
+	.owner = THIS_MODULE,
+};
+
+static struct pwm_ops imx_pwm_ops_v2 = {
 	.enable = imx_pwm_enable,
 	.disable = imx_pwm_disable,
 	.config = imx_pwm_config,
@@ -250,16 +257,19 @@ struct imx_pwm_data {
 	int (*config)(struct pwm_chip *chip,
 		struct pwm_device *pwm, int duty_ns, int period_ns);
 	void (*set_enable)(struct pwm_chip *chip, bool enable);
+	struct pwm_ops *pwm_ops;
 };
 
 static struct imx_pwm_data imx_pwm_data_v1 = {
 	.config = imx_pwm_config_v1,
 	.set_enable = imx_pwm_set_enable_v1,
+	.pwm_ops = &imx_pwm_ops_v1,
 };
 
 static struct imx_pwm_data imx_pwm_data_v2 = {
 	.config = imx_pwm_config_v2,
 	.set_enable = imx_pwm_set_enable_v2,
+	.pwm_ops = &imx_pwm_ops_v2,
 };
 
 static const struct of_device_id imx_pwm_dt_ids[] = {
@@ -281,6 +291,8 @@ static int imx_pwm_probe(struct platform_device *pdev)
 	if (!of_id)
 		return -ENODEV;
 
+	data = of_id->data;
+
 	imx = devm_kzalloc(&pdev->dev, sizeof(*imx), GFP_KERNEL);
 	if (imx == NULL)
 		return -ENOMEM;
@@ -292,7 +304,7 @@ static int imx_pwm_probe(struct platform_device *pdev)
 		return PTR_ERR(imx->clk_per);
 	}
 
-	imx->chip.ops = &imx_pwm_ops;
+	imx->chip.ops = data->pwm_ops;
 	imx->chip.dev = &pdev->dev;
 	imx->chip.base = -1;
 	imx->chip.npwm = 1;
@@ -303,7 +315,6 @@ static int imx_pwm_probe(struct platform_device *pdev)
 	if (IS_ERR(imx->mmio_base))
 		return PTR_ERR(imx->mmio_base);
 
-	data = of_id->data;
 	imx->config = data->config;
 	imx->set_enable = data->set_enable;
 
-- 
2.1.4

  parent reply	other threads:[~2017-01-04 23:37 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-04 23:36 [PATCH v4 00/11] pwm: imx: Provide atomic operation for IMX PWM driver Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 01/11] pwm: print error messages with pr_err() instead of pr_debug() Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 02/11] pwm: imx: remove ipg clock and enable per clock when required Lukasz Majewski
2017-01-05  7:14   ` Boris Brezillon
2017-01-05  7:26     ` Lukasz Majewski
2017-01-05  8:27       ` Boris Brezillon
2017-01-05  8:32         ` Lukasz Majewski
2017-01-10 17:28   ` Stefan Agner
2017-01-04 23:36 ` Lukasz Majewski [this message]
2017-01-04 23:36 ` [PATCH v4 04/11] pwm: imx: Rewrite imx_pwm_*_v1 code to facilitate switch to atomic pwm operation Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 05/11] pwm: imx: Move PWMv2 software reset code to a separate function Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 06/11] pwm: imx: Move PWMv2 wait for fifo slot " Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 07/11] pwm: imx: Provide atomic PWM support for i.MX PWMv2 Lukasz Majewski
2017-01-05  8:50   ` Boris Brezillon
2017-01-05  9:03     ` Lukasz Majewski
2017-01-05  9:19       ` Boris Brezillon
2017-01-05  9:35         ` Lukasz Majewski
2017-01-05  9:53           ` Boris Brezillon
2017-01-10  3:14             ` Stefan Agner
2017-01-10  7:59               ` Boris Brezillon
2017-01-05 21:15         ` Andy Shevchenko
2017-01-06  7:06           ` Boris Brezillon
2017-01-07 18:35         ` Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 08/11] pwm: imx: Remove redundant i.MX PWMv2 code Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 09/11] pwm: core: make the PWM_POLARITY flag in DTB optional Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 10/11] pwm: imx: doc: Update imx-pwm.txt documentation entry Lukasz Majewski
2017-01-04 23:36 ` [PATCH v4 11/11] pwm: imx: Add polarity inversion support to i.MX's PWMv2 Lukasz Majewski

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=1483573014-13185-4-git-send-email-lukma@denx.de \
    --to=lukma@denx.de \
    --cc=LW@karo-electronics.de \
    --cc=bhuvanchandra.dv@toradex.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=fabio.estevam@nxp.com \
    --cc=kernel@pengutronix.de \
    --cc=l.majewski@majess.pl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pwm@vger.kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=stefan@agner.ch \
    --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;
as well as URLs for NNTP newsgroup(s).