Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b12650cc authored by Robin Gong's avatar Robin Gong Committed by Vinod Koul
Browse files

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: default avatarRobin Gong <yibin.gong@nxp.com>
Tested-by: default avatarAngelo Dureghello <angelo@sysam.it>
Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 78690bf3

drivers/dma/fsl-edma-common.c

+20 −20
Original line number Diff line number Diff line
@@ -658,26 +658,26 @@ void fsl_edma_setup_regs(struct fsl_edma_engine *edma) 
	edma->regs.erql = edma->membase + EDMA_ERQ;

	edma->regs.eeil = edma->membase + EDMA_EEI;



	edma->regs.serq = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_SERQ : EDMA64_SERQ);

	edma->regs.cerq = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_CERQ : EDMA64_CERQ);

	edma->regs.seei = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_SEEI : EDMA64_SEEI);

	edma->regs.ceei = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_CEEI : EDMA64_CEEI);

	edma->regs.cint = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_CINT : EDMA64_CINT);

	edma->regs.cerr = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_CERR : EDMA64_CERR);

	edma->regs.ssrt = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_SSRT : EDMA64_SSRT);

	edma->regs.cdne = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_CDNE : EDMA64_CDNE);

	edma->regs.intl = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_INTR : EDMA64_INTL);

	edma->regs.errl = edma->membase + ((edma->drvdata->version == v1) ?

			EDMA_ERR : EDMA64_ERRL);

	edma->regs.serq = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_SERQ : EDMA_SERQ);

	edma->regs.cerq = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CERQ : EDMA_CERQ);

	edma->regs.seei = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_SEEI : EDMA_SEEI);

	edma->regs.ceei = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CEEI : EDMA_CEEI);

	edma->regs.cint = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CINT : EDMA_CINT);

	edma->regs.cerr = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CERR : EDMA_CERR);

	edma->regs.ssrt = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_SSRT : EDMA_SSRT);

	edma->regs.cdne = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_CDNE : EDMA_CDNE);

	edma->regs.intl = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_INTL : EDMA_INTR);

	edma->regs.errl = edma->membase + ((edma->drvdata->version == v2) ?

			EDMA64_ERRL : EDMA_ERR);



	if (edma->drvdata->version == v2) {

		edma->regs.erqh = edma->membase + EDMA64_ERQH;