tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
dmaengine: fsl-edma: fix macros
This patch fixes macros to use BIT() and GENMASK(), removing
also some unneeded.
Signed-off-by: Angelo Dureghello <angelo@sysam.it>
Tested-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
authored by
Angelo Dureghello
and committed by
Vinod Koul
4d6d3a90
377eaf3b
+20
-26
+20
-26
drivers/dma/fsl-edma-common.h
+20
-26
drivers/dma/fsl-edma-common.h
···
18
18
#define EDMA_CR_ECX BIT(16)
19
19
#define EDMA_CR_CX BIT(17)
20
20
21
-
#define EDMA_SEEI_SEEI(x) ((x) & 0x1F)
22
-
#define EDMA_CEEI_CEEI(x) ((x) & 0x1F)
23
-
#define EDMA_CINT_CINT(x) ((x) & 0x1F)
24
-
#define EDMA_CERR_CERR(x) ((x) & 0x1F)
21
+
#define EDMA_SEEI_SEEI(x) ((x) & GENMASK(4, 0))
22
+
#define EDMA_CEEI_CEEI(x) ((x) & GENMASK(4, 0))
23
+
#define EDMA_CINT_CINT(x) ((x) & GENMASK(4, 0))
24
+
#define EDMA_CERR_CERR(x) ((x) & GENMASK(4, 0))
25
25
26
-
#define EDMA_TCD_ATTR_DSIZE(x) (((x) & 0x0007))
27
-
#define EDMA_TCD_ATTR_DMOD(x) (((x) & 0x001F) << 3)
28
-
#define EDMA_TCD_ATTR_SSIZE(x) (((x) & 0x0007) << 8)
29
-
#define EDMA_TCD_ATTR_SMOD(x) (((x) & 0x001F) << 11)
30
-
#define EDMA_TCD_ATTR_SSIZE_8BIT (0x0000)
31
-
#define EDMA_TCD_ATTR_SSIZE_16BIT (0x0100)
32
-
#define EDMA_TCD_ATTR_SSIZE_32BIT (0x0200)
33
-
#define EDMA_TCD_ATTR_SSIZE_64BIT (0x0300)
34
-
#define EDMA_TCD_ATTR_SSIZE_32BYTE (0x0500)
35
-
#define EDMA_TCD_ATTR_DSIZE_8BIT (0x0000)
36
-
#define EDMA_TCD_ATTR_DSIZE_16BIT (0x0001)
37
-
#define EDMA_TCD_ATTR_DSIZE_32BIT (0x0002)
38
-
#define EDMA_TCD_ATTR_DSIZE_64BIT (0x0003)
39
-
#define EDMA_TCD_ATTR_DSIZE_32BYTE (0x0005)
26
+
#define EDMA_TCD_ATTR_DSIZE(x) (((x) & GENMASK(2, 0)))
27
+
#define EDMA_TCD_ATTR_DMOD(x) (((x) & GENMASK(4, 0)) << 3)
28
+
#define EDMA_TCD_ATTR_SSIZE(x) (((x) & GENMASK(2, 0)) << 8)
29
+
#define EDMA_TCD_ATTR_SMOD(x) (((x) & GENMASK(4, 0)) << 11)
30
+
#define EDMA_TCD_ATTR_DSIZE_8BIT 0
31
+
#define EDMA_TCD_ATTR_DSIZE_16BIT BIT(0)
32
+
#define EDMA_TCD_ATTR_DSIZE_32BIT BIT(1)
33
+
#define EDMA_TCD_ATTR_DSIZE_64BIT (BIT(0) | BIT(1))
34
+
#define EDMA_TCD_ATTR_DSIZE_32BYTE (BIT(3) | BIT(0))
35
+
#define EDMA_TCD_ATTR_SSIZE_8BIT 0
36
+
#define EDMA_TCD_ATTR_SSIZE_16BIT (EDMA_TCD_ATTR_DSIZE_16BIT << 8)
37
+
#define EDMA_TCD_ATTR_SSIZE_32BIT (EDMA_TCD_ATTR_DSIZE_32BIT << 8)
38
+
#define EDMA_TCD_ATTR_SSIZE_64BIT (EDMA_TCD_ATTR_DSIZE_64BIT << 8)
39
+
#define EDMA_TCD_ATTR_SSIZE_32BYTE (EDMA_TCD_ATTR_DSIZE_32BYTE << 8)
40
40
41
-
#define EDMA_TCD_SOFF_SOFF(x) (x)
42
-
#define EDMA_TCD_NBYTES_NBYTES(x) (x)
43
-
#define EDMA_TCD_SLAST_SLAST(x) (x)
44
-
#define EDMA_TCD_DADDR_DADDR(x) (x)
45
-
#define EDMA_TCD_CITER_CITER(x) ((x) & 0x7FFF)
46
-
#define EDMA_TCD_DOFF_DOFF(x) (x)
47
-
#define EDMA_TCD_DLAST_SGA_DLAST_SGA(x) (x)
48
-
#define EDMA_TCD_BITER_BITER(x) ((x) & 0x7FFF)
41
+
#define EDMA_TCD_CITER_CITER(x) ((x) & GENMASK(14, 0))
42
+
#define EDMA_TCD_BITER_BITER(x) ((x) & GENMASK(14, 0))
49
43
50
44
#define EDMA_TCD_CSR_START BIT(0)
51
45
#define EDMA_TCD_CSR_INT_MAJOR BIT(1)