Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull dmaengine fix from Vinod Koul:
"I have one more fix to fix the boot warning on cppi driver due to
missing capabilities"
* 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
dmaengine: cppi41: add missing bitfields
+9
+9
drivers/dma/cppi41.c
+9
drivers/dma/cppi41.c
···
903
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
911
static int cppi41_dma_probe(struct platform_device *pdev)
907
912
{
908
913
struct cppi41_dd *cdd;
···
931
926
cdd->ddev.device_issue_pending = cppi41_dma_issue_pending;
932
927
cdd->ddev.device_prep_slave_sg = cppi41_dma_prep_slave_sg;
933
928
cdd->ddev.device_terminate_all = cppi41_stop_chan;
929
+
cdd->ddev.directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
930
+
cdd->ddev.src_addr_widths = CPPI41_DMA_BUSWIDTHS;
931
+
cdd->ddev.dst_addr_widths = CPPI41_DMA_BUSWIDTHS;
932
+
cdd->ddev.residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
934
933
cdd->ddev.dev = dev;
935
934
INIT_LIST_HEAD(&cdd->ddev.channels);
936
935
cpp41_dma_info.dma_cap = cdd->ddev.cap_mask;