From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/12] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372
Date: Sun, 28 Oct 2012 02:26:06 +0000 [thread overview]
Message-ID: <1351391173-32379-6-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1351391173-32379-1-git-send-email-horms@verge.net.au>
From: Bastian Hecht <hechtb@googlemail.com>
SH7372 can use DMA with the FLCTL flash controller. Add required slave
IDs and slave descriptors.
Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++++
arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index eb98b45..d65fbbe 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -452,6 +452,10 @@ enum {
SHDMA_SLAVE_SCIF5_RX,
SHDMA_SLAVE_SCIF6_TX,
SHDMA_SLAVE_SCIF6_RX,
+ SHDMA_SLAVE_FLCTL0_TX,
+ SHDMA_SLAVE_FLCTL0_RX,
+ SHDMA_SLAVE_FLCTL1_TX,
+ SHDMA_SLAVE_FLCTL1_RX,
SHDMA_SLAVE_SDHI0_RX,
SHDMA_SLAVE_SDHI0_TX,
SHDMA_SLAVE_SDHI1_RX,
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index a07954f..a360111 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -408,6 +408,26 @@ static const struct sh_dmae_slave_config sh7372_dmae_slaves[] = {
.chcr = CHCR_RX(XMIT_SZ_8BIT),
.mid_rid = 0x3e,
}, {
+ .slave_id = SHDMA_SLAVE_FLCTL0_TX,
+ .addr = 0xe6a30050,
+ .chcr = CHCR_TX(XMIT_SZ_32BIT),
+ .mid_rid = 0x83,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL0_RX,
+ .addr = 0xe6a30050,
+ .chcr = CHCR_RX(XMIT_SZ_32BIT),
+ .mid_rid = 0x83,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL1_TX,
+ .addr = 0xe6a30060,
+ .chcr = CHCR_TX(XMIT_SZ_32BIT),
+ .mid_rid = 0x87,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL1_RX,
+ .addr = 0xe6a30060,
+ .chcr = CHCR_RX(XMIT_SZ_32BIT),
+ .mid_rid = 0x87,
+ }, {
.slave_id = SHDMA_SLAVE_SDHI0_TX,
.addr = 0xe6850030,
.chcr = CHCR_TX(XMIT_SZ_16BIT),
--
1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: horms@verge.net.au (Simon Horman)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/12] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372
Date: Sun, 28 Oct 2012 11:26:06 +0900 [thread overview]
Message-ID: <1351391173-32379-6-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1351391173-32379-1-git-send-email-horms@verge.net.au>
From: Bastian Hecht <hechtb@googlemail.com>
SH7372 can use DMA with the FLCTL flash controller. Add required slave
IDs and slave descriptors.
Signed-off-by: Bastian Hecht <hechtb@gmail.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---
arch/arm/mach-shmobile/include/mach/sh7372.h | 4 ++++
arch/arm/mach-shmobile/setup-sh7372.c | 20 ++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index eb98b45..d65fbbe 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -452,6 +452,10 @@ enum {
SHDMA_SLAVE_SCIF5_RX,
SHDMA_SLAVE_SCIF6_TX,
SHDMA_SLAVE_SCIF6_RX,
+ SHDMA_SLAVE_FLCTL0_TX,
+ SHDMA_SLAVE_FLCTL0_RX,
+ SHDMA_SLAVE_FLCTL1_TX,
+ SHDMA_SLAVE_FLCTL1_RX,
SHDMA_SLAVE_SDHI0_RX,
SHDMA_SLAVE_SDHI0_TX,
SHDMA_SLAVE_SDHI1_RX,
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index a07954f..a360111 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -408,6 +408,26 @@ static const struct sh_dmae_slave_config sh7372_dmae_slaves[] = {
.chcr = CHCR_RX(XMIT_SZ_8BIT),
.mid_rid = 0x3e,
}, {
+ .slave_id = SHDMA_SLAVE_FLCTL0_TX,
+ .addr = 0xe6a30050,
+ .chcr = CHCR_TX(XMIT_SZ_32BIT),
+ .mid_rid = 0x83,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL0_RX,
+ .addr = 0xe6a30050,
+ .chcr = CHCR_RX(XMIT_SZ_32BIT),
+ .mid_rid = 0x83,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL1_TX,
+ .addr = 0xe6a30060,
+ .chcr = CHCR_TX(XMIT_SZ_32BIT),
+ .mid_rid = 0x87,
+ }, {
+ .slave_id = SHDMA_SLAVE_FLCTL1_RX,
+ .addr = 0xe6a30060,
+ .chcr = CHCR_RX(XMIT_SZ_32BIT),
+ .mid_rid = 0x87,
+ }, {
.slave_id = SHDMA_SLAVE_SDHI0_TX,
.addr = 0xe6850030,
.chcr = CHCR_TX(XMIT_SZ_16BIT),
--
1.7.10.4
next prev parent reply other threads:[~2012-10-28 2:26 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-28 2:26 [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 01/12] ARM: shmobile: r8a7740: Enable PMU Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 11:28 ` Sergei Shtylyov
2012-10-28 11:28 ` Sergei Shtylyov
2012-10-29 5:11 ` Simon Horman
2012-10-29 5:11 ` Simon Horman
2012-10-28 2:26 ` [PATCH 02/12] ARM: shmobile: kzm9g: enable magnetometer ak8975 Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 03/12] ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345 Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 04/12] ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2 Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` Simon Horman [this message]
2012-10-28 2:26 ` [PATCH 05/12] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372 Simon Horman
2012-10-28 2:26 ` [PATCH 06/12] ARM: shmobile: armadillo800eva: enable restart Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 07/12] ARM: shmobile: r8a7779: add HSPI clock support Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 08/12] ARM: shmobile: r8a7779: add I2C " Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 09/12] ARM: shmobile: r8a7779: add I2C driver support Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 10/12] ARM: shmobile: marzen: add HSPI support Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 11/12] ARM: shmobile: r8a7740: fixup DT machine desc name typo Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 2:26 ` [PATCH 12/12] ARM: mach-shmobile: Use DT_MACHINE for mackerel Simon Horman
2012-10-28 2:26 ` Simon Horman
2012-10-28 9:37 ` Thomas Petazzoni
2012-10-28 9:37 ` Thomas Petazzoni
2012-10-28 10:44 ` Simon Horman
2012-10-28 10:44 ` Simon Horman
2012-10-28 10:57 ` Thomas Petazzoni
2012-10-28 10:57 ` Thomas Petazzoni
2012-11-08 1:27 ` [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
2012-11-08 1:27 ` Simon Horman
2012-11-08 1:27 ` [PATCH 1/7] ARM: shmobile: marzen: add USB phy support Simon Horman
2012-11-08 1:27 ` Simon Horman
2012-11-08 1:27 ` [PATCH 2/7] ARM: shmobile: marzen: add USB EHCI driver support Simon Horman
2012-11-08 1:27 ` Simon Horman
2012-11-08 1:27 ` [PATCH 3/7] ARM: shmobile: marzen: add USB OHCI " Simon Horman
2012-11-08 1:27 ` Simon Horman
2012-11-08 1:27 ` [PATCH 4/7] sh: clkfwk: add sh_clk_fsidiv_register() Simon Horman
2012-11-08 1:27 ` Simon Horman
2012-11-08 1:27 ` [PATCH 5/7] ARM: shmobile: sh7372: sh7372_fsidivX_clk become non-global Simon Horman
2012-11-08 1:27 ` Simon Horman
2012-11-08 1:27 ` [PATCH 6/7] ARM: shmobile: sh7372: use sh_clk_fsidiv_register() for FSI-DIV clocks Simon Horman
2012-11-08 1:27 ` Simon Horman
2012-11-08 1:27 ` [PATCH 7/7] ARM: shmobile: r8a7740: add FSI-DVI clocks Simon Horman
2012-11-08 1:27 ` Simon Horman
2012-11-08 6:29 ` [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
2012-11-08 6:29 ` Simon Horman
2012-11-20 0:43 ` [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #3 Simon Horman
2012-11-20 0:43 ` Simon Horman
2012-11-20 0:43 ` [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource Simon Horman
2012-11-20 0:43 ` Simon Horman
2012-11-21 7:21 ` [GIT PULL v2] Renesas ARM-based SoC boards for v3.8 #3 Olof Johansson
2012-11-21 7:21 ` Olof Johansson
2013-03-19 2:17 ` [GIT PULL v2] Renesas ARM-based SoC board updates for v3.10 Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 01/13] ARM: shmobile: use GPIO SD-card detection on armadillo800eva Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 02/13] ARM: shmobile: switch SDHI0 to GPIO regulator " Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 03/13] ARM: shmobile: streamline mackerel SD and MMC devices Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 04/13] ARM: shmobile: mark mackerel sh_mmcif_device __maybe_unused Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 05/13] ARM: shmobile: marzen: Reference DT implementation Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 06/13] ARM: shmobile: kzm9g: " Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 07/13] ARM: shmobile: parse DT and configure pinmux early on kzm9g-reference Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 08/13] ARM: shmobile: SDHI and MMCIF interfaces to kzm9g-reference Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 09/13] ARM: shmobile: simplify kzm9g Kconfig dependencies Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 10/13] ARM: shmobile: kzm9g: Remove warning about SMP Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:17 ` [PATCH 11/13] ARM: shmobile: kzm9g: Trim reference DT_MACHINE_START Simon Horman
2013-03-19 2:17 ` Simon Horman
2013-03-19 2:18 ` [PATCH 12/13] ARM: shmobile: marzen: Use gic_iid macro for ICCIAR / interrupt ID Simon Horman
2013-03-19 2:18 ` Simon Horman
2013-03-19 2:18 ` [PATCH 13/13] ARM: shmobile: kzm9g: correct smsc regulator registration Simon Horman
2013-03-19 2:18 ` Simon Horman
2013-03-21 17:18 ` [GIT PULL v2] Renesas ARM-based SoC board updates for v3.10 Arnd Bergmann
2013-03-21 17:18 ` Arnd Bergmann
2013-03-21 19:22 ` Arnd Bergmann
2013-03-21 19:22 ` Arnd Bergmann
2013-03-22 0:32 ` Simon Horman
2013-03-22 0:32 ` Simon Horman
2013-03-22 0:58 ` Simon Horman
2013-03-22 0:58 ` Simon Horman
2013-03-22 12:40 ` Arnd Bergmann
2013-03-22 12:40 ` Arnd Bergmann
2013-03-22 13:52 ` Simon Horman
2013-03-22 13:52 ` Simon Horman
2013-03-22 15:39 ` Arnd Bergmann
2013-03-22 15:39 ` Arnd Bergmann
2013-03-27 5:30 ` Simon Horman
2013-03-27 5:30 ` Simon Horman
2013-03-27 9:54 ` Magnus Damm
2013-03-27 9:54 ` Magnus Damm
2013-03-27 11:37 ` Arnd Bergmann
2013-03-27 11:37 ` Arnd Bergmann
2013-04-01 9:15 ` Magnus Damm
2013-04-01 9:15 ` Magnus Damm
2013-04-02 10:09 ` Arnd Bergmann
2013-04-02 10:09 ` Arnd Bergmann
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=1351391173-32379-6-git-send-email-horms@verge.net.au \
--to=horms@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.