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

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 61a323a6b2cfe7348c63f49eadcd858100dc8a03..cb3582f460e711772e68af1fcf74131f755dfeb5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1288,6 +1288,12 @@ L:       linux-kernel@vger.kernel.org
 S:     Maintained
 F:     drivers/memory/*emif*
 
+ARM/LG1K ARCHITECTURE
+M:     Chanho Min <chanho.min@lge.com>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm64/boot/dts/lg/
+
 ARM/LOGICPD PXA270 MACHINE SUPPORT
 M:     Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 759a7e0c50abdaf5779687add560aea27f87a94f..970d22d050aeef5023fadbc1f2cb4ab7ae0317ed 100644 (file)
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -43,6 +43,11 @@ config ARCH_LAYERSCAPE
        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

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index da3df55bf02a9c47504e46f2794291343330da8b..a0c303a1d3cc6acac5a81d8e5b9565e552cee42d 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -36,8 +36,10 @@ CONFIG_ARCH_BCM_IPROC=y
 CONFIG_ARCH_BERLIN=y
 CONFIG_ARCH_EXYNOS=y
 CONFIG_ARCH_LAYERSCAPE=y
+CONFIG_ARCH_LG1K=y
 CONFIG_ARCH_HISI=y
 CONFIG_ARCH_MEDIATEK=y
+CONFIG_ARCH_MESON=y
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_ROCKCHIP=y
@@ -152,6 +154,8 @@ CONFIG_SERIAL_TEGRA=y
 CONFIG_SERIAL_SH_SCI=y
 CONFIG_SERIAL_SH_SCI_NR_UARTS=11
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
+CONFIG_SERIAL_MESON=y
+CONFIG_SERIAL_MESON_CONSOLE=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
@@ -251,6 +255,7 @@ CONFIG_RTC_DRV_PL031=y
 CONFIG_RTC_DRV_SUN6I=y
 CONFIG_RTC_DRV_XGENE=y
 CONFIG_DMADEVICES=y
+CONFIG_PL330_DMA=y
 CONFIG_TEGRA20_APB_DMA=y
 CONFIG_QCOM_BAM_DMA=y
 CONFIG_RCAR_DMAC=y