linux-kernel-test/arch/arm/mach-s3c2410
Arnd Bergmann fdc24d4ba2 Merge branch 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux into next/dt
* 'vexpress-dt-v3.3-rc4' of git://git.linaro.org/people/pawelmoll/linux: (573 commits)
  ARM: vexpress: Add Device Tree for V2P-CA15 core tile (TC1 variant)
  ARM: vexpress: Add Device Tree for V2P-CA9 core tile
  ARM: vexpress: Add Device Tree for V2P-CA5s core tile
  ARM: vexpress: Motherboard RS1 memory map support
  ARM: vexpress: Add Device Tree support
  ARM: vexpress: Use FDT data in platform SMP calls
  ARM: versatile: Map local timers using Device Tree when possible
  ARM: vexpress: Get rid of MMIO_P2V

This adds full device tree boot support for the versatile express
platform, as has been awaited for a long time.

Conflicts:
	arch/arm/mach-vexpress/core.h

The definition of AMBA_DEVICE was removed in one branch, and the
definition of MMIO_P2V was removed in the other branch.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-02-24 12:39:18 +00:00
..
include/mach ARM: big removal of now unused arch_idle() 2012-01-20 19:25:58 -05:00
bast-ide.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
bast-irq.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
common.h ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
cpu-freq.c ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
dma.c ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
h1940-bluetooth.c treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
Kconfig ARM: SAMSUNG: Remove useless Samsung GPIO related CONFIGs 2011-09-21 15:07:05 +09:00
mach-amlm5900.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
mach-bast.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
mach-h1940.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
mach-n30.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
mach-otom.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
mach-qt2410.c Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core 2012-01-07 12:03:30 -08:00
mach-smdk2410.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
mach-tct_hammer.c ARM: 7265/1: restart: S3C24XX: use new restart hook 2012-01-05 12:57:18 +00:00
mach-vr1000.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
Makefile gpio/s3c24xx: move gpio driver into drivers/gpio/ 2011-09-21 10:52:22 +09:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
nor-simtec.c ARM: 6910/1: MTD: physmap: let set_vpp() pass a platform_device instead of a map_info 2011-05-20 22:27:34 +01:00
nor-simtec.h [ARM] S3C24XX: Add physmap device for all Simtec NOR equiped boards. 2008-07-03 16:51:28 +01:00
pll.c ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
pm-h1940.S [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
pm.c ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
s3c2410.c Device tree conversions for samsung and tegra 2012-01-09 14:28:38 -08:00
sleep.S [ARM] S3C24XX: Move files out of include/asm-arm/plat-s3c* 2008-10-07 22:26:09 +01:00
usb-simtec.c ARM: SAMSUNG: Add platform data registration for OHCI 2010-01-19 09:23:51 +09:00
usb-simtec.h [ARM] 4050/1: S3C24XX: remove old changelogs in arch/arm/mach-s3c2410 2006-12-17 23:38:02 +00:00