17 files changed, 1720 insertions, 1 deletions

diff --git a/Documentation/devicetree/bindings/arm/mediatek.txt b/Documentation/devicetree/bindings/arm/mediatek.txt
index 3be40139cfbb..dd7550a29db6 100644
--- a/Documentation/devicetree/bindings/arm/mediatek.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek.txt
@@ -9,6 +9,7 @@ compatible: Must contain one of
    "mediatek,mt6592"
    "mediatek,mt8127"
    "mediatek,mt8135"
+   "mediatek,mt8173"
 
 
 Supported boards:
@@ -25,3 +26,6 @@ Supported boards:
 - MTK mt8135 tablet EVB:
     Required root node properties:
       - compatible = "mediatek,mt8135-evbp1", "mediatek,mt8135";
+- MTK mt8173 tablet EVB:
+    Required root node properties:
+      - compatible = "mediatek,mt8173-evb", "mediatek,mt8173";
diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
index 4cd6f7ba45c6..4f5a5352ccd8 100644
--- a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
+++ b/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt
@@ -5,6 +5,7 @@ interrupt.
 
 Required properties:
 - compatible: should be one of:
+        "mediatek,mt8173-sysirq"
         "mediatek,mt8135-sysirq"
         "mediatek,mt8127-sysirq"
         "mediatek,mt6592-sysirq"
diff --git a/Documentation/devicetree/bindings/arm/samsung/pmu.txt b/Documentation/devicetree/bindings/arm/samsung/pmu.txt
index 1e1979b229ff..67b211381f2b 100644
--- a/Documentation/devicetree/bindings/arm/samsung/pmu.txt
+++ b/Documentation/devicetree/bindings/arm/samsung/pmu.txt
@@ -10,6 +10,7 @@ Properties:
                    - "samsung,exynos5260-pmu" - for Exynos5260 SoC.
                    - "samsung,exynos5410-pmu" - for Exynos5410 SoC,
                    - "samsung,exynos5420-pmu" - for Exynos5420 SoC.
+                   - "samsung,exynos7-pmu" - for Exynos7 SoC.
                 second value must be always "syscon".
 
  - reg : offset and length of the register set.
diff --git a/Documentation/devicetree/bindings/serial/mtk-uart.txt b/Documentation/devicetree/bindings/serial/mtk-uart.txt
index 0eebbfea91a4..44152261e5c5 100644
--- a/Documentation/devicetree/bindings/serial/mtk-uart.txt
+++ b/Documentation/devicetree/bindings/serial/mtk-uart.txt
@@ -4,9 +4,11 @@ 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 --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 676454a65af8..1b8e97331ffb 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -149,11 +149,65 @@ 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_FSL_LS2085A
+        bool "Freescale LS2085A SOC"
+        help
+          This enables support for Freescale LS2085A SOC.
+
+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
           This enables support for AMD Seattle SOC Family
 
+config ARCH_TEGRA
+        bool "NVIDIA Tegra SoC Family"
+        select ARCH_HAS_RESET_CONTROLLER
+        select ARCH_REQUIRE_GPIOLIB
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
+        select CLKSRC_OF
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
+        select PINCTRL
+        select RESET_CONTROLLER
+        help
+          This enables support for the NVIDIA Tegra SoC family.
+
+config ARCH_TEGRA_132_SOC
+        bool "NVIDIA Tegra132 SoC"
+        depends on ARCH_TEGRA
+        select PINCTRL_TEGRA124
+        select USB_ULPI if USB_PHY
+        select USB_ULPI_VIEWPORT if USB_PHY
+        help
+          Enable support for NVIDIA Tegra132 SoC, based on the Denver
+          ARMv8 CPU.  The Tegra132 SoC is similar to the Tegra124 SoC,
+          but contains an NVIDIA Denver CPU complex in place of
+          Tegra124's "4+1" Cortex-A15 CPU complex.
+
 config ARCH_THUNDER
         bool "Cavium Inc. Thunder SoC Family"
         help
diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile
index c62b0f4d9ef6..e0350caf049e 100644
--- a/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@ -2,5 +2,8 @@ dts-dirs += amd
 dts-dirs += apm
 dts-dirs += arm
 dts-dirs += cavium
+dts-dirs += exynos
+dts-dirs += freescale
+dts-dirs += mediatek
 
 subdir-y        := $(dts-dirs)
diff --git a/arch/arm64/boot/dts/exynos/Makefile b/arch/arm64/boot/dts/exynos/Makefile
new file mode 100644
index 000000000000..20310e5b6d6f
--- /dev/null
+++ b/arch/arm64/boot/dts/exynos/Makefile
@@ -0,0 +1,5 @@
+dtb-$(CONFIG_ARCH_EXYNOS7) += exynos7-espresso.dtb
+
+always          := $(dtb-y)
+subdir-y        := $(dts-dirs)
+clean-files     := *.dtb
diff --git a/arch/arm64/boot/dts/exynos/exynos7-espresso.dts b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
new file mode 100644
index 000000000000..5424cc450f72
--- /dev/null
+++ b/arch/arm64/boot/dts/exynos/exynos7-espresso.dts
@@ -0,0 +1,84 @@
+/*
+ * SAMSUNG Exynos7 Espresso board device tree source
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+/dts-v1/;
+#include "exynos7.dtsi"
+
+/ {
+        model = "Samsung Exynos7 Espresso board based on EXYNOS7";
+        compatible = "samsung,exynos7-espresso", "samsung,exynos7";
+
+        aliases {
+                serial0 = &serial_2;
+                mshc0 = &mmc_0;
+                mshc2 = &mmc_2;
+        };