From: Olof Johansson <olof@lixom.net>
Date: Tue, 25 Jun 2019 12:19:55 +0000 (-0700)
Subject: Merge tag 'tegra-for-5.3-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1242de90ba0653c1356c817ebf3f5f974a58a0a2;p=linux.git

Merge tag 'tegra-for-5.3-arm64-defconfig' of git://git./linux/kernel/git/tegra/linux into arm/defconfig

arm64: tegra: Default configuration changes for v5.3-rc1

This enables the INA3221 power monitoring driver that is used on many of
the Jetson boards as well as Tegra194 PCIe support.

* tag 'tegra-for-5.3-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: defconfig: Add Tegra194 PCIe driver
  arm64: defconfig: Add HWMON INA3221 support

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

1242de90ba0653c1356c817ebf3f5f974a58a0a2
diff --cc arch/arm64/configs/defconfig
index 64b2f4e3a35ca,6a9dc67bbfac3..edaad930921cc
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -191,6 -191,8 +191,7 @@@ CONFIG_PCIE_QCOM=
  CONFIG_PCIE_ARMADA_8K=y
  CONFIG_PCIE_KIRIN=y
  CONFIG_PCIE_HISI_STB=y
+ CONFIG_PCIE_TEGRA194=m
 -CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
  CONFIG_DEVTMPFS=y
  CONFIG_DEVTMPFS_MOUNT=y
  CONFIG_HISILICON_LPC=y