From 55499b87e0e0df2d12eaeb9631b56594cd217008 Mon Sep 17 00:00:00 2001 From: eric miao Date: Tue, 27 Nov 2007 03:12:19 +0100 Subject: [PATCH] --- yaml --- r: 74415 b: refs/heads/master c: 7267d1ccdb5ef08289323461db3551570fa1ab27 h: refs/heads/master i: 74413: a0465763e092d07229499ec0c3155fd5a9c559a9 74411: fc2f3c6a43474f333af6950de87e4f0060ffd4a2 74407: fa29f6f853c010b459370b70b6d0fc04e3983005 74399: efdc25ef9bd6863c9ce837a256a97046f75ee30e v: v3 --- [refs] | 2 +- trunk/include/asm-arm/arch-pxa/pxa-regs.h | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ef20943df876..f1dcc00a71e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa7f1518e8a107e1feab0357b18c745b9a6927c5 +refs/heads/master: 7267d1ccdb5ef08289323461db3551570fa1ab27 diff --git a/trunk/include/asm-arm/arch-pxa/pxa-regs.h b/trunk/include/asm-arm/arch-pxa/pxa-regs.h index bb68b598c436..6b33df6f1995 100644 --- a/trunk/include/asm-arm/arch-pxa/pxa-regs.h +++ b/trunk/include/asm-arm/arch-pxa/pxa-regs.h @@ -110,7 +110,10 @@ #define DALGN __REG(0x400000a0) /* DMA Alignment Register */ #define DINT __REG(0x400000f0) /* DMA Interrupt Register */ -#define DRCMR(n) __REG2(0x40000100, (n)<<2) +#define DRCMR(n) (*(((n) < 64) ? \ + &__REG2(0x40000100, ((n) & 0x3f) << 2) : \ + &__REG2(0x40001100, ((n) & 0x3f) << 2))) + #define DRCMR0 __REG(0x40000100) /* Request to Channel Map Register for DREQ 0 */ #define DRCMR1 __REG(0x40000104) /* Request to Channel Map Register for DREQ 1 */ #define DRCMR2 __REG(0x40000108) /* Request to Channel Map Register for I2S receive Request */