From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 17 Feb 2015 17:47:46 +0000 (-0800)
Subject: Merge tag '64bit-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: v4.0-rc1~66
X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=cc4f9c2a91b7be7b3590bb1cbe8148873556aa3f

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

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
---

cc4f9c2a91b7be7b3590bb1cbe8148873556aa3f
diff --cc Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
index 4cd6f7ba45c6,8794f8d14db5..4f5a5352ccd8
--- a/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 0eebbfea91a4,0e41b6ef2950..44152261e5c5
--- a/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/boot/dts/Makefile
index c62b0f4d9ef6,538c0c6bedf4..e0350caf049e
--- a/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