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

Commit 6c1640d5 authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4445/1: ANUBIS: Fix CPLD registers 



Update the ANUBIS register definitions inline with the
specs and ensure they are registered correctly.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5698bd28

arch/arm/mach-s3c2440/mach-anubis.c

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ static struct map_desc anubis_iodesc[] __initdata = { 
	.length		= SZ_4K,

	.type		= MT_DEVICE,

  }, {

	.virtual	= (u32)ANUBIS_VA_CTRL2,

	.pfn		= __phys_to_pfn(ANUBIS_PA_CTRL2),

	.virtual	= (u32)ANUBIS_VA_IDREG,

	.pfn		= __phys_to_pfn(ANUBIS_PA_IDREG),

	.length		= SZ_4K,

	.type		= MT_DEVICE,

  },

include/asm-arm/arch-s3c2410/anubis-cpld.h

+4 −0
Original line number Diff line number Diff line
@@ -18,4 +18,8 @@ 


#define ANUBIS_CTRL1_NANDSEL		(0x3)



/* IDREG - revision */



#define ANUBIS_IDREG_REVMASK		(0x7)



#endif /* __ASM_ARCH_ANUBISCPLD_H */

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

+2 −8
Original line number Diff line number Diff line
@@ -27,14 +27,8 @@ 
#define ANUBIS_VA_CTRL1	    ANUBIS_IOADDR(0x00000000)	 /* 0x01800000 */

#define ANUBIS_PA_CTRL1	    (ANUBIS_PA_CPLD)



#define ANUBIS_VA_CTRL2	    ANUBIS_IOADDR(0x00100000)	 /* 0x01900000 */

#define ANUBIS_PA_CTRL2	    (ANUBIS_PA_CPLD)



#define ANUBIS_VA_CTRL3	    ANUBIS_IOADDR(0x00200000)	 /* 0x01A00000 */

#define ANUBIS_PA_CTRL3	    (ANUBIS_PA_CPLD)



#define ANUBIS_VA_CTRL4	    ANUBIS_IOADDR(0x00300000)	 /* 0x01B00000 */

#define ANUBIS_PA_CTRL4	    (ANUBIS_PA_CPLD)

#define ANUBIS_VA_IDREG	    ANUBIS_IOADDR(0x00300000)	 /* 0x01B00000 */

#define ANUBIS_PA_IDREG	    (ANUBIS_PA_CPLD + (3<<23))



#define ANUBIS_IDEPRI	    ANUBIS_IOADDR(0x01000000)

#define ANUBIS_IDEPRIAUX    ANUBIS_IOADDR(0x01100000)