diff options
| author | Robin Gong <yibin.gong@nxp.com> | 2019-06-25 05:43:21 -0400 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2019-07-03 03:58:23 -0400 |
| commit | b12650cc5145fa9ccb44a0baea58aa848be92c61 (patch) | |
| tree | a3bad95f64705a3df6a892e4a5c4441190ba0853 /drivers/dma | |
| parent | 78690bf3c4a4dea4c17f86c7ad385b5e9f5cf58b (diff) | |
dmaengine: fsl-edma-common: version check for v2 instead
The next v3 i.mx7ulp edma is based on v1, so change version
check logic for v2 instead.
Signed-off-by: Robin Gong <yibin.gong@nxp.com>
Tested-by: Angelo Dureghello <angelo@sysam.it>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Diffstat (limited to 'drivers/dma')
| -rw-r--r-- | drivers/dma/fsl-edma-common.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c index ba74e10aa0c2..44d92c34dec3 100644 --- a/drivers/dma/fsl-edma-common.c +++ b/drivers/dma/fsl-edma-common.c | |||
| @@ -658,26 +658,26 @@ void fsl_edma_setup_regs(struct fsl_edma_engine *edma) | |||
| 658 | edma->regs.erql = edma->membase + EDMA_ERQ; | 658 | edma->regs.erql = edma->membase + EDMA_ERQ; |
| 659 | edma->regs.eeil = edma->membase + EDMA_EEI; | 659 | edma->regs.eeil = edma->membase + EDMA_EEI; |
| 660 | 660 | ||
| 661 | edma->regs.serq = edma->membase + ((edma->drvdata->version == v1) ? | 661 | edma->regs.serq = edma->membase + ((edma->drvdata->version == v2) ? |
| 662 | EDMA_SERQ : EDMA64_SERQ); | 662 | EDMA64_SERQ : EDMA_SERQ); |
| 663 | edma->regs.cerq = edma->membase + ((edma->drvdata->version == v1) ? | 663 | edma->regs.cerq = edma->membase + ((edma->drvdata->version == v2) ? |
| 664 | EDMA_CERQ : EDMA64_CERQ); | 664 | EDMA64_CERQ : EDMA_CERQ); |
| 665 | edma->regs.seei = edma->membase + ((edma->drvdata->version == v1) ? | 665 | edma->regs.seei = edma->membase + ((edma->drvdata->version == v2) ? |
| 666 | EDMA_SEEI : EDMA64_SEEI); | 666 | EDMA64_SEEI : EDMA_SEEI); |
| 667 | edma->regs.ceei = edma->membase + ((edma->drvdata->version == v1) ? | 667 | edma->regs.ceei = edma->membase + ((edma->drvdata->version == v2) ? |
| 668 | EDMA_CEEI : EDMA64_CEEI); | 668 | EDMA64_CEEI : EDMA_CEEI); |
| 669 | edma->regs.cint = edma->membase + ((edma->drvdata->version == v1) ? | 669 | edma->regs.cint = edma->membase + ((edma->drvdata->version == v2) ? |
| 670 | EDMA_CINT : EDMA64_CINT); | 670 | EDMA64_CINT : EDMA_CINT); |
| 671 | edma->regs.cerr = edma->membase + ((edma->drvdata->version == v1) ? | 671 | edma->regs.cerr = edma->membase + ((edma->drvdata->version == v2) ? |
| 672 | EDMA_CERR : EDMA64_CERR); | 672 | EDMA64_CERR : EDMA_CERR); |
| 673 | edma->regs.ssrt = edma->membase + ((edma->drvdata->version == v1) ? | 673 | edma->regs.ssrt = edma->membase + ((edma->drvdata->version == v2) ? |
| 674 | EDMA_SSRT : EDMA64_SSRT); | 674 | EDMA64_SSRT : EDMA_SSRT); |
| 675 | edma->regs.cdne = edma->membase + ((edma->drvdata->version == v1) ? | 675 | edma->regs.cdne = edma->membase + ((edma->drvdata->version == v2) ? |
| 676 | EDMA_CDNE : EDMA64_CDNE); | 676 | EDMA64_CDNE : EDMA_CDNE); |
| 677 | edma->regs.intl = edma->membase + ((edma->drvdata->version == v1) ? | 677 | edma->regs.intl = edma->membase + ((edma->drvdata->version == v2) ? |
| 678 | EDMA_INTR : EDMA64_INTL); | 678 | EDMA64_INTL : EDMA_INTR); |
| 679 | edma->regs.errl = edma->membase + ((edma->drvdata->version == v1) ? | 679 | edma->regs.errl = edma->membase + ((edma->drvdata->version == v2) ? |
| 680 | EDMA_ERR : EDMA64_ERRL); | 680 | EDMA64_ERRL : EDMA_ERR); |
| 681 | 681 | ||
| 682 | if (edma->drvdata->version == v2) { | 682 | if (edma->drvdata->version == v2) { |
| 683 | edma->regs.erqh = edma->membase + EDMA64_ERQH; | 683 | edma->regs.erqh = edma->membase + EDMA64_ERQH; |