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

Commit f0564c7e authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Vinod Koul
Browse files

dmaengine: pl330: Remove duplicated cachecontrol enum 



The settings for destination and source cache control are exactly the same. This
patch removes the duplicated enum and uses the same for both destination and
source cache control.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
parent 585a9d0b

drivers/dma/pl330.c

+17 −28
Original line number Original line Diff line number Diff line
@@ -33,26 +33,15 @@ 
#define PL330_MAX_IRQS		32

#define PL330_MAX_IRQS		32

#define PL330_MAX_PERI		32

#define PL330_MAX_PERI		32





enum pl330_srccachectrl {

enum pl330_cachectrl {

	SCCTRL0,	/* Noncacheable and nonbufferable */

	CCTRL0,		/* Noncacheable and nonbufferable */

	SCCTRL1,	/* Bufferable only */

	CCTRL1,		/* Bufferable only */

	SCCTRL2,	/* Cacheable, but do not allocate */

	CCTRL2,		/* Cacheable, but do not allocate */

	SCCTRL3,	/* Cacheable and bufferable, but do not allocate */

	CCTRL3,		/* Cacheable and bufferable, but do not allocate */

	SINVALID1,

	INVALID1,	/* AWCACHE = 0x1000 */

	SINVALID2,

	INVALID2,

	SCCTRL6,	/* Cacheable write-through, allocate on reads only */

	CCTRL6,		/* Cacheable write-through, allocate on writes only */

	SCCTRL7,	/* Cacheable write-back, allocate on reads only */

	CCTRL7,		/* Cacheable write-back, allocate on writes only */

};



enum pl330_dstcachectrl {

	DCCTRL0,	/* Noncacheable and nonbufferable */

	DCCTRL1,	/* Bufferable only */

	DCCTRL2,	/* Cacheable, but do not allocate */

	DCCTRL3,	/* Cacheable and bufferable, but do not allocate */

	DINVALID1,	/* AWCACHE = 0x1000 */

	DINVALID2,

	DCCTRL6,	/* Cacheable write-through, allocate on writes only */

	DCCTRL7,	/* Cacheable write-back, allocate on writes only */

};

};





enum pl330_byteswap {

enum pl330_byteswap {
@@ -337,8 +326,8 @@ struct pl330_reqcfg { 
	unsigned brst_len:5;

	unsigned brst_len:5;

	unsigned brst_size:3; /* in power of 2 */

	unsigned brst_size:3; /* in power of 2 */





	enum pl330_dstcachectrl dcctl;

	enum pl330_cachectrl dcctl;

	enum pl330_srccachectrl scctl;

	enum pl330_cachectrl scctl;

	enum pl330_byteswap swap;

	enum pl330_byteswap swap;

	struct pl330_config *pcfg;

	struct pl330_config *pcfg;

};

};
@@ -1490,14 +1479,14 @@ static inline u32 _prepare_ccr(const struct pl330_reqcfg *rqc) 




static inline bool _is_valid(u32 ccr)

static inline bool _is_valid(u32 ccr)

{

{

	enum pl330_dstcachectrl dcctl;

	enum pl330_cachectrl dcctl;

	enum pl330_srccachectrl scctl;

	enum pl330_cachectrl scctl;





	dcctl = (ccr >> CC_DSTCCTRL_SHFT) & CC_DRCCCTRL_MASK;

	dcctl = (ccr >> CC_DSTCCTRL_SHFT) & CC_DRCCCTRL_MASK;

	scctl = (ccr >> CC_SRCCCTRL_SHFT) & CC_SRCCCTRL_MASK;

	scctl = (ccr >> CC_SRCCCTRL_SHFT) & CC_SRCCCTRL_MASK;





	if (dcctl == DINVALID1 || dcctl == DINVALID2

	if (dcctl == INVALID1 || dcctl == INVALID2

			|| scctl == SINVALID1 || scctl == SINVALID2)

			|| scctl == INVALID1 || scctl == INVALID2)

		return false;

		return false;

	else

	else

		return true;

		return true;
@@ -2485,8 +2474,8 @@ static inline void _init_desc(struct dma_pl330_desc *desc) 
	desc->req.x = &desc->px;

	desc->req.x = &desc->px;

	desc->req.token = desc;

	desc->req.token = desc;

	desc->rqcfg.swap = SWAP_NO;

	desc->rqcfg.swap = SWAP_NO;

	desc->rqcfg.scctl = SCCTRL0;

	desc->rqcfg.scctl = CCTRL0;

	desc->rqcfg.dcctl = DCCTRL0;

	desc->rqcfg.dcctl = CCTRL0;

	desc->req.cfg = &desc->rqcfg;

	desc->req.cfg = &desc->rqcfg;

	desc->req.xfer_cb = dma_pl330_rqcb;

	desc->req.xfer_cb = dma_pl330_rqcb;

	desc->txd.tx_submit = pl330_tx_submit;

	desc->txd.tx_submit = pl330_tx_submit;