From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Simon Horman <horms@verge.net.au>, Magnus Damm <magnus.damm@gmail.com>
Cc: Ben Dooks <ben.dooks@codethink.co.uk>,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
devicetree@vger.kernel.org, dmaengine@vger.kernel.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH v2 1/7] DMA: shdma: Add r8a7791 support
Date: Mon, 2 Jun 2014 15:42:05 +0200 [thread overview]
Message-ID: <1401716531-29794-2-git-send-email-geert+renesas@glider.be> (raw)
In-Reply-To: <1401716531-29794-1-git-send-email-geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
v2:
- No changes
Documentation/devicetree/bindings/dma/shdma.txt | 5 +++--
drivers/dma/sh/shdmac.c | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/dma/shdma.txt b/Documentation/devicetree/bindings/dma/shdma.txt
index 86d5c509594b..d26b7065ae94 100644
--- a/Documentation/devicetree/bindings/dma/shdma.txt
+++ b/Documentation/devicetree/bindings/dma/shdma.txt
@@ -24,8 +24,9 @@ Optional properties (currently unused):
Required properties:
- compatible: should be of the form "renesas,shdma-<soc>", where <soc> should
be replaced with the desired SoC model, e.g.
- "renesas,shdma-r8a73a4" for the system DMAC on r8a73a4 SoC
- "renesas,shdma-r8a7790" for the DMAC on the R8A7790.
+ "renesas,shdma-r8a73a4" for the system DMAC on r8a73a4 SoC,
+ "renesas,shdma-r8a7790" for the DMAC on the R8A7790,
+ "renesas,shdma-r8a7791" for the DMAC on the R8A7791.
Example:
dmac: dma-multiplexer@0 {
diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
index 91b3f744d7b2..cdbc68e72ca1 100644
--- a/drivers/dma/sh/shdmac.c
+++ b/drivers/dma/sh/shdmac.c
@@ -691,6 +691,7 @@ 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-r8a7790", .data = &shdma_arm_info },
+ { .compatible = "renesas,shdma-r8a7791", .data = &shdma_arm_info },
{}
};
MODULE_DEVICE_TABLE(of, sh_dmae_of_match);
--
1.9.1
next prev parent reply other threads:[~2014-06-02 13:42 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-02 13:42 [PATCH v2 0/7] ARM: shmobile: koelsch reference: Enable DMA for QSPI Geert Uytterhoeven
2014-06-02 13:42 ` Geert Uytterhoeven [this message]
2014-06-04 11:29 ` [PATCH v2 1/7] DMA: shdma: Add r8a7791 support Laurent Pinchart
2014-06-04 11:39 ` Geert Uytterhoeven
2014-06-02 13:42 ` [PATCH v2 2/7] DMA: shdma: Spelling s/controll/control/ Geert Uytterhoeven
2014-06-02 13:50 ` Ben Dooks
2014-06-04 11:25 ` Laurent Pinchart
2014-06-02 13:42 ` [PATCH v2 3/7] ARM: shmobile: r8a7791 dtsi: add SYS-DMAC clocks Geert Uytterhoeven
2014-06-04 11:24 ` Laurent Pinchart
2014-06-04 23:29 ` Simon Horman
2014-06-02 13:42 ` [PATCH v2 4/7] ARM: shmobile: r8a7791: Add SYS-DMAC channel definitions for bindings Geert Uytterhoeven
2014-06-02 13:52 ` Ben Dooks
2014-06-03 7:53 ` Geert Uytterhoeven
2014-06-04 11:30 ` Laurent Pinchart
2014-06-04 11:45 ` Ben Dooks
2014-06-04 11:53 ` Laurent Pinchart
2014-06-02 13:42 ` [PATCH v2 5/7] ARM: shmobile: r8a7791 dtsi: Add SYS-DMAC0 and SYS-DMAC1 nodes Geert Uytterhoeven
2014-06-04 12:25 ` Laurent Pinchart
2014-06-05 0:17 ` Kuninori Morimoto
2014-06-05 12:37 ` Laurent Pinchart
2014-06-06 11:22 ` Ben Dooks
2014-06-02 13:42 ` [PATCH v2 6/7] ARM: shmobile: koelsch dts: Enable sysdma0 and sysdma1 Geert Uytterhoeven
2014-06-02 13:42 ` [PATCH v2 7/7] ARM: shmobile: r8a7791 dtsi: Enable DMA for QSPI Geert Uytterhoeven
2014-06-02 13:53 ` Ben Dooks
2014-06-02 13:58 ` [PATCH v2 0/7] ARM: shmobile: koelsch reference: " Ben Dooks
2014-06-03 4:36 ` Khiem Nguyen
2014-06-03 7:05 ` Geert Uytterhoeven
2014-06-03 23:29 ` Simon Horman
2014-06-04 0:18 ` Khiem Nguyen
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=1401716531-29794-2-git-send-email-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=ben.dooks@codethink.co.uk \
--cc=devicetree@vger.kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=horms@verge.net.au \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-sh@vger.kernel.org \
--cc=magnus.damm@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).