From: Olof Johansson <olof@lixom.net>
Date: Tue, 22 Dec 2015 19:56:20 +0000 (-0800)
Subject: Merge tag 'tegra-for-4.5-defconfig' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e9dd4939ac50f102c0437f1aafe46fc795442140;p=linux-beck.git

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

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

e9dd4939ac50f102c0437f1aafe46fc795442140
diff --cc arch/arm64/configs/defconfig
index de593aa7905f,3852c51330e2..1ce7cef6651e
--- a/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