From mboxrd@z Thu Jan  1 00:00:00 1970
From: olof@lixom.net (Olof Johansson)
Date: Wed, 21 May 2014 22:45:47 -0700
Subject: [GIT PULL 4/5] Samsung DT updates for 3.16
In-Reply-To: <014701cf73c8$752a65c0$5f7f3140$@samsung.com>
References: <014701cf73c8$752a65c0$5f7f3140$@samsung.com>
Message-ID: <20140522054547.GA4021@quad.lixom.net>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

On Tue, May 20, 2014 at 10:11:41AM +0900, Kukjin Kim wrote:

> Sachin Kamat (4):
>       ARM: EXYNOS: Map SYSRAM through generic DT bindings

This patch has a conflict with your own fixes. You should have based this
branch on top of the fixes to avoid it.

Not only that, but it seems to break 4212, which the other fix was meant to
take care of.

I think I've fixed it in my merge, please double check. You really have to
be more careful than this in the future.

My resolution is:

index aa01c4222b40,483dfcd69065..000000000000
--- a/arch/arm/mach-exynos/firmware.c
+++ b/arch/arm/mach-exynos/firmware.c
@@@ -18,8 -18,7 +18,9 @@@
  
  #include <mach/map.h>
  
 +#include <plat/cpu.h>
 +
+ #include "common.h"
  #include "smc.h"
  
  static int exynos_do_idle(void)
@@@ -44,10 -35,12 +45,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;
  


-Olof