* [PATCH] ARM: shmobile: r8a7778: add USB Func DMAEngine support
@ 2013-12-11 0:51 Kuninori Morimoto
2013-12-11 0:59 ` Simon Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Kuninori Morimoto @ 2013-12-11 0:51 UTC (permalink / raw)
To: linux-sh
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
HPB-DMAC has 2 channel for USB Func (= D0/D1)
D0 is used as Tx, D1 is used as Rx on this patch
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
> Simon
BockW board will use this patch, but it needs
HPB-DMAC fixup patches merge.
I will send it when merged, but this patch
itself doesn't depend on HPB-DMAC fixup branch.
arch/arm/mach-shmobile/include/mach/r8a7778.h | 2 ++
arch/arm/mach-shmobile/setup-r8a7778.c | 18 ++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
index a3440e5..5efd89d 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@ -63,6 +63,8 @@ enum {
HPBDMA_SLAVE_HPBIF7_RX,
HPBDMA_SLAVE_HPBIF8_TX,
HPBDMA_SLAVE_HPBIF8_RX,
+ HPBDMA_SLAVE_USBFUNC_TX,
+ HPBDMA_SLAVE_USBFUNC_RX,
};
extern void r8a7778_add_standard_devices(void);
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index e786338..7ea6308 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -394,6 +394,22 @@ static const struct hpb_dmae_slave_config hpb_dmae_slaves[] = {
.port = 0x0D0C,
.flags = HPB_DMAE_SET_ASYNC_RESET | HPB_DMAE_SET_ASYNC_MODE,
.dma_ch = 22,
+ }, {
+ .id = HPBDMA_SLAVE_USBFUNC_TX, /* for D0 */
+ .addr = 0xffe60018,
+ .dcr = HPB_DMAE_DCR_SPDS_32BIT |
+ HPB_DMAE_DCR_DMDL |
+ HPB_DMAE_DCR_DPDS_32BIT,
+ .port = 0x0000,
+ .dma_ch = 14,
+ }, {
+ .id = HPBDMA_SLAVE_USBFUNC_RX, /* for D1 */
+ .addr = 0xffe6001c,
+ .dcr = HPB_DMAE_DCR_SMDL |
+ HPB_DMAE_DCR_SPDS_32BIT |
+ HPB_DMAE_DCR_DPDS_32BIT,
+ .port = 0x0101,
+ .dma_ch = 15,
},
HPBDMA_SSI(0),
@@ -418,6 +434,8 @@ static const struct hpb_dmae_slave_config hpb_dmae_slaves[] = {
};
static const struct hpb_dmae_channel hpb_dmae_channels[] = {
+ HPB_DMAE_CHANNEL(0x7c, HPBDMA_SLAVE_USBFUNC_TX), /* ch. 14 */
+ HPB_DMAE_CHANNEL(0x7c, HPBDMA_SLAVE_USBFUNC_RX), /* ch. 15 */
HPB_DMAE_CHANNEL(0x7e, HPBDMA_SLAVE_SDHI0_TX), /* ch. 21 */
HPB_DMAE_CHANNEL(0x7e, HPBDMA_SLAVE_SDHI0_RX), /* ch. 22 */
HPB_DMAE_CHANNEL(0x7f, HPBDMA_SLAVE_SSI0_TX), /* ch. 28 */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: shmobile: r8a7778: add USB Func DMAEngine support
2013-12-11 0:51 [PATCH] ARM: shmobile: r8a7778: add USB Func DMAEngine support Kuninori Morimoto
@ 2013-12-11 0:59 ` Simon Horman
2013-12-11 3:10 ` Kuninori Morimoto
2013-12-12 13:04 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2013-12-11 0:59 UTC (permalink / raw)
To: linux-sh
On Tue, Dec 10, 2013 at 04:51:04PM -0800, Kuninori Morimoto wrote:
> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
>
> HPB-DMAC has 2 channel for USB Func (= D0/D1)
> D0 is used as Tx, D1 is used as Rx on this patch
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> ---
> > Simon
>
> BockW board will use this patch, but it needs
> HPB-DMAC fixup patches merge.
> I will send it when merged, but this patch
> itself doesn't depend on HPB-DMAC fixup branch.
Ok, so I can queue-up this patch now?
> arch/arm/mach-shmobile/include/mach/r8a7778.h | 2 ++
> arch/arm/mach-shmobile/setup-r8a7778.c | 18 ++++++++++++++++++
> 2 files changed, 20 insertions(+)
>
> diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
> index a3440e5..5efd89d 100644
> --- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
> +++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
> @@ -63,6 +63,8 @@ enum {
> HPBDMA_SLAVE_HPBIF7_RX,
> HPBDMA_SLAVE_HPBIF8_TX,
> HPBDMA_SLAVE_HPBIF8_RX,
> + HPBDMA_SLAVE_USBFUNC_TX,
> + HPBDMA_SLAVE_USBFUNC_RX,
> };
>
> extern void r8a7778_add_standard_devices(void);
> diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
> index e786338..7ea6308 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7778.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7778.c
> @@ -394,6 +394,22 @@ static const struct hpb_dmae_slave_config hpb_dmae_slaves[] = {
> .port = 0x0D0C,
> .flags = HPB_DMAE_SET_ASYNC_RESET | HPB_DMAE_SET_ASYNC_MODE,
> .dma_ch = 22,
> + }, {
> + .id = HPBDMA_SLAVE_USBFUNC_TX, /* for D0 */
> + .addr = 0xffe60018,
> + .dcr = HPB_DMAE_DCR_SPDS_32BIT |
> + HPB_DMAE_DCR_DMDL |
> + HPB_DMAE_DCR_DPDS_32BIT,
> + .port = 0x0000,
> + .dma_ch = 14,
> + }, {
> + .id = HPBDMA_SLAVE_USBFUNC_RX, /* for D1 */
> + .addr = 0xffe6001c,
> + .dcr = HPB_DMAE_DCR_SMDL |
> + HPB_DMAE_DCR_SPDS_32BIT |
> + HPB_DMAE_DCR_DPDS_32BIT,
> + .port = 0x0101,
> + .dma_ch = 15,
> },
>
> HPBDMA_SSI(0),
> @@ -418,6 +434,8 @@ static const struct hpb_dmae_slave_config hpb_dmae_slaves[] = {
> };
>
> static const struct hpb_dmae_channel hpb_dmae_channels[] = {
> + HPB_DMAE_CHANNEL(0x7c, HPBDMA_SLAVE_USBFUNC_TX), /* ch. 14 */
> + HPB_DMAE_CHANNEL(0x7c, HPBDMA_SLAVE_USBFUNC_RX), /* ch. 15 */
> HPB_DMAE_CHANNEL(0x7e, HPBDMA_SLAVE_SDHI0_TX), /* ch. 21 */
> HPB_DMAE_CHANNEL(0x7e, HPBDMA_SLAVE_SDHI0_RX), /* ch. 22 */
> HPB_DMAE_CHANNEL(0x7f, HPBDMA_SLAVE_SSI0_TX), /* ch. 28 */
> --
> 1.7.9.5
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: shmobile: r8a7778: add USB Func DMAEngine support
2013-12-11 0:51 [PATCH] ARM: shmobile: r8a7778: add USB Func DMAEngine support Kuninori Morimoto
2013-12-11 0:59 ` Simon Horman
@ 2013-12-11 3:10 ` Kuninori Morimoto
2013-12-12 13:04 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Kuninori Morimoto @ 2013-12-11 3:10 UTC (permalink / raw)
To: linux-sh
Hi Simon
> > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> >
> > HPB-DMAC has 2 channel for USB Func (= D0/D1)
> > D0 is used as Tx, D1 is used as Rx on this patch
> >
> > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > ---
> > > Simon
> >
> > BockW board will use this patch, but it needs
> > HPB-DMAC fixup patches merge.
> > I will send it when merged, but this patch
> > itself doesn't depend on HPB-DMAC fixup branch.
>
> Ok, so I can queue-up this patch now?
Yes, please
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: shmobile: r8a7778: add USB Func DMAEngine support
2013-12-11 0:51 [PATCH] ARM: shmobile: r8a7778: add USB Func DMAEngine support Kuninori Morimoto
2013-12-11 0:59 ` Simon Horman
2013-12-11 3:10 ` Kuninori Morimoto
@ 2013-12-12 13:04 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2013-12-12 13:04 UTC (permalink / raw)
To: linux-sh
On Tue, Dec 10, 2013 at 07:10:44PM -0800, Kuninori Morimoto wrote:
> Hi Simon
>
> > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > >
> > > HPB-DMAC has 2 channel for USB Func (= D0/D1)
> > > D0 is used as Tx, D1 is used as Rx on this patch
> > >
> > > Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
> > > ---
> > > > Simon
> > >
> > > BockW board will use this patch, but it needs
> > > HPB-DMAC fixup patches merge.
> > > I will send it when merged, but this patch
> > > itself doesn't depend on HPB-DMAC fixup branch.
> >
> > Ok, so I can queue-up this patch now?
>
> Yes, please
Done
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-12-12 13:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-11 0:51 [PATCH] ARM: shmobile: r8a7778: add USB Func DMAEngine support Kuninori Morimoto
2013-12-11 0:59 ` Simon Horman
2013-12-11 3:10 ` Kuninori Morimoto
2013-12-12 13:04 ` Simon Horman
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).