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

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>

diff --cc arch/arm64/Kconfig
index 9c6b93c865227fce3d11847e181ad549d3acbb17,e627eadd357b3d298276247fee6c8e8faa6566d4..0d0c01c35dc3484561614561ae00da53ad3a87fe
--- 1/arch/arm64/Kconfig
--- 2/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 68633e24e544498ebcb32190a494055803f18fe2,89124e4d5c4ce97d0a6f67e6ec40303a018bde6d..538c0c6bedf49e03fd8f14868f5aea0d2710e008
--- 1/arch/arm64/boot/dts/Makefile
--- 2/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 24c23341a181eae86b41ebd681c994e79431c396,ed84d2155827316ba780c8c6dad0689b7c7d707a..d6a53e8fa8db9b49a3f945f7eb0f449664187420
--- 1/arch/arm64/configs/defconfig
--- 2/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