Merge tag 'armsoc-tegra' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC support for Tegra platforms from Olof Johansson:
 "Here's a single-SoC topic branch that we've staged separately.  Mainly
  because it was hard to sort the branch contents in a way that fit our
  existing branches due to some refactorings.

  The code has been in -next for quite a while, but we staged it in
  arm-soc a bit late, which is why we've kept it separate from the other
  updates and are sending it separately here"

* tag 'armsoc-tegra' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  arm64: tegra: Add NVIDIA Jetson TX1 Developer Kit support
  arm64: tegra: Add NVIDIA P2597 I/O board support
  arm64: tegra: Add NVIDIA Jetson TX1 support
  arm64: tegra: Add NVIDIA P2571 board support
  arm64: tegra: Add NVIDIA P2371 board support
  arm64: tegra: Add NVIDIA P2595 I/O board support
  arm64: tegra: Add NVIDIA P2530 main board support
  arm64: tegra: Add Tegra210 support
  arm64: tegra: Add NVIDIA Tegra132 Norrin support
  arm64: tegra: Add Tegra132 support
  ARM: tegra: select USB_ULPI from EHCI rather than platform
  ARM: tegra: Ensure entire dcache is flushed on entering LP0/1
  amba: Hide TEGRA_AHB symbol
  soc/tegra: Add Tegra210 support
  soc/tegra: Provide per-SoC Kconfig symbols

diff --combined arch/arm64/Kconfig.platforms
index 2c400412b3bce47ef97b7f7eb74b0018d88e7dab,2c0411670f82d8d31a54ee9a68453dbc3262ccbb..21074f674bdeb707c137a9b87c2a65bde4bbb25a
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -9,7 -9,6 +9,7 @@@ config ARCH_BERLI
        bool "Marvell Berlin SoC Family"
        select ARCH_REQUIRE_GPIOLIB
        select DW_APB_ICTL
 +      select PINCTRL
        help
          This enables support for Marvell Berlin SoC Family
  
@@@ -44,7 -43,6 +44,7 @@@ config ARCH_MEDIATE
        bool "Mediatek MT65xx & MT81xx ARMv8 SoC"
        select ARM_GIC
        select PINCTRL
 +      select MTK_TIMER
        help
          Support for Mediatek MT65xx & MT81xx ARMv8 SoCs
  
@@@ -69,23 -67,6 +69,23 @@@ config ARCH_SEATTL
        help
          This enables support for AMD Seattle SOC Family
  
 +config ARCH_SHMOBILE
 +      bool
 +
 +config ARCH_RENESAS
 +      bool "Renesas SoC Platforms"
 +      select ARCH_SHMOBILE
 +      select PINCTRL
 +      select PM_GENERIC_DOMAINS if PM
 +      help
 +        This enables support for the ARMv8 based Renesas SoCs.
 +
 +config ARCH_R8A7795
 +      bool "Renesas R-Car H3 SoC Platform"
 +      depends on ARCH_RENESAS
 +      help
 +        This enables support for the Renesas R-Car H3 SoC.
 +
  config ARCH_STRATIX10
        bool "Altera's Stratix 10 SoCFPGA Family"
        help
@@@ -105,18 -86,6 +105,6 @@@ config ARCH_TEGR
        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_SPRD
        bool "Spreadtrum SoC platform"
        help
@@@ -127,12 -96,6 +115,12 @@@ config ARCH_THUNDE
        help
          This enables support for Cavium's Thunder Family of SoCs.
  
 +config ARCH_UNIPHIER
 +      bool "Socionext UniPhier SoC Family"
 +      select PINCTRL
 +      help
 +        This enables support for Socionext UniPhier SoC family.
 +
  config ARCH_VEXPRESS
        bool "ARMv8 software model (Versatile Express)"
        select ARCH_REQUIRE_GPIOLIB

diff --combined arch/arm64/boot/dts/Makefile
index 76e7510835b29322957d0d5b05654ce5fc6f4597,193617f4cd085b4d92460a845e8d9f8945722cee..f832b8a7453a307b351273a83e320e413e27ce4a
--- 1/arch/arm64/boot/dts/Makefile
--- 2/arch/arm64/boot/dts/Makefile
+++ b/arch/arm64/boot/dts/Makefile
@@@ -9,10 -9,9 +9,11 @@@ dts-dirs += freescal
  dts-dirs += hisilicon
  dts-dirs += marvell
  dts-dirs += mediatek
+ dts-dirs += nvidia
  dts-dirs += qcom
 +dts-dirs += renesas
  dts-dirs += rockchip
 +dts-dirs += socionext
  dts-dirs += sprd
  dts-dirs += xilinx
  

diff --combined drivers/soc/Kconfig
index fb2b3935b658f5bae0286b8153bafe7753ef6c8c,a8d72baf16ea8a91b9413a9c6148cdfca52e6cb7..88260205a2614c84e8293bf82ca47c49abb2e29d
--- 1/drivers/soc/Kconfig
--- 2/drivers/soc/Kconfig
+++ b/drivers/soc/Kconfig
@@@ -1,12 -1,11 +1,13 @@@
  menu "SOC (System On Chip) specific Drivers"
  
 +source "drivers/soc/bcm/Kconfig"
  source "drivers/soc/brcmstb/Kconfig"
 +source "drivers/soc/fsl/qe/Kconfig"
  source "drivers/soc/mediatek/Kconfig"
  source "drivers/soc/qcom/Kconfig"
  source "drivers/soc/rockchip/Kconfig"
  source "drivers/soc/sunxi/Kconfig"
+ source "drivers/soc/tegra/Kconfig"
  source "drivers/soc/ti/Kconfig"
  source "drivers/soc/versatile/Kconfig"
  

diff --combined drivers/usb/host/Kconfig
index daa563ff1fa05c9c28e2c8a03876c2310aaf0438,95e72d75e0a0aa0c8d9ad997f6876d0fc6af8174..1f117c360ebbba3394acd1b934e43632ac2b3531
--- 1/drivers/usb/host/Kconfig
--- 2/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@@ -41,15 -41,6 +41,15 @@@ config USB_XHCI_PLATFOR
  
          If unsure, say N.
  
 +config USB_XHCI_MTK
 +      tristate "xHCI support for Mediatek MT65xx"
 +      select MFD_SYSCON
 +      depends on ARCH_MEDIATEK || COMPILE_TEST
 +      ---help---
 +        Say 'Y' to enable the support for the xHCI host controller
 +        found in Mediatek MT65xx SoCs.
 +        If unsure, say N.
 +
  config USB_XHCI_MVEBU
        tristate "xHCI support for Marvell Armada 375/38x"
        select USB_XHCI_PLATFORM
@@@ -229,6 -220,8 +229,8 @@@ config USB_EHCI_TEGR
         depends on ARCH_TEGRA
         select USB_EHCI_ROOT_HUB_TT
         select USB_PHY
+       select USB_ULPI
+       select USB_ULPI_VIEWPORT
         help
           This driver enables support for the internal USB Host Controllers
           found in NVIDIA Tegra SoCs. The controllers are EHCI compliant.