From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 4 May 2013 19:33:36 +0000 (-0700)
Subject: Merge tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v3.10-rc1~100
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=e3d98847ded1d183111ff7c4d1ef56b161c7f13e;p=~andy%2Flinux

Merge tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM platform specific firmware interfaces from Olof Johansson:
 "Two platforms, bcm and exynos have their own firmware interfaces using
  the "secure monitor call", this adds support for those.

  We had originally planned to have a third set of patches in here,
  which would extend support for the existing generic "psci" call that
  is used on multiple platforms as well as Xen and KVM guests, but that
  ended up getting dropped because the patches were not ready in time."

* tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: bcm: mark bcm_kona_smc_init as __init
  ARM: bcm281xx: Add DT support for SMC handler
  ARM: bcm281xx: Add L2 cache enable code
  ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up
  ARM: EXYNOS: Add IO mapping for non-secure SYSRAM.
  ARM: EXYNOS: Add support for Exynos secure firmware
  ARM: EXYNOS: Add support for secure monitor calls
  ARM: Add interface for registering and calling firmware-specific operations
---

e3d98847ded1d183111ff7c4d1ef56b161c7f13e
diff --cc arch/arm/mach-bcm/board_bcm.c
index 25959354047,28be74e8273..22e8421b1df
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@@ -20,8 -19,31 +20,27 @@@
  
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
+ #include <asm/hardware/cache-l2x0.h>
  
 -static void timer_init(void)
 -{
 -}
 -
  
+ #include "bcm_kona_smc.h"
+ 
+ static int __init kona_l2_cache_init(void)
+ {
+ 	if (!IS_ENABLED(CONFIG_CACHE_L2X0))
+ 		return 0;
+ 
+ 	bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0);
+ 
+ 	/*
+ 	 * The aux_val and aux_mask have no effect since L2 cache is already
+ 	 * enabled.  Pass 0s for aux_val and 1s for aux_mask for default value.
+ 	 */
+ 	l2x0_of_init(0, ~0);
+ 
+ 	return 0;
+ }
+ 
  static void __init board_init(void)
  {
  	of_platform_populate(NULL, of_default_bus_match_table, NULL,