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

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

[ARM] 4520/1: S3C: Remove old VA values from static map 



Remove the static maps for the LCD and USB devices.

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

arch/arm/mach-s3c2412/s3c2412.c

+0 −1
Original line number Diff line number Diff line
@@ -63,7 +63,6 @@ static inline void s3c2412_init_gpio2(void) 


static struct map_desc s3c2412_iodesc[] __initdata = {

	IODESC_ENT(CLKPWR),

	IODESC_ENT(LCD),

	IODESC_ENT(TIMER),

	IODESC_ENT(WATCHDOG),

};

arch/arm/plat-s3c24xx/s3c244x.c

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ static struct map_desc s3c244x_iodesc[] __initdata = { 
	IODESC_ENT(CLKPWR),

	IODESC_ENT(TIMER),

	IODESC_ENT(WATCHDOG),

	IODESC_ENT(LCD),

};



/* uart initialisation */

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

+0 −2
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ 
#define S3C24XX_SZ_CLKPWR  SZ_1M



/* LCD controller */

#define S3C24XX_VA_LCD	   S3C2410_ADDR(0x00300000)

#define S3C2410_PA_LCD	   (0x4D000000)

#define S3C24XX_SZ_LCD	   SZ_1M
@@ -75,7 +74,6 @@ 
#define S3C24XX_SZ_TIMER   SZ_1M



/* USB Device port */

#define S3C24XX_VA_USBDEV  S3C2410_ADDR(0x00600000)

#define S3C2410_PA_USBDEV  (0x52000000)

#define S3C24XX_SZ_USBDEV  SZ_1M

include/asm-arm/arch-s3c2410/regs-lcd.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#ifndef ___ASM_ARCH_REGS_LCD_H

#define ___ASM_ARCH_REGS_LCD_H "$Id: lcd.h,v 1.3 2003/06/26 13:25:06 ben Exp $"



#define S3C2410_LCDREG(x) ((x) + S3C24XX_VA_LCD)

#define S3C2410_LCDREG(x)	(x)



/* LCD control registers */

#define S3C2410_LCDCON1	    S3C2410_LCDREG(0x00)