From: horms+renesas@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/6] ARM: shmobile: r8a7791: enable Audio DMAC peri peri via sound driver
Date: Thu, 19 Mar 2015 11:15:22 +0900 [thread overview]
Message-ID: <d73a5013ed61bc605374f72ce879a358feba7f3e.1426731062.git.horms+renesas@verge.net.au> (raw)
In-Reply-To: <cover.1426731062.git.horms+renesas@verge.net.au>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Audio DMAC peri peri is no longer DMAEngine. it is supported by
sound driver. this patch enable it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 8631e02..a697b94 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -357,13 +357,6 @@
dma-channels = <13>;
};
- audmapp: dma-controller at ec740000 {
- compatible = "renesas,rcar-audmapp";
- #dma-cells = <1>;
-
- reg = <0 0xec740000 0 0x200>;
- };
-
/* The memory map in the User's Manual maps the cores to bus numbers */
i2c0: i2c at e6508000 {
#address-cells = <1>;
@@ -1503,8 +1496,9 @@
reg = <0 0xec500000 0 0x1000>, /* SCU */
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */
- <0 0xec541000 0 0x1280>; /* SSI */
- reg-names = "scu", "adg", "ssiu", "ssi";
+ <0 0xec541000 0 0x1280>, /* SSI */
+ <0 0xec740000 0 0x200>; /* Audio DMAC peri peri*/
+ reg-names = "scu", "adg", "ssiu", "ssi", "audmapp";
clocks = <&mstp10_clks R8A7791_CLK_SSI_ALL>,
<&mstp10_clks R8A7791_CLK_SSI9>, <&mstp10_clks R8A7791_CLK_SSI8>,
--
2.1.4
next prev parent reply other threads:[~2015-03-19 2:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-19 2:15 [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Simon Horman
2015-03-19 2:15 ` [PATCH 1/6] ARM: shmobile: r8a7790: add reg-names for sound Simon Horman
2015-03-19 2:15 ` [PATCH 2/6] ARM: shmobile: r8a7791: " Simon Horman
2015-03-19 2:15 ` [PATCH 3/6] ARM: shmobile: r8a7790: enable Audio DMAC peri peri via sound driver Simon Horman
2015-03-19 2:15 ` Simon Horman [this message]
2015-03-19 2:15 ` [PATCH 5/6] ARM: shmobile: r8a7790: sound enables Audio DMAC entry on DTSI Simon Horman
2015-03-19 2:15 ` [PATCH 6/6] ARM: shmobile: r8a7791: " Simon Horman
2015-04-02 0:54 ` [GIT PULL] Third Round of Renesas ARM Based SoC DT Updates for v4.1 Olof Johansson
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=d73a5013ed61bc605374f72ce879a358feba7f3e.1426731062.git.horms+renesas@verge.net.au \
--to=horms+renesas@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.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).