diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-03 08:57:03 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2012-03-07 01:36:33 -0800 |
| commit | 880bcd4a8363f24375027f9ded4670960dcfa70a (patch) | |
| tree | 31894d9dc2c29f31234e479de520a50858cce54c /arch | |
| parent | a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (diff) | |
| parent | 8c3d7c30c306d83ff9c303f42307765a5a7bc254 (diff) | |
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 26 | ||||
| -rw-r--r-- | arch/arm/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 2 | ||||
| -rw-r--r-- | arch/arm/configs/mini2440_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/s3c2410_defconfig | 57 | ||||
| -rw-r--r-- | arch/arm/configs/tct_hammer_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/Kconfig | 154 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/Makefile | 26 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/spi.h | 38 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/Kconfig | 85 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2412/Makefile | 12 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2416/Kconfig | 46 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2416/Makefile | 10 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/Kconfig | 165 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/Makefile | 26 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/common.h | 17 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2443/Kconfig | 32 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2443/Makefile | 20 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/Kconfig | 504 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/Makefile | 89 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/Makefile.boot (renamed from arch/arm/mach-s3c2410/Makefile.boot) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/bast-ide.c (renamed from arch/arm/mach-s3c2410/bast-ide.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/bast-irq.c (renamed from arch/arm/mach-s3c2410/bast-irq.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2412.c (renamed from arch/arm/mach-s3c2412/clock.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2416.c (renamed from arch/arm/mach-s3c2416/clock.c) | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2440.c (renamed from arch/arm/mach-s3c2440/clock.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c2443.c (renamed from arch/arm/mach-s3c2443/clock.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/clock-s3c244x.c (renamed from arch/arm/mach-s3c2440/s3c244x-clock.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/common-s3c2443.c (renamed from arch/arm/plat-s3c24xx/s3c2443-clock.c) | 18 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/common.h (renamed from arch/arm/mach-s3c2410/common.h) | 6 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2410.c (renamed from arch/arm/mach-s3c2410/dma.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2412.c (renamed from arch/arm/mach-s3c2412/dma.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2440.c (renamed from arch/arm/mach-s3c2440/dma.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/dma-s3c2443.c (renamed from arch/arm/mach-s3c2443/dma.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/h1940-bluetooth.c (renamed from arch/arm/mach-s3c2410/h1940-bluetooth.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/anubis-cpld.h (renamed from arch/arm/mach-s3c2410/include/mach/anubis-cpld.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/anubis-irq.h (renamed from arch/arm/mach-s3c2410/include/mach/anubis-irq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/anubis-map.h (renamed from arch/arm/mach-s3c2410/include/mach/anubis-map.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/bast-cpld.h (renamed from arch/arm/mach-s3c2410/include/mach/bast-cpld.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/bast-irq.h (renamed from arch/arm/mach-s3c2410/include/mach/bast-irq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/bast-map.h (renamed from arch/arm/mach-s3c2410/include/mach/bast-map.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/bast-pmu.h (renamed from arch/arm/mach-s3c2410/include/mach/bast-pmu.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/debug-macro.S (renamed from arch/arm/mach-s3c2410/include/mach/debug-macro.S) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/dma.h (renamed from arch/arm/mach-s3c2410/include/mach/dma.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/entry-macro.S (renamed from arch/arm/mach-s3c2410/include/mach/entry-macro.S) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/fb.h (renamed from arch/arm/mach-s3c2410/include/mach/fb.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/gpio-fns.h (renamed from arch/arm/mach-s3c2410/include/mach/gpio-fns.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/gpio-nrs.h (renamed from arch/arm/mach-s3c2410/include/mach/gpio-nrs.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/gpio-track.h (renamed from arch/arm/mach-s3c2410/include/mach/gpio-track.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/gpio.h (renamed from arch/arm/mach-s3c2410/include/mach/gpio.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/gta02.h (renamed from arch/arm/mach-s3c2440/include/mach/gta02.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/h1940-latch.h (renamed from arch/arm/mach-s3c2410/include/mach/h1940-latch.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/h1940.h (renamed from arch/arm/mach-s3c2410/include/mach/h1940.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/hardware.h (renamed from arch/arm/mach-s3c2410/include/mach/hardware.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/idle.h (renamed from arch/arm/mach-s3c2410/include/mach/idle.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/io.h (renamed from arch/arm/mach-s3c2410/include/mach/io.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/irqs.h (renamed from arch/arm/mach-s3c2410/include/mach/irqs.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/leds-gpio.h (renamed from arch/arm/mach-s3c2410/include/mach/leds-gpio.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/map.h (renamed from arch/arm/mach-s3c2410/include/mach/map.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/osiris-cpld.h (renamed from arch/arm/mach-s3c2410/include/mach/osiris-cpld.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/osiris-map.h (renamed from arch/arm/mach-s3c2410/include/mach/osiris-map.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/otom-map.h (renamed from arch/arm/mach-s3c2410/include/mach/otom-map.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/pm-core.h (renamed from arch/arm/mach-s3c2410/include/mach/pm-core.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-clock.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-clock.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-dsc.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-dsc.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-gpio.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-gpio.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-gpioj.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-gpioj.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-irq.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-irq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-lcd.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-lcd.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-mem.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-mem.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-power.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-power.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-s3c2412-mem.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-s3c2412-mem.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-s3c2412.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-s3c2412.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-s3c2416-mem.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-s3c2416-mem.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-s3c2416.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-s3c2416.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-s3c2443-clock.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/regs-sdi.h (renamed from arch/arm/mach-s3c2410/include/mach/regs-sdi.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/tick.h (renamed from arch/arm/mach-s3c2410/include/mach/tick.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/timex.h (renamed from arch/arm/mach-s3c2410/include/mach/timex.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/uncompress.h (renamed from arch/arm/mach-s3c2410/include/mach/uncompress.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/vr1000-cpld.h (renamed from arch/arm/mach-s3c2410/include/mach/vr1000-cpld.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/vr1000-irq.h (renamed from arch/arm/mach-s3c2410/include/mach/vr1000-irq.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/include/mach/vr1000-map.h (renamed from arch/arm/mach-s3c2410/include/mach/vr1000-map.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/irq-s3c2412.c (renamed from arch/arm/mach-s3c2412/irq.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/irq-s3c2416.c (renamed from arch/arm/mach-s3c2416/irq.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/irq-s3c2440.c (renamed from arch/arm/mach-s3c2440/irq.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/irq-s3c2443.c (renamed from arch/arm/mach-s3c2443/irq.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/irq-s3c244x.c (renamed from arch/arm/mach-s3c2440/s3c244x-irq.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-amlm5900.c (renamed from arch/arm/mach-s3c2410/mach-amlm5900.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-anubis.c (renamed from arch/arm/mach-s3c2440/mach-anubis.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-at2440evb.c (renamed from arch/arm/mach-s3c2440/mach-at2440evb.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-bast.c (renamed from arch/arm/mach-s3c2410/mach-bast.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-gta02.c (renamed from arch/arm/mach-s3c2440/mach-gta02.c) | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-h1940.c (renamed from arch/arm/mach-s3c2410/mach-h1940.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-jive.c (renamed from arch/arm/mach-s3c2412/mach-jive.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-mini2440.c (renamed from arch/arm/mach-s3c2440/mach-mini2440.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-n30.c (renamed from arch/arm/mach-s3c2410/mach-n30.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-nexcoder.c (renamed from arch/arm/mach-s3c2440/mach-nexcoder.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-osiris-dvs.c (renamed from arch/arm/mach-s3c2440/mach-osiris-dvs.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-osiris.c (renamed from arch/arm/mach-s3c2440/mach-osiris.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-otom.c (renamed from arch/arm/mach-s3c2410/mach-otom.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-qt2410.c (renamed from arch/arm/mach-s3c2410/mach-qt2410.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx1950.c (renamed from arch/arm/mach-s3c2440/mach-rx1950.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx3715.c (renamed from arch/arm/mach-s3c2440/mach-rx3715.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2410.c (renamed from arch/arm/mach-s3c2410/mach-smdk2410.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2413.c (renamed from arch/arm/mach-s3c2412/mach-smdk2413.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2416.c (renamed from arch/arm/mach-s3c2416/mach-smdk2416.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2440.c (renamed from arch/arm/mach-s3c2440/mach-smdk2440.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-smdk2443.c (renamed from arch/arm/mach-s3c2443/mach-smdk2443.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-tct_hammer.c (renamed from arch/arm/mach-s3c2410/mach-tct_hammer.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-vr1000.c (renamed from arch/arm/mach-s3c2410/mach-vr1000.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-vstms.c (renamed from arch/arm/mach-s3c2412/mach-vstms.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/nor-simtec.c (renamed from arch/arm/mach-s3c2410/nor-simtec.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/nor-simtec.h (renamed from arch/arm/mach-s3c2410/nor-simtec.h) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/pm-h1940.S (renamed from arch/arm/mach-s3c2410/pm-h1940.S) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/pm-s3c2410.c (renamed from arch/arm/mach-s3c2410/pm.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/pm-s3c2412.c (renamed from arch/arm/mach-s3c2412/pm.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/pm-s3c2416.c (renamed from arch/arm/mach-s3c2416/pm.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c2410.c (renamed from arch/arm/mach-s3c2410/s3c2410.c) | 0 | ||||
| -rw-r--r-- | arch/arm/mach-s3c24xx/s3c2412.c (renamed from arch/arm/mach-s3c2412/s3c2412.c) | 0 | ||||
| -rw-r--r-- |