From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 15 Dec 2015 23:02:54 +0000 (+0100)
Subject: Merge tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=22ba14f41ca6b7f96fe3d4a8eb116358060595fd;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge tag 'realview-base-armsoc-1-tag' of git://git./linux/kernel/git/linusw/linux-integrator into next/multiplatform

Merge "Realview multiplatform support" from Linus Walleij:

The board and infrastructure changes for RealView
multiplatform and extended DT support.

* tag 'realview-base-armsoc-1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: add an DT SMP boot method
  ARM: realview: select SP810 and ICST for the DT variant
  soc: versatile: add support for the PB11MPCore
  clk: versatile-icst: add device tree support
  clk: versatile-icst: refactor to allocate regmap separately
  clk: versatile-icst: convert to use regmap
  ARM: realview: remove private barrier implementation
  ARM: no longer force unbuffered DMA for realview
  clk/realview: stop using machine headers
  ARM: realview: don't map undefined PCI registers
  ARM: realview: remove sparsemem hack

Conflicts:
	drivers/clk/versatile/Kconfig
---

22ba14f41ca6b7f96fe3d4a8eb116358060595fd
diff --cc drivers/clk/versatile/Kconfig
index 369a2dc50f74,e733385bca9f..a6da2aa09f83
--- a/drivers/clk/versatile/Kconfig
+++ b/drivers/clk/versatile/Kconfig
@@@ -1,8 -1,7 +1,9 @@@
  config COMMON_CLK_VERSATILE
  	bool "Clock driver for ARM Reference designs"
 -	depends on ARCH_INTEGRATOR || ARCH_REALVIEW || ARCH_VEXPRESS || ARM64 || COMPILE_TEST
 +	depends on ARCH_INTEGRATOR || ARCH_REALVIEW || \
 +		ARCH_VERSATILE || ARCH_VEXPRESS || ARM64 || \
 +		COMPILE_TEST
+ 	select REGMAP_MMIO
  	---help---
            Supports clocking on ARM Reference designs:
  	  - Integrator/AP and Integrator/CP