From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 18 Dec 2015 15:42:47 +0000 (+0100)
Subject: Merge tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=86fff036fe95600dab337f37577b77742b89833c;p=linux-beck.git

Merge tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/multiplatform

Pull "Multiplatform support for the RealView" from Linus Walleij:

Here is the result of my application of the second part of Arnds
patchset, actually enabling multiplatform and getting the RealView
off the ground as a multiplatform target.

It is dependent on an outstanding patch to the irqchips tree bumping
the number of GICs to 2 for the RealView platform. I cannot say I will
be sleepless if these go in side by side: each branch will compile but
will not boot until both trees have been pulled hurting bisectability a
bit.

- Tested on the ARM PB11MPCore
- Tested with boardfile boot
- Tested with DeviceTree boot

* tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
  ARM: realview: select apropriate targets
  ARM: realview: clean up header files
  ARM: realview: make all header files local
  ARM: no longer make CPU targets visible separately
  ARM: integrator: use explicit core module options
  ARM: realview: enable multiplatform
---

86fff036fe95600dab337f37577b77742b89833c
diff --cc arch/arm/Kconfig
index a0fda44551ec,242dc4048059..b934d19a154c
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -345,21 -343,24 +345,7 @@@ config ARM_SINGLE_ARMV7
  	select SPARSE_IRQ
  	select USE_OF
  
- config ARCH_REALVIEW
- 	bool "ARM Ltd. RealView family"
- 	select ARCH_WANT_OPTIONAL_GPIOLIB
- 	select ARM_AMBA
- 	select ARM_TIMER_SP804
- 	select COMMON_CLK
- 	select COMMON_CLK_VERSATILE
- 	select GENERIC_CLOCKEVENTS
- 	select GPIO_PL061 if GPIOLIB
- 	select ICST
- 	select PLAT_VERSATILE
- 	select PLAT_VERSATILE_SCHED_CLOCK
- 	help
- 	  This enables support for ARM Ltd RealView boards.
  
 -config ARCH_VERSATILE
 -	bool "ARM Ltd. Versatile family"
 -	select ARCH_WANT_OPTIONAL_GPIOLIB
 -	select ARM_AMBA
 -	select ARM_TIMER_SP804
 -	select ARM_VIC
 -	select CLKDEV_LOOKUP
 -	select GENERIC_CLOCKEVENTS
 -	select HAVE_MACH_CLKDEV
 -	select ICST
 -	select PLAT_VERSATILE
 -	select PLAT_VERSATILE_CLOCK
 -	select PLAT_VERSATILE_SCHED_CLOCK
 -	select VERSATILE_FPGA_IRQ
 -	help
 -	  This enables support for ARM Ltd Versatile board.
 -
  config ARCH_CLPS711X
  	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
  	select ARCH_REQUIRE_GPIOLIB