mirror of
https://github.com/torvalds/linux.git
synced 2024-11-16 00:52:01 +00:00
[ARM] 3846/1: S3C24XX: Fix osiris memory map
The memory mapping for the Osiris machine are all off by one bit, and the base address has been fixed for writing (bit25 is being checked by the write, but not on read) Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
parent
bccd7458c0
commit
3b7a86c2f0
@ -18,22 +18,22 @@
|
||||
|
||||
/* start peripherals off after the S3C2410 */
|
||||
|
||||
#define OSIRIS_IOADDR(x) (S3C2410_ADDR((x) + 0x05000000))
|
||||
#define OSIRIS_IOADDR(x) (S3C2410_ADDR((x) + 0x04000000))
|
||||
|
||||
#define OSIRIS_PA_CPLD (S3C2410_CS1 | (3<<25))
|
||||
#define OSIRIS_PA_CPLD (S3C2410_CS1 | (1<<26))
|
||||
|
||||
/* we put the CPLD registers next, to get them out of the way */
|
||||
|
||||
#define OSIRIS_VA_CTRL1 OSIRIS_IOADDR(0x00000000) /* 0x01300000 */
|
||||
#define OSIRIS_VA_CTRL1 OSIRIS_IOADDR(0x00000000)
|
||||
#define OSIRIS_PA_CTRL1 (OSIRIS_PA_CPLD)
|
||||
|
||||
#define OSIRIS_VA_CTRL2 OSIRIS_IOADDR(0x00100000) /* 0x01400000 */
|
||||
#define OSIRIS_PA_CTRL2 (OSIRIS_PA_CPLD + (1<<24))
|
||||
#define OSIRIS_VA_CTRL2 OSIRIS_IOADDR(0x00100000)
|
||||
#define OSIRIS_PA_CTRL2 (OSIRIS_PA_CPLD + (1<<23))
|
||||
|
||||
#define OSIRIS_VA_CTRL3 OSIRIS_IOADDR(0x00200000) /* 0x01500000 */
|
||||
#define OSIRIS_PA_CTRL3 (OSIRIS_PA_CPLD + (2<<24))
|
||||
#define OSIRIS_VA_CTRL3 OSIRIS_IOADDR(0x00200000)
|
||||
#define OSIRIS_PA_CTRL3 (OSIRIS_PA_CPLD + (2<<23))
|
||||
|
||||
#define OSIRIS_VA_CTRL4 OSIRIS_IOADDR(0x00300000) /* 0x01600000 */
|
||||
#define OSIRIS_PA_CTRL4 (OSIRIS_PA_CPLD + (3<<24))
|
||||
#define OSIRIS_VA_CTRL4 OSIRIS_IOADDR(0x00300000)
|
||||
#define OSIRIS_PA_CTRL4 (OSIRIS_PA_CPLD + (3<<23))
|
||||
|
||||
#endif /* __ASM_ARCH_OSIRISMAP_H */
|
||||
|
Loading…
Reference in New Issue
Block a user