Merge tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

Pull ARM SoC 64-bit changes and additions from Olof Johansson:
 "The 64-bit set of updates this release cycle adds support for three
  new platforms:

   - Samsunc Exynos 7
   - Freescale LS2085a
   - Mediatek MT8173

  For all these, the changes mostly consititude additions of DT
  contents, but also some Kconfig entries to allow dependency/selection
  of drivers per-platform, etc"

* tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: Kconfig: clean up two no-op Kconfig options from CONFIG_ARCH_TEGRA*
  arm64: Fix sort of platform Kconfig entries
  arm64: Add support for FSL's LS2085A SoC in Kconfig and defconfig
  arm64: Add DTS support for FSL's LS2085A SoC
  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
  arm64: Add Tegra132 support
  arm64: Enable ARMv8 based exynos7 SoC support
  arm64: dts: Add nodes for mmc, i2c, rtc, watchdog, adc on exynos7
  arm64: dts: Add PMU DT node for exynos7 SoC
  arm64: dts: Add initial pinctrl support to exynos7
  arm64: dts: Add initial device tree support for exynos7

diff --cc Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
index 4cd6f7ba45c67a828b2789053b5fb103f43ad98e,8794f8d14db5e115aac9e453acd4a2c30acd00c7..4f5a5352ccd893a162b932040577a74cb226881b
--- 1/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
--- 2/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
@@@ -5,9 -5,9 +5,10 @@@ interrupt
  
  Required properties:
  - compatible: should be one of:
+       "mediatek,mt8173-sysirq"
        "mediatek,mt8135-sysirq"
        "mediatek,mt8127-sysirq"
 +      "mediatek,mt6592-sysirq"
        "mediatek,mt6589-sysirq"
        "mediatek,mt6582-sysirq"
        "mediatek,mt6577-sysirq"

diff --cc Documentation/devicetree/bindings/serial/mtk-uart.txt
index 0eebbfea91a483e3738a9b3774d9511758ac7300,0e41b6ef2950bf626e67ca34a9f18684ba8f407d..44152261e5c5abf3484e7fba073795003dc5ed31
--- 1/Documentation/devicetree/bindings/serial/mtk-uart.txt
--- 2/Documentation/devicetree/bindings/serial/mtk-uart.txt
+++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt
@@@ -2,11 -2,11 +2,13 @@@
  
  Required properties:
  - compatible should contain:
 +  * "mediatek,mt8135-uart" for MT8135 compatible UARTS
 +  * "mediatek,mt8127-uart" for MT8127 compatible UARTS
+   * "mediatek,mt8173-uart" for MT8173 compatible UARTS
    * "mediatek,mt6589-uart" for MT6589 compatible UARTS
    * "mediatek,mt6582-uart" for MT6582 compatible UARTS
-   * "mediatek,mt6577-uart" for all compatible UARTS (MT6589, MT6582, MT6577)
+   * "mediatek,mt6577-uart" for all compatible UARTS (MT8173, MT6589, MT6582, 
+       MT6577)
  
  - reg: The base address of the UART register bank.
  

diff --cc arch/arm64/Kconfig
Simple merge

diff --cc arch/arm64/boot/dts/Makefile
index c62b0f4d9ef65bf4dfa8503d581c159e5fe9b16b,538c0c6bedf49e03fd8f14868f5aea0d2710e008..e0350caf049e72f25db374e90b198223e74fd544
--- 1/arch/arm64/boot/dts/Makefile
--- 2/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -2,5 -2,10 +2,8 @@@ 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)
 -clean-files   := *.dtb

diff --cc arch/arm64/configs/defconfig
Simple merge