Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b7a86c2 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent bccd7458

include/asm-arm/arch-s3c2410/osiris-map.h

+9 −9
Original line number Diff line number Diff line
@@ -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 */