From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH 04/05] ARM: shmobile: Koelsch SYS-DMAC and SCIF prototype
Date: Wed, 25 Jun 2014 00:41:02 +0000 [thread overview]
Message-ID: <20140625004102.18295.40024.sendpatchset@w520> (raw)
From: Magnus Damm <damm+renesas@opensource.se>
Enable TX DMA for r8a7791 / Koelsch SCIF devices.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---
arch/arm/mach-shmobile/board-koelsch-reference.c | 124 ++++++++++++++++++++++
1 file changed, 124 insertions(+)
--- 0012/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ work/arch/arm/mach-shmobile/board-koelsch-reference.c 2014-06-25 08:36:04.000000000 +0900
@@ -71,6 +71,7 @@ static const struct resource du_resource
#include <linux/mmc/host.h>
#include <linux/mfd/tmio.h>
#include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/serial_sci.h>
/* Local DMA slave IDs */
enum {
@@ -81,6 +82,42 @@ enum {
SYS_DMAC_SLAVE_SDHI1_RX,
SYS_DMAC_SLAVE_SDHI2_TX,
SYS_DMAC_SLAVE_SDHI2_RX,
+ SYS_DMAC_SLAVE_SCIF0_TX,
+ SYS_DMAC_SLAVE_SCIF0_RX,
+ SYS_DMAC_SLAVE_SCIF1_TX,
+ SYS_DMAC_SLAVE_SCIF1_RX,
+ SYS_DMAC_SLAVE_SCIF2_TX,
+ SYS_DMAC_SLAVE_SCIF2_RX,
+ SYS_DMAC_SLAVE_SCIF3_TX,
+ SYS_DMAC_SLAVE_SCIF3_RX,
+ SYS_DMAC_SLAVE_SCIF4_TX,
+ SYS_DMAC_SLAVE_SCIF4_RX,
+ SYS_DMAC_SLAVE_SCIF5_TX,
+ SYS_DMAC_SLAVE_SCIF5_RX,
+ SYS_DMAC_SLAVE_SCIFA0_TX,
+ SYS_DMAC_SLAVE_SCIFA0_RX,
+ SYS_DMAC_SLAVE_SCIFA1_TX,
+ SYS_DMAC_SLAVE_SCIFA1_RX,
+ SYS_DMAC_SLAVE_SCIFA2_TX,
+ SYS_DMAC_SLAVE_SCIFA2_RX,
+ SYS_DMAC_SLAVE_SCIFA3_TX,
+ SYS_DMAC_SLAVE_SCIFA3_RX,
+ SYS_DMAC_SLAVE_SCIFA4_TX,
+ SYS_DMAC_SLAVE_SCIFA4_RX,
+ SYS_DMAC_SLAVE_SCIFA5_TX,
+ SYS_DMAC_SLAVE_SCIFA5_RX,
+ SYS_DMAC_SLAVE_SCIFB0_TX,
+ SYS_DMAC_SLAVE_SCIFB0_RX,
+ SYS_DMAC_SLAVE_SCIFB1_TX,
+ SYS_DMAC_SLAVE_SCIFB1_RX,
+ SYS_DMAC_SLAVE_SCIFB2_TX,
+ SYS_DMAC_SLAVE_SCIFB2_RX,
+ SYS_DMAC_SLAVE_HSCIF0_TX,
+ SYS_DMAC_SLAVE_HSCIF0_RX,
+ SYS_DMAC_SLAVE_HSCIF1_TX,
+ SYS_DMAC_SLAVE_HSCIF1_RX,
+ SYS_DMAC_SLAVE_HSCIF2_TX,
+ SYS_DMAC_SLAVE_HSCIF2_RX,
};
#define DMAE_CHANNEL(a, b) \
@@ -105,10 +142,36 @@ enum {
.mid_rid = r, \
}
+#define SYS_DMAC_SLAVE_TX(_id, _bit, _addr, toffset, roffset, t, r) \
+{ \
+ .slave_id = SYS_DMAC_SLAVE_## _id ##_TX, \
+ .addr = _addr + toffset, \
+ .chcr = CHCR_TX(XMIT_SZ_## _bit ##BIT), \
+ .mid_rid = t, \
+}
+
static const struct sh_dmae_slave_config r8a7791_sys_dmac_slaves[] = {
SYS_DMAC_SLAVE(SDHI0, 16, 0xee100000, 0x60, 0x2060, 0xcd, 0xce),
SYS_DMAC_SLAVE(SDHI1, 16, 0xee140000, 0x30, 0x2030, 0xc1, 0xc2),
SYS_DMAC_SLAVE(SDHI2, 16, 0xee160000, 0x30, 0x2030, 0xd3, 0xd4),
+ SYS_DMAC_SLAVE_TX(SCIF0, 8, 0xe6e60000, 0xc, 0x14, 0x29, 0x2a),
+ SYS_DMAC_SLAVE_TX(SCIF1, 8, 0xe6e68000, 0xc, 0x14, 0x2d, 0x2e),
+ SYS_DMAC_SLAVE_TX(SCIF2, 8, 0xe6e58000, 0xc, 0x14, 0x2b, 0x2c),
+ SYS_DMAC_SLAVE_TX(SCIF3, 8, 0xe6ea8000, 0xc, 0x14, 0x2f, 0x30),
+ SYS_DMAC_SLAVE_TX(SCIF4, 8, 0xe6ee0000, 0xc, 0x14, 0xfb, 0xfc),
+ SYS_DMAC_SLAVE_TX(SCIF5, 8, 0xe6ee8000, 0xc, 0x14, 0xfd, 0xfe),
+ SYS_DMAC_SLAVE_TX(SCIFA0, 8, 0xe6c40000, 0x20, 0x24, 0x21, 0x22),
+ SYS_DMAC_SLAVE_TX(SCIFA1, 8, 0xe6c50000, 0x20, 0x24, 0x25, 0x26),
+ SYS_DMAC_SLAVE_TX(SCIFA2, 8, 0xe6c60000, 0x20, 0x24, 0x27, 0x28),
+ SYS_DMAC_SLAVE_TX(SCIFA3, 8, 0xe6c70000, 0x20, 0x24, 0x1b, 0x1c),
+ SYS_DMAC_SLAVE_TX(SCIFA4, 8, 0xe6c78000, 0x20, 0x24, 0x1f, 0x20),
+ SYS_DMAC_SLAVE_TX(SCIFA5, 8, 0xe6c80000, 0x20, 0x24, 0x23, 0x24),
+ SYS_DMAC_SLAVE_TX(SCIFB0, 8, 0xe6c20000, 0x40, 0x60, 0x3d, 0x3e),
+ SYS_DMAC_SLAVE_TX(SCIFB1, 8, 0xe6c30000, 0x40, 0x60, 0x19, 0x1a),
+ SYS_DMAC_SLAVE_TX(SCIFB2, 8, 0xe6ce0000, 0x40, 0x60, 0x1d, 0x1e),
+ SYS_DMAC_SLAVE_TX(HSCIF0, 8, 0xe62c0000, 0xc, 0x14, 0x39, 0x3a),
+ SYS_DMAC_SLAVE_TX(HSCIF1, 8, 0xe62c8000, 0xc, 0x14, 0x4d, 0x4e),
+ SYS_DMAC_SLAVE_TX(HSCIF2, 8, 0xe62d0000, 0xc, 0x14, 0x3b, 0x3c),
};
static const struct sh_dmae_channel r8a7791_sys_dmac_channels[] = {
@@ -206,6 +269,49 @@ static struct sh_mobile_sdhi_info sdhi2_
TMIO_MMC_WRPROTECT_DISABLE,
};
+
+#define SCIF_PD(scif_type, index, scif_index) \
+static struct plat_sci_port scif##index##_platform_data = { \
+ .type = PORT_##scif_type, \
+ .flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP, \
+ .scscr = SCSCR_RE | SCSCR_TE, \
+ .dma_slave_tx = SYS_DMAC_SLAVE_##scif_type##scif_index##_TX, \
+ .dma_slave_rx = SYS_DMAC_SLAVE_##scif_type##scif_index##_RX, \
+}
+
+#define PDATA_SCIF(index, baseaddr, irq, i) SCIF_PD(SCIF, index, i)
+#define PDATA_SCIFA(index, baseaddr, irq, i) SCIF_PD(SCIFA, index, i)
+#define PDATA_SCIFB(index, baseaddr, irq, i) SCIF_PD(SCIFB, index, i)
+#define PDATA_HSCIF(index, baseaddr, irq, i) SCIF_PD(HSCIF, index, i)
+
+PDATA_SCIFA(0, 0xe6c40000, gic_spi(144), 0); /* SCIFA0 */
+PDATA_SCIFA(1, 0xe6c50000, gic_spi(145), 1); /* SCIFA1 */
+PDATA_SCIFB(2, 0xe6c20000, gic_spi(148), 0); /* SCIFB0 */
+PDATA_SCIFB(3, 0xe6c30000, gic_spi(149), 1); /* SCIFB1 */
+PDATA_SCIFB(4, 0xe6ce0000, gic_spi(150), 2); /* SCIFB2 */
+PDATA_SCIFA(5, 0xe6c60000, gic_spi(151), 2); /* SCIFA2 */
+PDATA_SCIF(6, 0xe6e60000, gic_spi(152), 0); /* SCIF0 */
+PDATA_SCIF(7, 0xe6e68000, gic_spi(153), 1); /* SCIF1 */
+PDATA_SCIF(8, 0xe6e58000, gic_spi(22), 2); /* SCIF2 */
+PDATA_SCIF(9, 0xe6ea8000, gic_spi(23), 3); /* SCIF3 */
+PDATA_SCIF(10, 0xe6ee0000, gic_spi(24), 4); /* SCIF4 */
+PDATA_SCIF(11, 0xe6ee8000, gic_spi(25), 5); /* SCIF5 */
+PDATA_SCIFA(12, 0xe6c70000, gic_spi(29), 3); /* SCIFA3 */
+PDATA_SCIFA(13, 0xe6c78000, gic_spi(30), 4); /* SCIFA4 */
+PDATA_SCIFA(14, 0xe6c80000, gic_spi(31), 5); /* SCIFA5 */
+PDATA_HSCIF(15, 0xe62c0000, gic_spi(154), 0); /* HSCIF0 */
+PDATA_HSCIF(16, 0xe62c8000, gic_spi(155), 1); /* HSCIF1 */
+PDATA_HSCIF(17, 0xe6cd0000, gic_spi(21), 2); /* HSCIF2 */
+
+#define SCIF_AD(scif_type, index, baseaddr) \
+ OF_DEV_AUXDATA("renesas," scif_type "-r8a7791", baseaddr, \
+ "sh-sci." # index, &scif##index##_platform_data)
+
+#define AUXDATA_SCIF(index, baseaddr, irq) SCIF_AD("scif", index, baseaddr)
+#define AUXDATA_SCIFA(index, baseaddr, irq) SCIF_AD("scifa", index, baseaddr)
+#define AUXDATA_SCIFB(index, baseaddr, irq) SCIF_AD("scifb", index, baseaddr)
+#define AUXDATA_HSCIF(index, baseaddr, irq) SCIF_AD("hscif", index, baseaddr)
+
static struct of_dev_auxdata koelsch_auxdata_lookup[] __initdata = {
OF_DEV_AUXDATA("renesas,sdhi-r8a7791", 0xee100000, "sdhi0",
&sdhi0_info),
@@ -213,6 +319,24 @@ static struct of_dev_auxdata koelsch_aux
&sdhi1_info),
OF_DEV_AUXDATA("renesas,sdhi-r8a7791", 0xee160000, "sdhi2",
&sdhi2_info),
+ AUXDATA_SCIFA(0, 0xe6c40000, gic_spi(144)), /* SCIFA0 */
+ AUXDATA_SCIFA(1, 0xe6c50000, gic_spi(145)), /* SCIFA1 */
+ AUXDATA_SCIFB(2, 0xe6c20000, gic_spi(148)), /* SCIFB0 */
+ AUXDATA_SCIFB(3, 0xe6c30000, gic_spi(149)), /* SCIFB1 */
+ AUXDATA_SCIFB(4, 0xe6ce0000, gic_spi(150)), /* SCIFB2 */
+ AUXDATA_SCIFA(5, 0xe6c60000, gic_spi(151)), /* SCIFA2 */
+ AUXDATA_SCIF(6, 0xe6e60000, gic_spi(152)), /* SCIF0 */
+ AUXDATA_SCIF(7, 0xe6e68000, gic_spi(153)), /* SCIF1 */
+ AUXDATA_SCIF(8, 0xe6e58000, gic_spi(22)), /* SCIF2 */
+ AUXDATA_SCIF(9, 0xe6ea8000, gic_spi(23)), /* SCIF3 */
+ AUXDATA_SCIF(10, 0xe6ee0000, gic_spi(24)), /* SCIF4 */
+ AUXDATA_SCIF(11, 0xe6ee8000, gic_spi(25)), /* SCIF5 */
+ AUXDATA_SCIFA(12, 0xe6c70000, gic_spi(29)), /* SCIFA3 */
+ AUXDATA_SCIFA(13, 0xe6c78000, gic_spi(30)), /* SCIFA4 */
+ AUXDATA_SCIFA(14, 0xe6c80000, gic_spi(31)), /* SCIFA5 */
+ AUXDATA_HSCIF(15, 0xe62c0000, gic_spi(154)), /* HSCIF0 */
+ AUXDATA_HSCIF(16, 0xe62c8000, gic_spi(155)), /* HSCIF1 */
+ AUXDATA_HSCIF(17, 0xe6cd0000, gic_spi(21)), /* HSCIF2 */
{},
};
reply other threads:[~2014-06-25 0:41 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20140625004102.18295.40024.sendpatchset@w520 \
--to=magnus.damm@gmail.com \
--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 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.