diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2010-10-25 04:04:44 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-01-10 07:18:05 -0500 |
| commit | 9346dba55672a6f04b7bfd1faa081ff149995a3f (patch) | |
| tree | 78720838d17b73ab0a535fa907df9b805f5a7442 /arch/blackfin/mach-bf548 | |
| parent | 6c8e75a06c8ee32c68ce90afa4a0fe093327b0e4 (diff) | |
Blackfin: standardize DMAC traffic control MMRs & MDMA MMRs
Use the same naming convention for DMA traffic MMRs (most were legacy
anyways) so we can avoid useless ifdef trees.
Same goes for MDMA names -- this actually allows us to undo a bunch of
ifdef redirects that existed for this purpose alone.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-bf548')
| -rw-r--r-- | arch/blackfin/mach-bf548/include/mach/defBF54x_base.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h index 3d751f134b7e..567a855e4c27 100644 --- a/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h +++ b/arch/blackfin/mach-bf548/include/mach/defBF54x_base.h | |||
| @@ -1615,14 +1615,14 @@ | |||
| 1615 | #define CTYPE 0x40 /* DMA Channel Type */ | 1615 | #define CTYPE 0x40 /* DMA Channel Type */ |
| 1616 | #define PMAP 0xf000 /* Peripheral Mapped To This Channel */ | 1616 | #define PMAP 0xf000 /* Peripheral Mapped To This Channel */ |
| 1617 | 1617 | ||
| 1618 | /* Bit masks for DMACx_TCPER */ | 1618 | /* Bit masks for DMACx_TC_PER */ |
| 1619 | 1619 | ||
| 1620 | #define DCB_TRAFFIC_PERIOD 0xf /* DCB Traffic Control Period */ | 1620 | #define DCB_TRAFFIC_PERIOD 0xf /* DCB Traffic Control Period */ |
| 1621 | #define DEB_TRAFFIC_PERIOD 0xf0 /* DEB Traffic Control Period */ | 1621 | #define DEB_TRAFFIC_PERIOD 0xf0 /* DEB Traffic Control Period */ |
| 1622 | #define DAB_TRAFFIC_PERIOD 0x700 /* DAB Traffic Control Period */ | 1622 | #define DAB_TRAFFIC_PERIOD 0x700 /* DAB Traffic Control Period */ |
| 1623 | #define MDMA_ROUND_ROBIN_PERIOD 0xf800 /* MDMA Round Robin Period */ | 1623 | #define MDMA_ROUND_ROBIN_PERIOD 0xf800 /* MDMA Round Robin Period */ |
| 1624 | 1624 | ||
| 1625 | /* Bit masks for DMACx_TCCNT */ | 1625 | /* Bit masks for DMACx_TC_CNT */ |
| 1626 | 1626 | ||
| 1627 | #define DCB_TRAFFIC_COUNT 0xf /* DCB Traffic Control Count */ | 1627 | #define DCB_TRAFFIC_COUNT 0xf /* DCB Traffic Control Count */ |
| 1628 | #define DEB_TRAFFIC_COUNT 0xf0 /* DEB Traffic Control Count */ | 1628 | #define DEB_TRAFFIC_COUNT 0xf0 /* DEB Traffic Control Count */ |