diff options
| author | Felipe Balbi <balbi@ti.com> | 2015-04-08 12:45:42 -0400 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-04-11 11:42:58 -0400 |
| commit | ffeb13aab68e2d0082cbb147dc765beb092f83f4 (patch) | |
| tree | f0b7a08d6d7c2482130282a36f169f96816bd2b3 | |
| parent | fbef403aa7b377eb238dc6cade21213c315bc1a7 (diff) | |
dmaengine: cppi41: add missing bitfields
Add missing directions, residue_granularity,
srd_addr_widths and dst_addr_widths bitfields.
Without those we will see a kernel WARN()
when loading musb on am335x devices.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
| -rw-r--r-- | drivers/dma/cppi41.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index 512cb8e2805e..ceedafbd23e0 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c | |||
| @@ -903,6 +903,11 @@ static const struct cppi_glue_infos *get_glue_info(struct device *dev) | |||
| 903 | return of_id->data; | 903 | return of_id->data; |
| 904 | } | 904 | } |
| 905 | 905 | ||
| 906 | #define CPPI41_DMA_BUSWIDTHS (BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \ | ||
| 907 | BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \ | ||
| 908 | BIT(DMA_SLAVE_BUSWIDTH_3_BYTES) | \ | ||
| 909 | BIT(DMA_SLAVE_BUSWIDTH_4_BYTES)) | ||
| 910 | |||
| 906 | static int cppi41_dma_probe(struct platform_device *pdev) | 911 | static int cppi41_dma_probe(struct platform_device *pdev) |
| 907 | { | 912 | { |
| 908 | struct cppi41_dd *cdd; | 913 | struct cppi41_dd *cdd; |
| @@ -926,6 +931,10 @@ static int cppi41_dma_probe(struct platform_device *pdev) | |||
| 926 | cdd->ddev.device_issue_pending = cppi41_dma_issue_pending; | 931 | cdd->ddev.device_issue_pending = cppi41_dma_issue_pending; |
| 927 | cdd->ddev.device_prep_slave_sg = cppi41_dma_prep_slave_sg; | 932 | cdd->ddev.device_prep_slave_sg = cppi41_dma_prep_slave_sg; |
| 928 | cdd->ddev.device_terminate_all = cppi41_stop_chan; | 933 | cdd->ddev.device_terminate_all = cppi41_stop_chan; |
| 934 | cdd->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV); | ||
| 935 | cdd->ddev.src_addr_widths = CPPI41_DMA_BUSWIDTHS; | ||
| 936 | cdd->ddev.dst_addr_widths = CPPI41_DMA_BUSWIDTHS; | ||
| 937 | cdd->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; | ||
| 929 | cdd->ddev.dev = dev; | 938 | cdd->ddev.dev = dev; |
| 930 | INIT_LIST_HEAD(&cdd->ddev.channels); | 939 | INIT_LIST_HEAD(&cdd->ddev.channels); |
| 931 | cpp41_dma_info.dma_cap = cdd->ddev.cap_mask; | 940 | cpp41_dma_info.dma_cap = cdd->ddev.cap_mask; |
