diff options
| author | Rameshwar Prasad Sahu <rsahu@apm.com> | 2015-07-07 12:04:25 +0200 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2015-07-31 17:03:43 +0200 |
| commit | cda8e937191c100025168ba3e22ab316c7298007 (patch) | |
| tree | cb57fc42ca1598712497ef8e5ac780ce15629356 /drivers/dma/xgene-dma.c | |
| parent | dmaengine: at_xdmac: fix transfer data width in at_xdmac_prep_slave_sg() (diff) | |
| download | linux-cda8e937191c100025168ba3e22ab316c7298007.tar.xz linux-cda8e937191c100025168ba3e22ab316c7298007.zip | |
dmaengine: xgene-dma: Fix the resource map to handle overlapping
There is an overlap in dma ring cmd csr region due to sharing of ethernet
ring cmd csr region. This patch fix the resource overlapping by mapping
the entire dma ring cmd csr region.
Signed-off-by: Rameshwar Prasad Sahu <rsahu@apm.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/dma/xgene-dma.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/dma/xgene-dma.c b/drivers/dma/xgene-dma.c index 620fd55ec766..dff22ab01851 100644 --- a/drivers/dma/xgene-dma.c +++ b/drivers/dma/xgene-dma.c @@ -111,6 +111,7 @@ #define XGENE_DMA_MEM_RAM_SHUTDOWN 0xD070 #define XGENE_DMA_BLK_MEM_RDY 0xD074 #define XGENE_DMA_BLK_MEM_RDY_VAL 0xFFFFFFFF +#define XGENE_DMA_RING_CMD_SM_OFFSET 0x8000 /* X-Gene SoC EFUSE csr register and bit defination */ #define XGENE_SOC_JTAG1_SHADOW 0x18 @@ -1887,6 +1888,8 @@ static int xgene_dma_get_resources(struct platform_device *pdev, return -ENOMEM; } + pdma->csr_ring_cmd += XGENE_DMA_RING_CMD_SM_OFFSET; + /* Get efuse csr region */ res = platform_get_resource(pdev, IORESOURCE_MEM, 3); if (!res) { |