Merge tag 'tegra-for-4.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel...

ARM: tegra: Default configuration updates for v4.5-rc1

This set of patches enable various drivers and features required by
64-bit Tegra SoCs (Tegra132 and Tegra210).

* tag 'tegra-for-4.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: defconfig: Enable printk timestamps
  arm64: defconfig: Enable squashfs support
  arm64: defconfig: Enable sdhci-tegra driver
  arm64: defconfig: Enable serial-tegra driver
  arm64: defconfig: Enable tegra-apbdma driver
  arm64: defconfig: Do not disable Tegra AHB driver
  arm64: defconfig: Enable Tegra210 support

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm64/configs/defconfig
index de593aa7905f89a18b568b0ad6a3375ef72d573d,3852c51330e294ccabb8a9b764218d8f52394527..1ce7cef6651e7f4270c348d39c0f61c74dc0f381
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -122,9 -116,7 +122,10 @@@ CONFIG_SERIAL_SAMSUNG=
  CONFIG_SERIAL_SAMSUNG_UARTS_4=y
  CONFIG_SERIAL_SAMSUNG_UARTS=4
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 +CONFIG_SERIAL_SH_SCI=y
 +CONFIG_SERIAL_SH_SCI_NR_UARTS=11
 +CONFIG_SERIAL_SH_SCI_CONSOLE=y
+ CONFIG_SERIAL_TEGRA=y
  CONFIG_SERIAL_MSM=y
  CONFIG_SERIAL_MSM_CONSOLE=y
  CONFIG_SERIAL_OF_PLATFORM=y
@@@ -186,8 -172,8 +188,9 @@@ CONFIG_RTC_CLASS=
  CONFIG_RTC_DRV_EFI=y
  CONFIG_RTC_DRV_XGENE=y
  CONFIG_DMADEVICES=y
 +CONFIG_RCAR_DMAC=y
  CONFIG_QCOM_BAM_DMA=y
+ CONFIG_TEGRA20_APB_DMA=y
  CONFIG_VIRTIO_PCI=y
  CONFIG_VIRTIO_BALLOON=y
  CONFIG_VIRTIO_MMIO=y