From: Lukasz Majewski <l.majewski@majess.pl>
To: Thierry Reding <thierry.reding@gmail.com>,
Stefan Agner <stefan@agner.ch>,
Boris Brezillon <boris.brezillon@free-electrons.com>
Cc: linux-pwm@vger.kernel.org, linux-kernel@vger.kernel.org,
"Fabio Estevam" <fabio.estevam@nxp.com>,
"Fabio Estevam" <festevam@gmail.com>,
"Lothar Wassmann" <LW@karo-electronics.de>,
"Bhuvanchandra DV" <bhuvanchandra.dv@toradex.com>,
kernel@pengutronix.de, "Lukasz Majewski" <l.majewski@majess.pl>,
"Lothar Waßmann" <LW@KARO-electronics.de>
Subject: [PATCH v2 02/10] pwm: imx: Add separate set of pwm ops for PWMv1 and PWMv2
Date: Thu, 27 Oct 2016 08:29:38 +0200 [thread overview]
Message-ID: <1477549785-4972-3-git-send-email-l.majewski@majess.pl> (raw)
In-Reply-To: <1477549785-4972-1-git-send-email-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 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 d600fd5..ea3ce79 100644
--- a/drivers/pwm/pwm-imx.c
+++ b/drivers/pwm/pwm-imx.c
@@ -240,7 +240,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,
@@ -251,16 +258,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[] = {
@@ -282,6 +292,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;
@@ -300,7 +312,7 @@ static int imx_pwm_probe(struct platform_device *pdev)
return PTR_ERR(imx->clk_ipg);
}
- 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;
@@ -311,7 +323,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
next prev parent reply other threads:[~2016-10-27 6:29 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-27 6:29 [PATCH v2 00/10] pwm: imx: Provide atomic operation for IMX PWM driver Lukasz Majewski
2016-10-27 6:29 ` [PATCH v2 01/10] pwm: print error messages with pr_err() instead of pr_debug() Lukasz Majewski
2016-10-27 6:29 ` Lukasz Majewski [this message]
2016-10-27 6:29 ` [PATCH v2 03/10] pwm: imx: Rewrite imx_pwm_*_v1 code to facilitate switch to atomic pwm operation Lukasz Majewski
2016-10-27 7:40 ` Boris Brezillon
2016-10-27 8:22 ` Lukasz Majewski
2016-10-31 5:59 ` Sascha Hauer
2016-10-31 8:06 ` Lukasz Majewski
2016-10-31 9:24 ` Sascha Hauer
2016-10-31 9:29 ` Sascha Hauer
2016-10-31 11:58 ` Lukasz Majewski
2016-11-01 5:57 ` Lukasz Majewski
2016-11-01 7:17 ` Sascha Hauer
2016-11-01 8:20 ` Lukasz Majewski
2016-11-01 8:59 ` Sascha Hauer
2016-11-02 7:18 ` Lothar Waßmann
2016-11-02 7:36 ` Sascha Hauer
2016-11-02 7:56 ` Lothar Waßmann
2016-11-02 8:06 ` Sascha Hauer
2016-11-02 8:51 ` Lothar Waßmann
2016-11-02 9:34 ` Philipp Zabel
2016-10-27 6:29 ` [PATCH v2 04/10] pwm: imx: Move PWMv2 software reset code to a separate function Lukasz Majewski
2016-11-03 9:34 ` Philipp Zabel
2016-10-27 6:29 ` [PATCH v2 05/10] pwm: imx: Move PWMv2 wait for fifo slot " Lukasz Majewski
2016-10-27 6:29 ` [PATCH v2 06/10] pwm: imx: Provide atomic PWM support for i.MX PWMv2 Lukasz Majewski
2016-10-27 6:29 ` [PATCH v2 07/10] pwm: imx: Remove redundant i.MX PWMv2 code Lukasz Majewski
2016-10-27 6:29 ` [PATCH v2 08/10] pwm: core: make the PWM_POLARITY flag in DTB optional Lukasz Majewski
2016-10-27 6:29 ` [PATCH v2 10/10] 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=1477549785-4972-3-git-send-email-l.majewski@majess.pl \
--to=l.majewski@majess.pl \
--cc=LW@karo-electronics.de \
--cc=bhuvanchandra.dv@toradex.com \
--cc=boris.brezillon@free-electrons.com \
--cc=fabio.estevam@nxp.com \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pwm@vger.kernel.org \
--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).