ARM: shmobile: r8a7778: add USB Func DMAEngine support
PATCH 1/1 ARM: shmobile: r8a7778: add USB Func DMAEngine support
From: Kuninori Morimoto <[email protected]>
HPB-DMAC has 2 channel for USB Func (= D0/D1) D0 is used as Tx, D1 is used as Rx on this patch
---
Quoted 1 line
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(+)
arch/arm/mach-shmobile/include/mach/r8a7778.h +2 -0
@@ -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 );
arch/arm/mach-shmobile/setup-r8a7778.c +18 -0
@@ -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 */
Signature · 1 line
1.7.9.5
Quoted 5 lines · Kuninori Morimoto
From: Kuninori Morimoto <[email protected]>
HPB-DMAC has 2 channel for USB Func (= D0/D1) D0 is used as Tx, D1 is used as Rx on this patch
Quoted 8 lines
Signed-off-by Kuninori Morimoto <[email protected]>---
Quoted 1 line
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?
Quoted 56 lines
arch/arm/mach-shmobile/include/mach/r8a7778.h | 2 ++ arch/arm/mach-shmobile/setup-r8a7778.c | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+)arch/arm/mach-shmobile/include/mach/r8a7778.h +2
-0@@ -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 );arch/arm/mach-shmobile/setup-r8a7778.c +18
-0@@ -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 */ Signature · 1 line
1.7.9.5
Hi Simon
Quoted 7 lines
Quoted 7 lines
From: Kuninori Morimoto <[email protected]>
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 <[email protected]>---
Quoted 8 lines
Quoted 6 lines
Quoted 1 line
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
Quoted 11 lines · Kuninori Morimoto
Hi Simon
Quoted 9 lines
Quoted 9 lines
From: Kuninori Morimoto <[email protected]>
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 <[email protected]>---
Quoted 1 line
Simon
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
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