Skip to content

Commit

Permalink
[ARM] 2934/1: Anubis - fix VA offsets for CPLD registers
Browse files Browse the repository at this point in the history
Patch from Ben Dooks

The VA addresses of the Anubis CPLD registers
confoict with the addresses for the ISA space
maps used by the rest of the s3c2410 architecture

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Ben Dooks authored and Russell King committed Sep 25, 2005
1 parent ef6bd6e commit 5b58745
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions include/asm-arm/arch-s3c2410/anubis-map.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@

/* start peripherals off after the S3C2410 */

#define ANUBIS_IOADDR(x) (S3C2410_ADDR((x) + 0x02000000))
#define ANUBIS_IOADDR(x) (S3C2410_ADDR((x) + 0x01800000))

#define ANUBIS_PA_CPLD (S3C2410_CS1 | (1<<26))

/* we put the CPLD registers next, to get them out of the way */

#define ANUBIS_VA_CTRL1 ANUBIS_IOADDR(0x00000000) /* 0x01300000 */
#define ANUBIS_VA_CTRL1 ANUBIS_IOADDR(0x00000000) /* 0x01800000 */
#define ANUBIS_PA_CTRL1 (ANUBIS_PA_CPLD)

#define ANUBIS_VA_CTRL2 ANUBIS_IOADDR(0x00100000) /* 0x01400000 */
#define ANUBIS_VA_CTRL2 ANUBIS_IOADDR(0x00100000) /* 0x01900000 */
#define ANUBIS_PA_CTRL2 (ANUBIS_PA_CPLD)

#define ANUBIS_VA_CTRL3 ANUBIS_IOADDR(0x00200000) /* 0x01500000 */
#define ANUBIS_VA_CTRL3 ANUBIS_IOADDR(0x00200000) /* 0x01A00000 */
#define ANUBIS_PA_CTRL3 (ANUBIS_PA_CPLD)

#define ANUBIS_VA_CTRL4 ANUBIS_IOADDR(0x00300000) /* 0x01600000 */
#define ANUBIS_VA_CTRL4 ANUBIS_IOADDR(0x00300000) /* 0x01B00000 */
#define ANUBIS_PA_CTRL4 (ANUBIS_PA_CPLD)

#define ANUBIS_IDEPRI ANUBIS_IOADDR(0x01000000)
Expand Down

0 comments on commit 5b58745

Please sign in to comment.