From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 26 Feb 2016 22:37:04 +0000 (+0100)
Subject: Merge tag 'arm-soc/for-4.6/soc-arm64' of http://github.com/Broadcom/stblinux into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ebb7c983b57fcfff93443f041693745177244423;p=linux-beck.git

Merge tag 'arm-soc/for-4.6/soc-arm64' of http://github.com/Broadcom/stblinux into next/arm64

Merge "Broadcom soc-arm64 changes for 4.6" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoC/platform changes:

- Anup, Ray and Dhanajay enable COMMON_CLK_IPROC, PINCTRL and GPIOLIB for iProc
  SoCs to get the corresponding iProc-based drivers to be available and work

- Zi adds support for Broadcom's Vulcan processor by adding a reference
  board Device Tree file along with a config ARCH_VULCAN symbol

- Jayachandran C. adds the Broadcom implementor ID and part ID for the Vulcan
  processors

* tag 'arm-soc/for-4.6/soc-arm64' of http://github.com/Broadcom/stblinux:
  arm64: cputype info for Broadcom Vulcan
  arm64: Broadcom Vulcan support
  arm64: Select COMMON_CLK_IPROC, PINCTRL and GPIOLIB for iProc SoCs
---

ebb7c983b57fcfff93443f041693745177244423
diff --cc arch/arm64/Kconfig.platforms
index 638dee72131b,c57b2cf516ac..923055f55575
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -1,14 -1,10 +1,17 @@@
  menu "Platform selection"
  
 +config ARCH_ALPINE
 +	bool "Annapurna Labs Alpine platform"
 +	select ALPINE_MSI
 +	help
 +	  This enables support for the Annapurna Labs Alpine
 +	  Soc family.
 +
  config ARCH_BCM_IPROC
  	bool "Broadcom iProc SoC Family"
+ 	select COMMON_CLK_IPROC
+ 	select PINCTRL
+ 	select ARCH_REQUIRE_GPIOLIB
  	help
  	  This enables support for Broadcom iProc based SoCs