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 --cc arch/arm64/Kconfig.platforms
Simple merge

diff --cc 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 --cc drivers/soc/Kconfig
Simple merge

diff --cc drivers/usb/host/Kconfig
Simple merge