From: Chao Xie <chao.xie@marvell.com>
To: <thierry.reding@avionic-design.de>,
<linux-kernel@vger.kernel.org>, <xiechao.mail@gmail.com>,
<eric.y.miao@gmail.com>
Cc: Chao Xie <chao.xie@marvell.com>
Subject: [PATCH V4 3/3] pwm: pxa: add device tree support
Date: Sun, 5 May 2013 21:30:01 -0400 [thread overview]
Message-ID: <1367803801-17111-4-git-send-email-chao.xie@marvell.com> (raw)
In-Reply-To: <1367803801-17111-1-git-send-email-chao.xie@marvell.com>
Add the deice tree support for pwm-pxa.
Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
drivers/pwm/pwm-pxa.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index aa4bea7..c8d59a2 100644
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -9,6 +9,8 @@
*
* 2008-02-13 initial version
* eric miao <eric.miao@marvell.com>
+ * 2013-04-24 add device tree support
+ * Chao Xie <chao.xie@marvell.com>
*/
#include <linux/module.h>
@@ -18,6 +20,8 @@
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/pwm.h>
#include <asm/div64.h>
@@ -124,6 +128,38 @@ static struct pwm_ops pxa_pwm_ops = {
.owner = THIS_MODULE,
};
+static const struct of_device_id pxa_pwm_of_match[] = {
+ {
+ .compatible = "marvell,pxa25x-pwm",
+ }, {
+ .compatible = "marvell,pxa27x-pwm",
+ .data = (void *)HAS_SECONDARY_PWM
+ }, {
+ .compatible = "marvell,pxa168-pwm",
+ }, {
+ .compatible = "marvell,pxa910-pwm",
+ },
+ {}
+};
+
+MODULE_DEVICE_TABLE(of, pxa_pwm_of_match);
+
+static int pxa_pwm_parse_data_dt(struct platform_device *pdev,
+ struct pxa_pwm_chip *pwm)
+{
+ const struct of_device_id *of_id =
+ of_match_device(pxa_pwm_of_match, &pdev->dev);
+ unsigned int npwm;
+
+ if (!of_id)
+ return -ENODEV;
+
+ npwm = (unsigned int)of_id->data;
+ pwm->chip.npwm = (npwm & HAS_SECONDARY_PWM) ? 2 : 1;
+
+ return 0;
+}
+
static int pwm_probe(struct platform_device *pdev)
{
const struct platform_device_id *id = platform_get_device_id(pdev);
@@ -144,7 +180,6 @@ static int pwm_probe(struct platform_device *pdev)
pwm->chip.dev = &pdev->dev;
pwm->chip.ops = &pxa_pwm_ops;
pwm->chip.base = -1;
- pwm->chip.npwm = (id->driver_data & HAS_SECONDARY_PWM) ? 2 : 1;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (r == NULL) {
@@ -156,6 +191,20 @@ static int pwm_probe(struct platform_device *pdev)
if (IS_ERR(pwm->mmio_base))
return PTR_ERR(pwm->mmio_base);
+ if (!id) {
+ if (IS_ENABLED(CONFIG_OF))
+ ret = pxa_pwm_parse_data_dt(pdev, pwm);
+ else
+ ret = -ENODEV;
+ } else {
+ pwm->chip.npwm = (id->driver_data & HAS_SECONDARY_PWM) ? 2 : 1;
+ }
+
+ if (ret) {
+ dev_err(&pdev->dev, "failed to parse data from device id\n");
+ return ret;
+ }
+
ret = pwmchip_add(&pwm->chip);
if (ret < 0) {
dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret);
@@ -181,6 +230,7 @@ static struct platform_driver pwm_driver = {
.driver = {
.name = "pxa25x-pwm",
.owner = THIS_MODULE,
+ .of_match_table = pxa_pwm_of_match,
},
.probe = pwm_probe,
.remove = pwm_remove,
--
1.7.4.1
next prev parent reply other threads:[~2013-05-06 1:31 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-06 1:29 [PATCH V4 0/3] pwm: pxa: bug fix and " Chao Xie
2013-05-06 1:29 ` [PATCH V4 1/3] pwm: pxa: ARCH_MMP share same pwm driver with ARCH_PXA Chao Xie
2013-05-13 2:07 ` Eric Miao
2013-05-06 1:30 ` [PATCH V4 2/3] pwm: pxa: use module_platform_driver() Chao Xie
2013-05-13 2:08 ` Eric Miao
2013-05-06 1:30 ` Chao Xie [this message]
2013-05-13 2:27 ` [PATCH V4 3/3] pwm: pxa: add device tree support Eric Miao
2013-05-13 5:04 ` Chao Xie
2013-05-13 6:20 ` Eric Miao
2013-05-21 5:21 ` Chao Xie
2013-05-23 19:10 ` Thierry Reding
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=1367803801-17111-4-git-send-email-chao.xie@marvell.com \
--to=chao.xie@marvell.com \
--cc=eric.y.miao@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=thierry.reding@avionic-design.de \
--cc=xiechao.mail@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®