From: Stephen Rothwell Date: Mon, 19 Sep 2011 03:34:24 +0000 (+1000) Subject: Merge remote-tracking branch 's5p/for-next' X-Git-Tag: next-20110919~98 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e0f3b65579937a13ee6f9a38e5d7eb9c6c5334f6;p=karo-tx-linux.git Merge remote-tracking branch 's5p/for-next' Conflicts: arch/arm/mach-exynos4/mach-smdkc210.c --- e0f3b65579937a13ee6f9a38e5d7eb9c6c5334f6 diff --cc arch/arm/mach-exynos4/mach-smdkv310.c index d90fcddbee1f,57cf63219e60..e479171a18c1 --- a/arch/arm/mach-exynos4/mach-smdkv310.c +++ b/arch/arm/mach-exynos4/mach-smdkv310.c @@@ -260,4 -339,14 +339,14 @@@ MACHINE_START(SMDKV310, "SMDKV310" .map_io = smdkv310_map_io, .init_machine = smdkv310_machine_init, .timer = &exynos4_timer, + .reserve = &smdkv310_reserve, + MACHINE_END + + MACHINE_START(SMDKC210, "SMDKC210") + /* Maintainer: Kukjin Kim */ - .boot_params = S5P_PA_SDRAM + 0x100, ++ .atag_offset = 0x100, + .init_irq = exynos4_init_irq, + .map_io = smdkv310_map_io, + .init_machine = smdkv310_machine_init, + .timer = &exynos4_timer, MACHINE_END diff --cc arch/arm/mach-s3c64xx/cpu.c index 8dc05763a7eb,6c498f9a18c5..c7047838e112 --- a/arch/arm/mach-s3c64xx/cpu.c +++ b/arch/arm/mach-s3c64xx/cpu.c @@@ -144,20 -143,11 +144,12 @@@ void __init s3c64xx_init_io(struct map_ /* initialise the io descriptors we need for initialisation */ iotable_init(s3c_iodesc, ARRAY_SIZE(s3c_iodesc)); iotable_init(mach_desc, size); + init_consistent_dma_size(SZ_8M); - idcode = __raw_readl(S3C_VA_SYS + 0x118); - if (!idcode) { - /* S3C6400 has the ID register in a different place, - * and needs a write before it can be read. */ - - __raw_writel(0x0, S3C_VA_SYS + 0xA1C); - idcode = __raw_readl(S3C_VA_SYS + 0xA1C); - } + /* detect cpu id */ + s3c64xx_init_cpu(); - s3c_init_cpu(idcode, cpu_ids, ARRAY_SIZE(cpu_ids)); + s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids)); } static __init int s3c64xx_sysdev_init(void)