tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Remove the static maps for the LCD and USB devices.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Ben Dooks and committed by Russell King bf2a3a26 ae39ae0b

+1 -5
unified split
-1
arch/arm/mach-s3c2412/s3c2412.c
··· 63 64 static struct map_desc s3c2412_iodesc[] __initdata = { 65 IODESC_ENT(CLKPWR), 66 - IODESC_ENT(LCD), 67 IODESC_ENT(TIMER), 68 IODESC_ENT(WATCHDOG), 69 };
··· 63 64 static struct map_desc s3c2412_iodesc[] __initdata = { 65 IODESC_ENT(CLKPWR), 66 IODESC_ENT(TIMER), 67 IODESC_ENT(WATCHDOG), 68 };
-1
arch/arm/plat-s3c24xx/s3c244x.c
··· 47 IODESC_ENT(CLKPWR), 48 IODESC_ENT(TIMER), 49 IODESC_ENT(WATCHDOG), 50 - IODESC_ENT(LCD), 51 }; 52 53 /* uart initialisation */
··· 47 IODESC_ENT(CLKPWR), 48 IODESC_ENT(TIMER), 49 IODESC_ENT(WATCHDOG), 50 }; 51 52 /* uart initialisation */
-2
include/asm-arm/arch-s3c2410/map.h
··· 56 #define S3C24XX_SZ_CLKPWR SZ_1M 57 58 /* LCD controller */ 59 - #define S3C24XX_VA_LCD S3C2410_ADDR(0x00300000) 60 #define S3C2410_PA_LCD (0x4D000000) 61 #define S3C24XX_SZ_LCD SZ_1M 62 ··· 74 #define S3C24XX_SZ_TIMER SZ_1M 75 76 /* USB Device port */ 77 - #define S3C24XX_VA_USBDEV S3C2410_ADDR(0x00600000) 78 #define S3C2410_PA_USBDEV (0x52000000) 79 #define S3C24XX_SZ_USBDEV SZ_1M 80
··· 56 #define S3C24XX_SZ_CLKPWR SZ_1M 57 58 /* LCD controller */ 59 #define S3C2410_PA_LCD (0x4D000000) 60 #define S3C24XX_SZ_LCD SZ_1M 61 ··· 75 #define S3C24XX_SZ_TIMER SZ_1M 76 77 /* USB Device port */ 78 #define S3C2410_PA_USBDEV (0x52000000) 79 #define S3C24XX_SZ_USBDEV SZ_1M 80
+1 -1
include/asm-arm/arch-s3c2410/regs-lcd.h
··· 12 #ifndef ___ASM_ARCH_REGS_LCD_H 13 #define ___ASM_ARCH_REGS_LCD_H "$Id: lcd.h,v 1.3 2003/06/26 13:25:06 ben Exp $" 14 15 - #define S3C2410_LCDREG(x) ((x) + S3C24XX_VA_LCD) 16 17 /* LCD control registers */ 18 #define S3C2410_LCDCON1 S3C2410_LCDREG(0x00)
··· 12 #ifndef ___ASM_ARCH_REGS_LCD_H 13 #define ___ASM_ARCH_REGS_LCD_H "$Id: lcd.h,v 1.3 2003/06/26 13:25:06 ben Exp $" 14 15 + #define S3C2410_LCDREG(x) (x) 16 17 /* LCD control registers */ 18 #define S3C2410_LCDCON1 S3C2410_LCDREG(0x00)