From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 26 Apr 2016 11:02:24 +0000 (+0200)
Subject: Merge tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi into... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f8aab65459e46f3300f66335b6d001389883597;p=linux-beck.git

Merge tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi into next/arm64

Merge "ARM64: Hi6220: configure updates for 4.7 based on rc3" from Wei Xu:

- Enable Hi655x PMIC and regulator
- Enable SPI_SPIDEV as module
- Enable several common USB-Ethernet dongles
- Enable configs for WLAN and TI WL1835 as modules
- Enable ARM SP804 for ARCH_HISI

* tag 'hi6220-config-for-4.7v3' of git://github.com/hisilicon/linux-hisi:
  arm64: Kconfig: select sp804 timer for ARCH_HISI
  arm64: defconfig: enable configs for WLAN and TI WL1835 as modules
  arm64: defconfig: enable several common USB network adapters
  arm64: defconfig: add CONFIG_SPI_SPIDEV as module
  arm64: defconfig: Enable the PMIC and regulator for Hi6220 and 96boards HiKey
---

8f8aab65459e46f3300f66335b6d001389883597
diff --cc arch/arm64/Kconfig.platforms
index be543c0b863d,759a7e0c50ab..970d22d050ae
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -43,13 -43,9 +43,14 @@@ config ARCH_LAYERSCAP
  	help
  	  This enables support for the Freescale Layerscape SoC family.
  
 +config ARCH_LG1K
 +	bool "LG Electronics LG1K SoC Family"
 +	help
 +	  This enables support for LG Electronics LG1K SoC Family
 +
  config ARCH_HISI
  	bool "Hisilicon SoC Family"
+ 	select ARM_TIMER_SP804
  	select HISILICON_IRQ_MBIGEN
  	help
  	  This enables support for Hisilicon ARMv8 SoC family