diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 05:36:47 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 05:36:47 -0400 |
| commit | 17a8045ba32b48c69ff82336e556c344c05ed012 (patch) | |
| tree | bf5e7d180cdef2ad98a21e8ceaa37178cc7cf029 | |
| parent | 84d711caed82ef0cb323b27565b7a8bf54f6550d (diff) | |
| parent | a9e6753c1c92ae7d2c0c99b420c5c7dd5ebfc37d (diff) | |
Merge tag 'tegra-for-4.15-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
Pull "arm64: tegra: Default configuration updates for v4.15-rc1" from Thierry Reding:
This enables the PCI host controller on 64-bit ARM. It is supported and
enabled via device tree on Tegra210 and Tegra186.
* tag 'tegra-for-4.15-arm64-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
arm64: defconfig: Enable Tegra PCI controller
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 94b14ee48c6d..7824e8d71315 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig | |||
| @@ -74,6 +74,7 @@ CONFIG_PCIE_QCOM=y | |||
| 74 | CONFIG_PCIE_KIRIN=y | 74 | CONFIG_PCIE_KIRIN=y |
| 75 | CONFIG_PCIE_ARMADA_8K=y | 75 | CONFIG_PCIE_ARMADA_8K=y |
| 76 | CONFIG_PCI_AARDVARK=y | 76 | CONFIG_PCI_AARDVARK=y |
| 77 | CONFIG_PCI_TEGRA=y | ||
| 77 | CONFIG_PCIE_RCAR=y | 78 | CONFIG_PCIE_RCAR=y |
| 78 | CONFIG_PCIE_ROCKCHIP=m | 79 | CONFIG_PCIE_ROCKCHIP=m |
| 79 | CONFIG_PCI_HOST_GENERIC=y | 80 | CONFIG_PCI_HOST_GENERIC=y |