From mboxrd@z Thu Jan 1 00:00:00 1970 From: Simon Horman Date: Fri, 26 Jul 2013 00:10:53 +0000 Subject: Re: [PATCH v2 1/2] ARM: shmobile: r8a7778: add HPB-DMAC support Message-Id: <20130726001052.GA28912@verge.net.au> List-Id: References: <201307230218.01495.sergei.shtylyov@cogentembedded.com> <201307230222.04763.sergei.shtylyov@cogentembedded.com> In-Reply-To: <201307230222.04763.sergei.shtylyov@cogentembedded.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-arm-kernel@lists.infradead.org [ Cc Morimoto-san ] On Tue, Jul 23, 2013 at 02:22:04AM +0400, Sergei Shtylyov wrote: > From: Max Filippov > > Add HPB-DMAC platform device on R8A7778 SoC along with its slave and channel > configurations. > > Signed-off-by: Max Filippov > [Sergei: moved *enum* declaring HPB-DMAC slave IDs from now removed > to , removed #include from setup-r8a7778.c, removed > SSI-related *enum* values and SSI-related data from hpb_dmae_slaves[] and > hpb_dmae_channels[].] > Signed-off-by: Sergei Shtylyov > > --- > Changes in version 2: > - moved *enum* declaring HPB-DMAC slave IDs from the separate header file to > , removed #include from setup-r8a7778.c; > - removed SSI-related *enum* values and SSI-related data from hpb_dmae_slaves[] > and hpb_dmae_channels[]. > > arch/arm/mach-shmobile/include/mach/r8a7778.h | 8 ++ > arch/arm/mach-shmobile/setup-r8a7778.c | 80 ++++++++++++++++++++++++++ > 2 files changed, 88 insertions(+) Morimoto-san, Magnus, could you please review this? > > Index: renesas/arch/arm/mach-shmobile/include/mach/r8a7778.h > =================================> --- renesas.orig/arch/arm/mach-shmobile/include/mach/r8a7778.h > +++ renesas/arch/arm/mach-shmobile/include/mach/r8a7778.h > @@ -1,6 +1,7 @@ > /* > * Copyright (C) 2013 Renesas Solutions Corp. > * Copyright (C) 2013 Kuninori Morimoto > + * Copyright (C) 2013 Cogent Embedded, Inc. > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License as published by > @@ -23,6 +24,13 @@ > #include > #include > > +/* HPB-DMA slave IDs */ > +enum { > + HPBDMA_SLAVE_DUMMY, > + HPBDMA_SLAVE_SDHI0_TX, > + HPBDMA_SLAVE_SDHI0_RX, > +}; > + > extern void r8a7778_add_standard_devices(void); > extern void r8a7778_add_standard_devices_dt(void); > extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata); > Index: renesas/arch/arm/mach-shmobile/setup-r8a7778.c > =================================> --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7778.c > +++ renesas/arch/arm/mach-shmobile/setup-r8a7778.c > @@ -24,6 +24,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -333,6 +334,84 @@ void __init r8a7778_add_mmc_device(struc > info, sizeof(*info)); > } > > +/* HPB-DMA */ > + > +/* Asynchronous mode register (ASYNCMDR) bits */ > +#define ASYNCMDR_ASMD22_MASK BIT(2) /* SDHI0 */ > +#define ASYNCMDR_ASMD22_SINGLE BIT(2) /* SDHI0 */ > +#define ASYNCMDR_ASMD22_MULTI 0 /* SDHI0 */ > +#define ASYNCMDR_ASMD21_MASK BIT(1) /* SDHI0 */ > +#define ASYNCMDR_ASMD21_SINGLE BIT(1) /* SDHI0 */ > +#define ASYNCMDR_ASMD21_MULTI 0 /* SDHI0 */ > + > +static const struct hpb_dmae_slave_config hpb_dmae_slaves[] = { > + { > + .id = HPBDMA_SLAVE_SDHI0_TX, > + .addr = 0xffe4c000 + 0x30, > + .dcr = DCR_SPDS_16BIT | DCR_DMDL | DCR_DPDS_16BIT, > + .rstr = ASYNCRSTR_ASRST21 | ASYNCRSTR_ASRST22 | > + ASYNCRSTR_ASRST23, > + .mdr = ASYNCMDR_ASMD21_SINGLE, > + .mdm = ASYNCMDR_ASMD21_MASK, > + .port = 0x0D0C, > + .flags = HPB_DMAE_SET_ASYNC_RESET | HPB_DMAE_SET_ASYNC_MODE, > + .dma_ch = 21, > + }, { > + .id = HPBDMA_SLAVE_SDHI0_RX, > + .addr = 0xffe4c000 + 0x30, > + .dcr = DCR_SMDL | DCR_SPDS_16BIT | DCR_DPDS_16BIT, > + .rstr = ASYNCRSTR_ASRST21 | ASYNCRSTR_ASRST22 | > + ASYNCRSTR_ASRST23, > + .mdr = ASYNCMDR_ASMD22_SINGLE, > + .mdm = ASYNCMDR_ASMD22_MASK, > + .port = 0x0D0C, > + .flags = HPB_DMAE_SET_ASYNC_RESET | HPB_DMAE_SET_ASYNC_MODE, > + .dma_ch = 22, > + }, > +}; > + > +static const struct hpb_dmae_channel hpb_dmae_channels[] = { > + /* ch. 21 SD0 */ > + HPB_DMAE_CHANNEL(0x7e, HPBDMA_SLAVE_SDHI0_TX), > + /* ch. 22 SD0 */ > + HPB_DMAE_CHANNEL(0x7e, HPBDMA_SLAVE_SDHI0_RX), > +}; > + > +static struct hpb_dmae_pdata dma_platform_data __initdata = { > + .slaves = hpb_dmae_slaves, > + .num_slaves = ARRAY_SIZE(hpb_dmae_slaves), > + .channels = hpb_dmae_channels, > + .num_channels = ARRAY_SIZE(hpb_dmae_channels), > + .ts_shift = { > + [XMIT_SZ_8BIT] = 0, > + [XMIT_SZ_16BIT] = 1, > + [XMIT_SZ_32BIT] = 2, > + }, > + .num_hw_channels = 39, > +}; > + > +static struct resource hpb_dmae_resources[] __initdata = { > + /* Channel registers */ > + DEFINE_RES_MEM(0xffc08000, 0x1000), > + /* Common registers */ > + DEFINE_RES_MEM(0xffc09000, 0x170), > + /* Asynchronous reset registers */ > + DEFINE_RES_MEM(0xffc00300, 4), > + /* Asynchronous mode registers */ > + DEFINE_RES_MEM(0xffc00400, 4), > + /* IRQ for DMA channels */ > + DEFINE_RES_NAMED(gic_iid(0x7b), 5, NULL, IORESOURCE_IRQ), > +}; > + > +static void __init r8a7778_register_hpb_dmae(void) > +{ > + platform_device_register_resndata(&platform_bus, "hpb-dma-engine", -1, > + hpb_dmae_resources, > + ARRAY_SIZE(hpb_dmae_resources), > + &dma_platform_data, > + sizeof(dma_platform_data)); > +} > + > void __init r8a7778_add_standard_devices(void) > { > int i; > @@ -355,6 +434,7 @@ void __init r8a7778_add_standard_devices > > r8a7778_register_tmu(0); > r8a7778_register_tmu(1); > + r8a7778_register_hpb_dmae(); > } > > void __init r8a7778_init_late(void) >