mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Chao Xie <chao.xie@marvell.com>
To: <thierry.reding@avionic-design.de>,
	<linux-kernel@vger.kernel.org>, <xiechao.mail@gmail.com>
Cc: Chao Xie <chao.xie@marvell.com>
Subject: [PATCH 3/3] pwm: pxa: add device tree support
Date: Tue, 16 Apr 2013 02:51:55 -0400	[thread overview]
Message-ID: <1366095115-21864-4-git-send-email-chao.xie@marvell.com> (raw)
In-Reply-To: <1366095115-21864-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 |   31 ++++++++++++++++++++++++++++++-
 1 files changed, 30 insertions(+), 1 deletions(-)

diff --git a/drivers/pwm/pwm-pxa.c b/drivers/pwm/pwm-pxa.c
index eafca4a..345aa83 100644
--- a/drivers/pwm/pwm-pxa.c
+++ b/drivers/pwm/pwm-pxa.c
@@ -18,6 +18,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>
@@ -135,12 +137,34 @@ static struct pwm_ops pxa_pwm_ops = {
 	.owner = THIS_MODULE,
 };
 
+static struct of_device_id pxa_pwm_of_match[] = {
+	{
+		.compatible = "mrvl,pxa25x-pwm",
+		.data = (void *)0
+	}, {
+		.compatible = "mrvl,pxa27x-pwm",
+		.data = (void *)HAS_SECONDARY_PWM
+	}, {
+		.compatible = "mrvl,pxa168-pwm",
+		.data = (void *)0
+	}, {
+		.compatible = "mrvl,pxa910-pwm",
+		.data = (void *)0
+	},
+	{}
+};
+
+MODULE_DEVICE_TABLE(of, pxa_pwm_of_match);
+
 static int pwm_probe(struct platform_device *pdev)
 {
 	const struct platform_device_id *id = platform_get_device_id(pdev);
+	const struct of_device_id *of_id =
+			of_match_device(pxa_pwm_of_match, &pdev->dev);
 	struct pxa_pwm_chip *pwm;
 	struct resource *r;
 	int ret = 0;
+	unsigned int npwm;
 
 	pwm = devm_kzalloc(&pdev->dev, sizeof(*pwm), GFP_KERNEL);
 	if (pwm == NULL) {
@@ -157,7 +181,12 @@ 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;
+	if (of_id)
+		npwm = (unsigned int)(of_id->data);
+	else
+		npwm = id->driver_data;
+
+	pwm->chip.npwm = (npwm & HAS_SECONDARY_PWM) ? 2 : 1;
 
 	r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (r == NULL) {
-- 
1.7.4.1


  parent reply	other threads:[~2013-04-16  6:52 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-16  6:51 [PATCH 0/3] pwm: pxa: bug fix and " Chao Xie
2013-04-16  6:51 ` [PATCH 1/3] pwm: pxa: ARCH_MMP share same pwm driver with ARCH_PXA Chao Xie
2013-04-16  6:51 ` [PATCH 2/3] pwm: pxa: use module_platform_driver for driver register Chao Xie
2013-04-16  6:51 ` Chao Xie [this message]
2013-04-18  8:03   ` [PATCH 3/3] pwm: pxa: add device tree support 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=1366095115-21864-4-git-send-email-chao.xie@marvell.com \
    --to=chao.xie@marvell.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®