diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-05-10 20:39:05 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-05-10 20:39:05 +0400 |
| commit | 640ec79d6d8c10ceb254c269a1f7fd9cb47ea655 (patch) | |
| tree | e13bf414bc1a9c2e35889441b93443865e2eb14c /arch/arm/plat-omap | |
| parent | 7a8bcf067d2b11964cb83ce3d753ac2d3ab9843c (diff) | |
| parent | cf563a35888ee92361c324dfc57b328c84653c5b (diff) | |
| download | linux-640ec79d6d8c10ceb254c269a1f7fd9cb47ea655.tar.xz | |
Merge branch 'cleanup-soc' into cleanup
Conflicts:
arch/arm/mach-omap2/Makefile
Diffstat (limited to 'arch/arm/plat-omap')
| -rw-r--r-- | arch/arm/plat-omap/dma.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/dma.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index c58d896cd5c3..807ce4c45ef3 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -843,7 +843,7 @@ omap_dma_set_prio_lch(int lch, unsigned char read_prio, } l = p->dma_read(CCR, lch); l &= ~((1 << 6) | (1 << 26)); - if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) + if (cpu_class_is_omap2() && !cpu_is_omap242x()) l |= ((read_prio & 0x1) << 6) | ((write_prio & 0x1) << 26); else l |= ((read_prio & 0x1) << 6); @@ -2071,7 +2071,7 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) } } - if (cpu_is_omap2430() || cpu_is_omap34xx() || cpu_is_omap44xx()) + if (cpu_class_is_omap2() && !cpu_is_omap242x()) omap_dma_set_global_params(DMA_DEFAULT_ARB_RATE, DMA_DEFAULT_FIFO_DEPTH, 0); diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h index dc562a5c0a8a..77422041e7be 100644 --- a/arch/arm/plat-omap/include/plat/dma.h +++ b/arch/arm/plat-omap/include/plat/dma.h @@ -312,6 +312,11 @@ #define CLEAR_CSR_ON_READ BIT(0xC) #define IS_WORD_16 BIT(0xD) +/* Defines for DMA Capabilities */ +#define DMA_HAS_TRANSPARENT_CAPS (0x1 << 18) +#define DMA_HAS_CONSTANT_FILL_CAPS (0x1 << 19) +#define DMA_HAS_DESCRIPTOR_CAPS (0x3 << 20) + enum omap_reg_offsets { GCR, GSCR, GRST1, HW_ID, |