commit 531b617c71e780b14af5931428e0611f930c2134

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

[ARM] 4508/1: S3C: Move items to include/asm-arm/plat-s3c

This patch moves items of the s3c24xx support into
a new plat-s3c directory for items that use the
s3c24xx support but are not directly s3c24xx
compatible, such as the s3c2400 and s3c6400.

git mv commands:
git mv include/asm-arm/arch-s3c2410/iic.h include/asm-arm/plat-s3c/iic.h
git mv include/asm-arm/arch-s3c2410/nand.h include/asm-arm/plat-s3c/nand.h
git mv include/asm-arm/arch-s3c2410/regs-iic.h include/asm-arm/plat-s3c/regs-iic.h
git mv include/asm-arm/arch-s3c2410/regs-nand.h include/asm-arm/plat-s3c/regs-nand.h
git mv include/asm-arm/arch-s3c2410/regs-rtc.h include/asm-arm/plat-s3c/regs-rtc.h
git mv include/asm-arm/arch-s3c2410/regs-serial.h include/asm-arm/plat-s3c/regs-serial.h
git mv include/asm-arm/arch-s3c2410/regs-timer.h include/asm-arm/plat-s3c/regs-timer.h
git mv include/asm-arm/arch-s3c2410/regs-watchdog.h include/asm-arm/plat-s3c/regs-watchdog.h

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 18 years ago 531b617c 9a79b227

+45 -46

44 changed files

expand all

unified split

arch

arm

mach-s3c2410

clock.c

dma.c

mach-amlm5900.c

mach-bast.c

mach-h1940.c

mach-n30.c

mach-otom.c

mach-qt2410.c

mach-smdk2410.c

mach-vr1000.c

s3c2410.c

sleep.S

mach-s3c2412

clock.c

dma.c

mach-smdk2413.c

mach-vstms.c

s3c2412.c

mach-s3c2440

dma.c

mach-anubis.c

mach-nexcoder.c

mach-osiris.c

mach-rx3715.c

mach-smdk2440.c

mach-s3c2443

dma.c

mach-smdk2443.c

plat-s3c24xx

common-smdk.c

cpu.c

devs.c

pm.c

s3c244x.c

sleep.S

time.c

drivers

serial

s3c2410.c

include

asm-arm

arch-s3c2410

debug-macro.S

system.h

uncompress.h

plat-s3c

iic.h

nand.h

regs-iic.h

regs-nand.h

regs-rtc.h

regs-serial.h

regs-timer.h

regs-watchdog.h

+1 -1

arch/arm/mach-s3c2410/clock.c

··· 37 #include <asm/hardware.h> 38 #include <asm/io.h> 39 40 - #include <asm/arch/regs-serial.h> 41 #include <asm/arch/regs-clock.h> 42 #include <asm/arch/regs-gpio.h> 43

··· 37 #include <asm/hardware.h> 38 #include <asm/io.h> 39 40 + #include <asm/plat-s3c/regs-serial.h> 41 #include <asm/arch/regs-clock.h> 42 #include <asm/arch/regs-gpio.h> 43

+1 -1

arch/arm/mach-s3c2410/dma.c

··· 23 #include <asm/plat-s3c24xx/cpu.h> 24 #include <asm/plat-s3c24xx/dma.h> 25 26 - #include <asm/arch/regs-serial.h> 27 #include <asm/arch/regs-gpio.h> 28 #include <asm/arch/regs-ac97.h> 29 #include <asm/arch/regs-mem.h>

··· 23 #include <asm/plat-s3c24xx/cpu.h> 24 #include <asm/plat-s3c24xx/dma.h> 25 26 + #include <asm/plat-s3c/regs-serial.h> 27 #include <asm/arch/regs-gpio.h> 28 #include <asm/arch/regs-ac97.h> 29 #include <asm/arch/regs-mem.h>

+1 -1

arch/arm/mach-s3c2410/mach-amlm5900.c

··· 48 #include <asm/mach-types.h> 49 #include <asm/arch/fb.h> 50 51 - #include <asm/arch/regs-serial.h> 52 #include <asm/arch/regs-lcd.h> 53 #include <asm/arch/regs-gpio.h> 54

··· 48 #include <asm/mach-types.h> 49 #include <asm/arch/fb.h> 50 51 + #include <asm/plat-s3c/regs-serial.h> 52 #include <asm/arch/regs-lcd.h> 53 #include <asm/arch/regs-gpio.h> 54

+3 -3

arch/arm/mach-s3c2410/mach-bast.c

··· 36 #include <asm/mach-types.h> 37 38 //#include <asm/debug-ll.h> 39 - #include <asm/arch/regs-serial.h> 40 #include <asm/arch/regs-gpio.h> 41 #include <asm/arch/regs-mem.h> 42 #include <asm/arch/regs-lcd.h> 43 44 - #include <asm/arch/nand.h> 45 - #include <asm/arch/iic.h> 46 #include <asm/arch/fb.h> 47 48 #include <linux/mtd/mtd.h>

··· 36 #include <asm/mach-types.h> 37 38 //#include <asm/debug-ll.h> 39 + #include <asm/plat-s3c/regs-serial.h> 40 #include <asm/arch/regs-gpio.h> 41 #include <asm/arch/regs-mem.h> 42 #include <asm/arch/regs-lcd.h> 43 44 + #include <asm/plat-s3c/nand.h> 45 + #include <asm/plat-s3c/iic.h> 46 #include <asm/arch/fb.h> 47 48 #include <linux/mtd/mtd.h>

+1 -1

arch/arm/mach-s3c2410/mach-h1940.c

··· 30 #include <asm/irq.h> 31 #include <asm/mach-types.h> 32 33 - #include <asm/arch/regs-serial.h> 34 #include <asm/arch/regs-lcd.h> 35 #include <asm/arch/regs-gpio.h> 36 #include <asm/arch/regs-clock.h>

··· 30 #include <asm/irq.h> 31 #include <asm/mach-types.h> 32 33 + #include <asm/plat-s3c/regs-serial.h> 34 #include <asm/arch/regs-lcd.h> 35 #include <asm/arch/regs-gpio.h> 36 #include <asm/arch/regs-clock.h>

+2 -2

arch/arm/mach-s3c2410/mach-n30.c

··· 33 #include <asm/irq.h> 34 #include <asm/mach-types.h> 35 36 - #include <asm/arch/regs-serial.h> 37 #include <asm/arch/regs-gpio.h> 38 - #include <asm/arch/iic.h> 39 40 #include <asm/plat-s3c24xx/s3c2410.h> 41 #include <asm/plat-s3c24xx/clock.h>

··· 33 #include <asm/irq.h> 34 #include <asm/mach-types.h> 35 36 + #include <asm/plat-s3c/regs-serial.h> 37 #include <asm/arch/regs-gpio.h> 38 + #include <asm/plat-s3c/iic.h> 39 40 #include <asm/plat-s3c24xx/s3c2410.h> 41 #include <asm/plat-s3c24xx/clock.h>

+1 -1

arch/arm/mach-s3c2410/mach-otom.c

··· 29 #include <asm/irq.h> 30 #include <asm/mach-types.h> 31 32 - #include <asm/arch/regs-serial.h> 33 #include <asm/arch/regs-gpio.h> 34 35 #include <asm/plat-s3c24xx/s3c2410.h>

··· 29 #include <asm/irq.h> 30 #include <asm/mach-types.h> 31 32 + #include <asm/plat-s3c/regs-serial.h> 33 #include <asm/arch/regs-gpio.h> 34 35 #include <asm/plat-s3c24xx/s3c2410.h>

+2 -2

arch/arm/mach-s3c2410/mach-qt2410.c

··· 49 50 #include <asm/arch/regs-gpio.h> 51 #include <asm/arch/leds-gpio.h> 52 - #include <asm/arch/regs-serial.h> 53 #include <asm/arch/fb.h> 54 - #include <asm/arch/nand.h> 55 #include <asm/arch/udc.h> 56 #include <asm/arch/spi.h> 57 #include <asm/arch/spi-gpio.h>

··· 49 50 #include <asm/arch/regs-gpio.h> 51 #include <asm/arch/leds-gpio.h> 52 + #include <asm/plat-s3c/regs-serial.h> 53 #include <asm/arch/fb.h> 54 + #include <asm/plat-s3c/nand.h> 55 #include <asm/arch/udc.h> 56 #include <asm/arch/spi.h> 57 #include <asm/arch/spi-gpio.h>

+1 -1

arch/arm/mach-s3c2410/mach-smdk2410.c

··· 47 #include <asm/irq.h> 48 #include <asm/mach-types.h> 49 50 - #include <asm/arch/regs-serial.h> 51 52 #include <asm/plat-s3c24xx/devs.h> 53 #include <asm/plat-s3c24xx/cpu.h>

··· 47 #include <asm/irq.h> 48 #include <asm/mach-types.h> 49 50 + #include <asm/plat-s3c/regs-serial.h> 51 52 #include <asm/plat-s3c24xx/devs.h> 53 #include <asm/plat-s3c24xx/cpu.h>

+1 -1

arch/arm/mach-s3c2410/mach-vr1000.c

··· 39 #include <asm/irq.h> 40 #include <asm/mach-types.h> 41 42 - #include <asm/arch/regs-serial.h> 43 #include <asm/arch/regs-gpio.h> 44 #include <asm/arch/leds-gpio.h> 45

··· 39 #include <asm/irq.h> 40 #include <asm/mach-types.h> 41 42 + #include <asm/plat-s3c/regs-serial.h> 43 #include <asm/arch/regs-gpio.h> 44 #include <asm/arch/leds-gpio.h> 45

+1 -2

arch/arm/mach-s3c2410/s3c2410.c

··· 29 #include <asm/irq.h> 30 31 #include <asm/arch/regs-clock.h> 32 - #include <asm/arch/regs-serial.h> 33 34 #include <asm/plat-s3c24xx/s3c2410.h> 35 #include <asm/plat-s3c24xx/cpu.h> ··· 40 41 static struct map_desc s3c2410_iodesc[] __initdata = { 42 IODESC_ENT(CLKPWR), 43 - IODESC_ENT(LCD), 44 IODESC_ENT(TIMER), 45 IODESC_ENT(WATCHDOG), 46 };

··· 29 #include <asm/irq.h> 30 31 #include <asm/arch/regs-clock.h> 32 + #include <asm/plat-s3c/regs-serial.h> 33 34 #include <asm/plat-s3c24xx/s3c2410.h> 35 #include <asm/plat-s3c24xx/cpu.h> ··· 40 41 static struct map_desc s3c2410_iodesc[] __initdata = { 42 IODESC_ENT(CLKPWR), 43 IODESC_ENT(TIMER), 44 IODESC_ENT(WATCHDOG), 45 };

+1 -1

arch/arm/mach-s3c2410/sleep.S

··· 32 #include <asm/arch/regs-gpio.h> 33 #include <asm/arch/regs-clock.h> 34 #include <asm/arch/regs-mem.h> 35 - #include <asm/arch/regs-serial.h> 36 37 /* s3c2410_cpu_suspend 38 *

··· 32 #include <asm/arch/regs-gpio.h> 33 #include <asm/arch/regs-clock.h> 34 #include <asm/arch/regs-mem.h> 35 + #include <asm/plat-s3c/regs-serial.h> 36 37 /* s3c2410_cpu_suspend 38 *

+1 -1

arch/arm/mach-s3c2412/clock.c

··· 37 #include <asm/hardware.h> 38 #include <asm/io.h> 39 40 - #include <asm/arch/regs-serial.h> 41 #include <asm/arch/regs-clock.h> 42 #include <asm/arch/regs-gpio.h> 43

··· 37 #include <asm/hardware.h> 38 #include <asm/io.h> 39 40 + #include <asm/plat-s3c/regs-serial.h> 41 #include <asm/arch/regs-clock.h> 42 #include <asm/arch/regs-gpio.h> 43

+1 -1

arch/arm/mach-s3c2412/dma.c

··· 24 #include <asm/plat-s3c24xx/dma.h> 25 #include <asm/plat-s3c24xx/cpu.h> 26 27 - #include <asm/arch/regs-serial.h> 28 #include <asm/arch/regs-gpio.h> 29 #include <asm/arch/regs-ac97.h> 30 #include <asm/arch/regs-mem.h>

··· 24 #include <asm/plat-s3c24xx/dma.h> 25 #include <asm/plat-s3c24xx/cpu.h> 26 27 + #include <asm/plat-s3c/regs-serial.h> 28 #include <asm/arch/regs-gpio.h> 29 #include <asm/arch/regs-ac97.h> 30 #include <asm/arch/regs-mem.h>

+1 -1

arch/arm/mach-s3c2412/mach-smdk2413.c

··· 32 #include <asm/mach-types.h> 33 34 //#include <asm/debug-ll.h> 35 - #include <asm/arch/regs-serial.h> 36 #include <asm/arch/regs-gpio.h> 37 #include <asm/arch/regs-lcd.h> 38

··· 32 #include <asm/mach-types.h> 33 34 //#include <asm/debug-ll.h> 35 + #include <asm/plat-s3c/regs-serial.h> 36 #include <asm/arch/regs-gpio.h> 37 #include <asm/arch/regs-lcd.h> 38

+2 -2

arch/arm/mach-s3c2412/mach-vstms.c

··· 33 #include <asm/irq.h> 34 #include <asm/mach-types.h> 35 36 - #include <asm/arch/regs-serial.h> 37 #include <asm/arch/regs-gpio.h> 38 #include <asm/arch/regs-lcd.h> 39 40 #include <asm/arch/idle.h> 41 #include <asm/arch/fb.h> 42 43 - #include <asm/arch/nand.h> 44 45 #include <asm/plat-s3c24xx/s3c2410.h> 46 #include <asm/plat-s3c24xx/s3c2412.h>

··· 33 #include <asm/irq.h> 34 #include <asm/mach-types.h> 35 36 + #include <asm/plat-s3c/regs-serial.h> 37 #include <asm/arch/regs-gpio.h> 38 #include <asm/arch/regs-lcd.h> 39 40 #include <asm/arch/idle.h> 41 #include <asm/arch/fb.h> 42 43 + #include <asm/plat-s3c/nand.h> 44 45 #include <asm/plat-s3c24xx/s3c2410.h> 46 #include <asm/plat-s3c24xx/s3c2412.h>

+1 -1

arch/arm/mach-s3c2412/s3c2412.c

··· 34 #include <asm/arch/idle.h> 35 36 #include <asm/arch/regs-clock.h> 37 - #include <asm/arch/regs-serial.h> 38 #include <asm/arch/regs-power.h> 39 #include <asm/arch/regs-gpio.h> 40 #include <asm/arch/regs-gpioj.h>

··· 34 #include <asm/arch/idle.h> 35 36 #include <asm/arch/regs-clock.h> 37 + #include <asm/plat-s3c/regs-serial.h> 38 #include <asm/arch/regs-power.h> 39 #include <asm/arch/regs-gpio.h> 40 #include <asm/arch/regs-gpioj.h>

+1 -1

arch/arm/mach-s3c2440/dma.c

··· 23 #include <asm/plat-s3c24xx/dma.h> 24 #include <asm/plat-s3c24xx/cpu.h> 25 26 - #include <asm/arch/regs-serial.h> 27 #include <asm/arch/regs-gpio.h> 28 #include <asm/arch/regs-ac97.h> 29 #include <asm/arch/regs-mem.h>

··· 23 #include <asm/plat-s3c24xx/dma.h> 24 #include <asm/plat-s3c24xx/cpu.h> 25 26 + #include <asm/plat-s3c/regs-serial.h> 27 #include <asm/arch/regs-gpio.h> 28 #include <asm/arch/regs-ac97.h> 29 #include <asm/arch/regs-mem.h>

+2 -2

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

··· 34 #include <asm/irq.h> 35 #include <asm/mach-types.h> 36 37 - #include <asm/arch/regs-serial.h> 38 #include <asm/arch/regs-gpio.h> 39 #include <asm/arch/regs-mem.h> 40 #include <asm/arch/regs-lcd.h> 41 - #include <asm/arch/nand.h> 42 43 #include <linux/mtd/mtd.h> 44 #include <linux/mtd/nand.h>

··· 34 #include <asm/irq.h> 35 #include <asm/mach-types.h> 36 37 + #include <asm/plat-s3c/regs-serial.h> 38 #include <asm/arch/regs-gpio.h> 39 #include <asm/arch/regs-mem.h> 40 #include <asm/arch/regs-lcd.h> 41 + #include <asm/plat-s3c/nand.h> 42 43 #include <linux/mtd/mtd.h> 44 #include <linux/mtd/nand.h>

+1 -1

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

··· 36 37 //#include <asm/debug-ll.h> 38 #include <asm/arch/regs-gpio.h> 39 - #include <asm/arch/regs-serial.h> 40 41 #include <asm/plat-s3c24xx/s3c2410.h> 42 #include <asm/plat-s3c24xx/s3c2440.h>

··· 36 37 //#include <asm/debug-ll.h> 38 #include <asm/arch/regs-gpio.h> 39 + #include <asm/plat-s3c/regs-serial.h> 40 41 #include <asm/plat-s3c24xx/s3c2410.h> 42 #include <asm/plat-s3c24xx/s3c2440.h>

+2 -2

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

··· 31 #include <asm/irq.h> 32 #include <asm/mach-types.h> 33 34 - #include <asm/arch/regs-serial.h> 35 #include <asm/arch/regs-gpio.h> 36 #include <asm/arch/regs-mem.h> 37 #include <asm/arch/regs-lcd.h> 38 - #include <asm/arch/nand.h> 39 40 #include <linux/mtd/mtd.h> 41 #include <linux/mtd/nand.h>

··· 31 #include <asm/irq.h> 32 #include <asm/mach-types.h> 33 34 + #include <asm/plat-s3c/regs-serial.h> 35 #include <asm/arch/regs-gpio.h> 36 #include <asm/arch/regs-mem.h> 37 #include <asm/arch/regs-lcd.h> 38 + #include <asm/plat-s3c/nand.h> 39 40 #include <linux/mtd/mtd.h> 41 #include <linux/mtd/nand.h>

+2 -2

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

··· 38 #include <asm/irq.h> 39 #include <asm/mach-types.h> 40 41 - #include <asm/arch/regs-serial.h> 42 #include <asm/arch/regs-gpio.h> 43 #include <asm/arch/regs-lcd.h> 44 45 #include <asm/arch/h1940.h> 46 - #include <asm/arch/nand.h> 47 #include <asm/arch/fb.h> 48 49 #include <asm/plat-s3c24xx/clock.h>

··· 38 #include <asm/irq.h> 39 #include <asm/mach-types.h> 40 41 + #include <asm/plat-s3c/regs-serial.h> 42 #include <asm/arch/regs-gpio.h> 43 #include <asm/arch/regs-lcd.h> 44 45 #include <asm/arch/h1940.h> 46 + #include <asm/plat-s3c/nand.h> 47 #include <asm/arch/fb.h> 48 49 #include <asm/plat-s3c24xx/clock.h>

+1 -1

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

··· 31 #include <asm/irq.h> 32 #include <asm/mach-types.h> 33 34 - #include <asm/arch/regs-serial.h> 35 #include <asm/arch/regs-gpio.h> 36 #include <asm/arch/regs-lcd.h> 37

··· 31 #include <asm/irq.h> 32 #include <asm/mach-types.h> 33 34 + #include <asm/plat-s3c/regs-serial.h> 35 #include <asm/arch/regs-gpio.h> 36 #include <asm/arch/regs-lcd.h> 37

+1 -1

arch/arm/mach-s3c2443/dma.c

+1 -1

arch/arm/mach-s3c2443/mach-smdk2443.c

··· 31 #include <asm/irq.h> 32 #include <asm/mach-types.h> 33 34 - #include <asm/arch/regs-serial.h> 35 #include <asm/arch/regs-gpio.h> 36 #include <asm/arch/regs-lcd.h> 37

··· 31 #include <asm/irq.h> 32 #include <asm/mach-types.h> 33 34 + #include <asm/plat-s3c/regs-serial.h> 35 #include <asm/arch/regs-gpio.h> 36 #include <asm/arch/regs-lcd.h> 37

+1 -1

arch/arm/plat-s3c24xx/common-smdk.c

··· 38 #include <asm/arch/regs-gpio.h> 39 #include <asm/arch/leds-gpio.h> 40 41 - #include <asm/arch/nand.h> 42 43 #include <asm/plat-s3c24xx/common-smdk.h> 44 #include <asm/plat-s3c24xx/devs.h>

··· 38 #include <asm/arch/regs-gpio.h> 39 #include <asm/arch/leds-gpio.h> 40 41 + #include <asm/plat-s3c/nand.h> 42 43 #include <asm/plat-s3c24xx/common-smdk.h> 44 #include <asm/plat-s3c24xx/devs.h>

+1 -1

arch/arm/plat-s3c24xx/cpu.c

··· 38 #include <asm/mach/map.h> 39 40 #include <asm/arch/regs-gpio.h> 41 - #include <asm/arch/regs-serial.h> 42 43 #include <asm/plat-s3c24xx/cpu.h> 44 #include <asm/plat-s3c24xx/devs.h>

··· 38 #include <asm/mach/map.h> 39 40 #include <asm/arch/regs-gpio.h> 41 + #include <asm/plat-s3c/regs-serial.h> 42 43 #include <asm/plat-s3c24xx/cpu.h> 44 #include <asm/plat-s3c24xx/devs.h>

+1 -1

arch/arm/plat-s3c24xx/devs.c

··· 28 #include <asm/io.h> 29 #include <asm/irq.h> 30 31 - #include <asm/arch/regs-serial.h> 32 #include <asm/arch/udc.h> 33 34 #include <asm/plat-s3c24xx/devs.h>

··· 28 #include <asm/io.h> 29 #include <asm/irq.h> 30 31 + #include <asm/plat-s3c/regs-serial.h> 32 #include <asm/arch/udc.h> 33 34 #include <asm/plat-s3c24xx/devs.h>

+1 -1

arch/arm/plat-s3c24xx/pm.c

··· 40 #include <asm/hardware.h> 41 #include <asm/io.h> 42 43 - #include <asm/arch/regs-serial.h> 44 #include <asm/arch/regs-clock.h> 45 #include <asm/arch/regs-gpio.h> 46 #include <asm/arch/regs-mem.h>

··· 40 #include <asm/hardware.h> 41 #include <asm/io.h> 42 43 + #include <asm/plat-s3c/regs-serial.h> 44 #include <asm/arch/regs-clock.h> 45 #include <asm/arch/regs-gpio.h> 46 #include <asm/arch/regs-mem.h>

+1 -1

arch/arm/plat-s3c24xx/s3c244x.c

··· 30 #include <asm/irq.h> 31 32 #include <asm/arch/regs-clock.h> 33 - #include <asm/arch/regs-serial.h> 34 #include <asm/arch/regs-gpio.h> 35 #include <asm/arch/regs-gpioj.h> 36 #include <asm/arch/regs-dsc.h>

··· 30 #include <asm/irq.h> 31 32 #include <asm/arch/regs-clock.h> 33 + #include <asm/plat-s3c/regs-serial.h> 34 #include <asm/arch/regs-gpio.h> 35 #include <asm/arch/regs-gpioj.h> 36 #include <asm/arch/regs-dsc.h>

+1 -1

arch/arm/plat-s3c24xx/sleep.S

··· 32 #include <asm/arch/regs-gpio.h> 33 #include <asm/arch/regs-clock.h> 34 #include <asm/arch/regs-mem.h> 35 - #include <asm/arch/regs-serial.h> 36 37 /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not 38 * reset the UART configuration, only enable if you really need this!

··· 32 #include <asm/arch/regs-gpio.h> 33 #include <asm/arch/regs-clock.h> 34 #include <asm/arch/regs-mem.h> 35 + #include <asm/plat-s3c/regs-serial.h> 36 37 /* CONFIG_DEBUG_RESUME is dangerous if your bootloader does not 38 * reset the UART configuration, only enable if you really need this!

+1 -1

arch/arm/plat-s3c24xx/time.c

··· 33 #include <asm/io.h> 34 #include <asm/irq.h> 35 #include <asm/arch/map.h> 36 - #include <asm/arch/regs-timer.h> 37 #include <asm/arch/regs-irq.h> 38 #include <asm/mach/time.h> 39

··· 33 #include <asm/io.h> 34 #include <asm/irq.h> 35 #include <asm/arch/map.h> 36 + #include <asm/plat-s3c/regs-timer.h> 37 #include <asm/arch/regs-irq.h> 38 #include <asm/mach/time.h> 39

+1 -1

drivers/serial/s3c2410.c

··· 78 79 #include <asm/hardware.h> 80 81 - #include <asm/arch/regs-serial.h> 82 #include <asm/arch/regs-gpio.h> 83 84 /* structures */

··· 78 79 #include <asm/hardware.h> 80 81 + #include <asm/plat-s3c/regs-serial.h> 82 #include <asm/arch/regs-gpio.h> 83 84 /* structures */

+1 -1

include/asm-arm/arch-s3c2410/debug-macro.S

··· 13 */ 14 15 #include <asm/arch/map.h> 16 - #include <asm/arch/regs-serial.h> 17 #include <asm/arch/regs-gpio.h> 18 19 #define S3C2410_UART1_OFF (0x4000)

··· 13 */ 14 15 #include <asm/arch/map.h> 16 + #include <asm/plat-s3c/regs-serial.h> 17 #include <asm/arch/regs-gpio.h> 18 19 #define S3C2410_UART1_OFF (0x4000)

include/asm-arm/arch-s3c2410/iic.h include/asm-arm/plat-s3c/iic.h

include/asm-arm/arch-s3c2410/nand.h include/asm-arm/plat-s3c/nand.h

include/asm-arm/arch-s3c2410/regs-iic.h include/asm-arm/plat-s3c/regs-iic.h

include/asm-arm/arch-s3c2410/regs-nand.h include/asm-arm/plat-s3c/regs-nand.h

include/asm-arm/arch-s3c2410/regs-rtc.h include/asm-arm/plat-s3c/regs-rtc.h

include/asm-arm/arch-s3c2410/regs-serial.h include/asm-arm/plat-s3c/regs-serial.h

include/asm-arm/arch-s3c2410/regs-timer.h include/asm-arm/plat-s3c/regs-timer.h

include/asm-arm/arch-s3c2410/regs-watchdog.h include/asm-arm/plat-s3c/regs-watchdog.h

+1 -1

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

··· 17 #include <asm/arch/idle.h> 18 #include <asm/arch/reset.h> 19 20 - #include <asm/arch/regs-watchdog.h> 21 #include <asm/arch/regs-clock.h> 22 23 void (*s3c24xx_idle)(void);

··· 17 #include <asm/arch/idle.h> 18 #include <asm/arch/reset.h> 19 20 + #include <asm/plat-s3c/regs-watchdog.h> 21 #include <asm/arch/regs-clock.h> 22 23 void (*s3c24xx_idle)(void);

+2 -2

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

··· 16 typedef unsigned int upf_t; /* cannot include linux/serial_core.h */ 17 18 /* defines for UART registers */ 19 - #include "asm/arch/regs-serial.h" 20 #include "asm/arch/regs-gpio.h" 21 - #include "asm/arch/regs-watchdog.h" 22 23 #include <asm/arch/map.h> 24

··· 16 typedef unsigned int upf_t; /* cannot include linux/serial_core.h */ 17 18 /* defines for UART registers */ 19 + #include "asm/plat-s3c/regs-serial.h" 20 #include "asm/arch/regs-gpio.h" 21 + #include "asm/plat-s3c/regs-watchdog.h" 22 23 #include <asm/arch/map.h> 24