From: Olof Johansson <olof@lixom.net>
Date: Wed, 28 Jan 2015 00:15:44 +0000 (-0800)
Subject: Merge tag 'v3.20-next-arm64' of https://github.com/mbgg/linux-mediatek into next... 
X-Git-Tag: v4.0-rc1~66^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f5b93c24a14880f211bd7f963c67d3d0accf977;p=platform%2Fkernel%2Flinux-exynos.git

Merge tag 'v3.20-next-arm64' of https://github.com/mbgg/linux-mediatek into next/arm64

Merge "ARM: mediatek: arm64 changes for v3.20" from Matthias Brugger:

Add support for mt8173 SoC from Mediatek.

- add DT bindings documentation
- add dts files for SoC and evaluation board
- add to Kconfig and defconfig

* tag 'v3.20-next-arm64' of https://github.com/mbgg/linux-mediatek:
  arm64: mediatek: Add MT8173 SoC Kconfig and defconfig
  arm64: dts: Add mediatek MT8173 SoC and evaluation board dts and Makefile
  Document: DT: Add bindings for mediatek MT8173 SoC Platform

Signed-off-by: Olof Johansson <olof@lixom.net>
---

2f5b93c24a14880f211bd7f963c67d3d0accf977
diff --cc arch/arm64/Kconfig
index 9c6b93c,e627ead..0d0c01c
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -148,23 -148,12 +148,29 @@@ source "kernel/Kconfig.freezer
  
  menu "Platform selection"
  
 +config ARCH_EXYNOS
 +	bool
 +	help
 +	  This enables support for Samsung Exynos SoC family
 +
 +config ARCH_EXYNOS7
 +	bool "ARMv8 based Samsung Exynos7"
 +	select ARCH_EXYNOS
 +	select COMMON_CLK_SAMSUNG
 +	select HAVE_S3C2410_WATCHDOG if WATCHDOG
 +	select HAVE_S3C_RTC if RTC_CLASS
 +	select PINCTRL
 +	select PINCTRL_EXYNOS
 +
 +	help
 +	  This enables support for Samsung Exynos7 SoC family
 +
+ config ARCH_MEDIATEK
+ 	bool "Mediatek MT65xx & MT81xx ARMv8 SoC"
+ 	select ARM_GIC
+ 	help
+ 	  Support for Mediatek MT65xx & MT81xx ARMv8 SoCs
+ 
  config ARCH_SEATTLE
  	bool "AMD Seattle SoC Family"
  	help
diff --cc arch/arm64/boot/dts/Makefile
index 68633e2,89124e4..538c0c6
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -2,8 -2,7 +2,9 @@@ dts-dirs += am
  dts-dirs += apm
  dts-dirs += arm
  dts-dirs += cavium
 +dts-dirs += exynos
 +dts-dirs += freescale
+ dts-dirs += mediatek
  
  always		:= $(dtb-y)
  subdir-y	:= $(dts-dirs)
diff --cc arch/arm64/configs/defconfig
index 24c2334,ed84d21..d6a53e8
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -31,7 -32,7 +31,8 @@@ CONFIG_MODULES=
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_IOSCHED_DEADLINE is not set
 +CONFIG_ARCH_FSL_LS2085A=y
+ CONFIG_ARCH_MEDIATEK=y
  CONFIG_ARCH_THUNDER=y
  CONFIG_ARCH_VEXPRESS=y
  CONFIG_ARCH_XGENE=y