diff options
| author | Olof Johansson <olof@lixom.net> | 2019-06-25 14:19:55 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-06-25 14:19:55 +0200 |
| commit | 1242de90ba0653c1356c817ebf3f5f974a58a0a2 (patch) | |
| tree | abc1014e5148b56e3403128e40b8b4249ee09077 /arch/arm64/configs | |
| parent | ARM: multi_v7_defconfig: enable STMFX pinctrl support (diff) | |
| parent | arm64: defconfig: Add Tegra194 PCIe driver (diff) | |
| download | linux-1242de90ba0653c1356c817ebf3f5f974a58a0a2.tar.xz linux-1242de90ba0653c1356c817ebf3f5f974a58a0a2.zip | |
Merge tag 'tegra-for-5.3-arm64-defconfig' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 64b2f4e3a35c..edaad930921c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -191,6 +191,7 @@ CONFIG_PCIE_QCOM=y CONFIG_PCIE_ARMADA_8K=y CONFIG_PCIE_KIRIN=y CONFIG_PCIE_HISI_STB=y +CONFIG_PCIE_TEGRA194=m CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y CONFIG_HISILICON_LPC=y @@ -419,6 +420,7 @@ CONFIG_SENSORS_LM90=m CONFIG_SENSORS_PWM_FAN=m CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_INA3221=m CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y |