All of lore.kernel.org
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/10] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372
Date: Wed, 17 Oct 2012 04:39:16 +0000	[thread overview]
Message-ID: <1350448761-27346-6-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1350448761-27346-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/10] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372
Date: Wed, 17 Oct 2012 13:39:16 +0900	[thread overview]
Message-ID: <1350448761-27346-6-git-send-email-horms@verge.net.au> (raw)
In-Reply-To: <1350448761-27346-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

  parent reply	other threads:[~2012-10-17  4:39 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-10-17  4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman
2012-10-17  4:39 ` Simon Horman
2012-10-17  4:39 ` [PATCH 01/10] ARM: shmobile: r8a7740: Enable PMU Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-10-17  4:39 ` [PATCH 02/10] ARM: shmobile: kzm9g: enable magnetometer ak8975 Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-10-17  4:39 ` [PATCH 03/10] ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345 Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-10-17  4:39 ` [PATCH 04/10] ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2 Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-10-17  4:39 ` Simon Horman [this message]
2012-10-17  4:39   ` [PATCH 05/10] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372 Simon Horman
2012-10-17  4:39 ` [PATCH 06/10] ARM: shmobile: armadillo800eva: enable restart Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-10-17  4:39 ` [PATCH 07/10] ARM: shmobile: r8a7779: add HSPI clock support Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-10-17  4:39 ` [PATCH 08/10] ARM: shmobile: r8a7779: add I2C " Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-10-17  4:39 ` [PATCH 09/10] ARM: shmobile: r8a7779: add I2C driver support Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-10-17  4:39 ` [PATCH 10/10] ARM: shmobile: marzen: add HSPI support Simon Horman
2012-10-17  4:39   ` Simon Horman
2012-11-07  8:40 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman
2012-11-07  8:40   ` Simon Horman
2012-11-07  8:40   ` [PATCH 1/3] ARM: shmobile: marzen: add USB phy support Simon Horman
2012-11-07  8:40     ` Simon Horman
2012-11-07  8:40   ` [PATCH 2/3] ARM: shmobile: marzen: add USB EHCI driver support Simon Horman
2012-11-07  8:40     ` Simon Horman
2012-11-07  8:40   ` [PATCH 3/3] ARM: shmobile: marzen: add USB OHCI " Simon Horman
2012-11-07  8:40     ` Simon Horman
2012-11-19  1:24 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #3 Simon Horman
2012-11-19  1:24   ` Simon Horman
2012-11-19  1:24   ` [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource Simon Horman
2012-11-19  1:24     ` Simon Horman
2012-11-19 12:30     ` Sergei Shtylyov
2012-11-19 12:30       ` Sergei Shtylyov
2012-11-20  0:03       ` Simon Horman
2012-11-20  0:03         ` Simon Horman
2013-01-25  2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman
2013-01-25  2:17   ` Simon Horman
2013-01-25  2:17   ` [PATCH 1/7] ARM: mackerel: include the correct .dtsi file Simon Horman
2013-01-25  2:17     ` Simon Horman
2013-01-25  2:17   ` [PATCH 2/7] ARM: shmobile: fix sample amixer settings for mackerel Simon Horman
2013-01-25  2:17     ` Simon Horman
2013-01-25  2:17   ` [PATCH 3/7] ARM: shmobile: add sample amixer settings for ap4evb Simon Horman
2013-01-25  2:17     ` Simon Horman
2013-01-25  2:17   ` [PATCH 4/7] ARM: shmobile: add sample amixer settings for armadillo800eva Simon Horman
2013-01-25  2:17     ` Simon Horman
2013-01-25  2:17   ` [PATCH 5/7] ARM: shmobile: kzm9g: Use of_machine_is_compatible() Simon Horman
2013-01-25  2:17     ` Simon Horman
2013-01-25  2:17   ` [PATCH 6/7] ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva Simon Horman
2013-01-25  2:17     ` Simon Horman
2013-01-25  2:17   ` [PATCH 7/7] ARM: shmobile: Include sh73a0 DTSI in kzm9g Simon Horman
2013-01-25  2:17     ` Simon Horman
2013-01-29 17:03   ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Olof Johansson
2013-01-29 17:03     ` 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=1350448761-27346-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.