From: Andreas Larsson <andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org,
software-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org
Subject: [PATCH 1/3] i2c-ocores: Add irq support for sparc
Date: Thu, 11 Oct 2012 16:11:17 +0200 [thread overview]
Message-ID: <1349964679-23244-2-git-send-email-andreas@gaisler.com> (raw)
In-Reply-To: <1349964679-23244-1-git-send-email-andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
There are no platform resources of type IORESOURCE_IRQ on sparc, so irq number
needs to be acquired in a different manner.
Signed-off-by: Andreas Larsson <andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
---
drivers/i2c/busses/i2c-ocores.c | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c
index bffd550..d62cb3f 100644
--- a/drivers/i2c/busses/i2c-ocores.c
+++ b/drivers/i2c/busses/i2c-ocores.c
@@ -25,6 +25,7 @@
#include <linux/slab.h>
#include <linux/io.h>
#include <linux/of_i2c.h>
+#include <linux/of_irq.h>
#include <linux/log2.h>
struct ocores_i2c {
@@ -270,14 +271,22 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
struct resource *res, *res2;
int ret;
int i;
+ int irq = 0;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res)
return -ENODEV;
res2 = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
- if (!res2)
- return -ENODEV;
+ if (res2) {
+ irq = res2->start;
+ } else {
+#ifdef CONFIG_SPARC
+ irq = irq_of_parse_and_map(pdev->dev.of_node, 0);
+#endif
+ if (!irq)
+ return -ENODEV;
+ }
i2c = devm_kzalloc(&pdev->dev, sizeof(*i2c), GFP_KERNEL);
if (!i2c)
@@ -313,8 +322,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
ocores_init(i2c);
init_waitqueue_head(&i2c->wait);
- ret = devm_request_irq(&pdev->dev, res2->start, ocores_isr, 0,
- pdev->name, i2c);
+ ret = devm_request_irq(&pdev->dev, irq, ocores_isr, 0, pdev->name, i2c);
if (ret) {
dev_err(&pdev->dev, "Cannot claim IRQ\n");
return ret;
--
1.7.0.4
next prev parent reply other threads:[~2012-10-11 14:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-11 14:11 [PATCH 0/3] Add support for sparc, custom set and get functions, and the GRLIB port of the controller Andreas Larsson
[not found] ` <1349964679-23244-1-git-send-email-andreas-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org>
2012-10-11 14:11 ` Andreas Larsson [this message]
2012-10-11 14:11 ` [PATCH 2/3] i2c-ocores: Add support for custom getreg and setreg functions Andreas Larsson
2012-10-11 14:11 ` [PATCH 3/3] i2c-ocores: Add support for the GRLIB port of the controller Andreas Larsson
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=1349964679-23244-2-git-send-email-andreas@gaisler.com \
--to=andreas-fkztooa/julbdgjk7y7tuq@public.gmane.org \
--cc=jacmet-OfajU3CKLf1/SzgSGea1oA@public.gmane.org \
--cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=software-FkzTOoA/JUlBDgjK7y7TUQ@public.gmane.org \
/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).