From: Ben Dooks <ben.dooks@codethink.co.uk>
To: linux-sh@vger.kernel.org
Subject: [PATCH 5/5] shdmac: wire r8a7790
Date: Wed, 12 Feb 2014 17:59:24 +0000 [thread overview]
Message-ID: <1392227964-7088-6-git-send-email-ben.dooks@codethink.co.uk> (raw)
Add support for R8a7790 with new device tree code
Note, does not yet moved the other of-dma user yet.
---
drivers/dma/sh/shdmac.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 0d765c0..8af2082 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -677,7 +677,8 @@ static const struct shdma_ops sh_dmae_shdma_ops = {
};
static const struct of_device_id sh_dmae_of_match[] = {
- {.compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,},
+ { .compatible = "renesas,shdma-r8a73a4", .data = r8a73a4_shdma_devid,},
+ { .compatible = "renesas,dma-r8a7790", .data = &shdma_arm_info },
{}
};
MODULE_DEVICE_TABLE(of, sh_dmae_of_match);
@@ -693,9 +694,15 @@ static int sh_dmae_probe(struct platform_device *pdev)
struct dma_device *dma_dev;
struct resource *chan, *dmars, *errirq_res, *chanirq_res;
- if (pdev->dev.of_node)
- pdata = of_match_device(sh_dmae_of_match, &pdev->dev)->data;
- else
+ if (pdev->dev.of_node) {
+ const struct of_device_id *match;
+
+ match = of_match_device(sh_dmae_of_match, &pdev->dev);
+ if (match->data = r8a73a4_shdma_devid)
+ pdata = match->data;
+ else
+ pdata = sh_dma_probe_of(pdev, match);
+ } else
pdata = dev_get_platdata(&pdev->dev);
/* get platform data */
--
1.8.5.3
next reply other threads:[~2014-02-12 17:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-12 17:59 Ben Dooks [this message]
2014-02-12 18:30 ` [PATCH 5/5] shdmac: wire r8a7790 Sergei Shtylyov
2014-02-12 18:52 ` Ben Dooks
2014-02-12 21:23 ` Sergei Shtylyov
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=1392227964-7088-6-git-send-email-ben.dooks@codethink.co.uk \
--to=ben.dooks@codethink.co.uk \
--cc=linux-sh@vger.kernel.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).