From: Kukjin Kim <kgene.kim@samsung.com>
Date: Wed, 14 May 2014 20:57:39 +0000 (+0900)
Subject: Merge branch 'v3.16-next/dt-samsung' into for-next
X-Git-Tag: next-20140516~104^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=50cbcd44564def07914be44a2d9d7e4c4a1478f0;p=karo-tx-linux.git

Merge branch 'v3.16-next/dt-samsung' into for-next

Conflicts:
	arch/arm/mach-exynos/firmware.c
---

50cbcd44564def07914be44a2d9d7e4c4a1478f0
diff --cc arch/arm/mach-exynos/firmware.c
index aa01c4222b40,483dfcd69065..739bdc88b651
--- a/arch/arm/mach-exynos/firmware.c
+++ b/arch/arm/mach-exynos/firmware.c
@@@ -44,10 -35,12 +43,15 @@@ static int exynos_cpu_boot(int cpu
  
  static int exynos_set_cpu_boot_addr(int cpu, unsigned long boot_addr)
  {
- 	void __iomem *boot_reg = S5P_VA_SYSRAM_NS + 0x1c;
+ 	void __iomem *boot_reg;
+ 
+ 	if (!sysram_ns_base_addr)
+ 		return -ENODEV;
+ 
 -	boot_reg = sysram_ns_base_addr + 0x1c + 4*cpu;
++	boot_reg = sysram_ns_base_addr + 0x1c;
 +
 +	if (!soc_is_exynos4212())
 +		boot_reg += 4*cpu;
  
  	__raw_writel(boot_addr, boot_reg);
  	return 0;