From: Arnd Bergmann Date: Mon, 20 Jul 2020 15:16:38 +0000 (+0200) Subject: Merge tag 'tegra-for-5.9-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: 5.9-rc-smb3-fixes-part2~74^2~5 X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=5aa988ae21e9ba3dd053339c49602d8bc97b171a;p=sfrench%2Fcifs-2.6.git Merge tag 'tegra-for-5.9-arm-defconfig' of git://git./linux/kernel/git/tegra/linux into arm/defconfig ARM: tegra: Default configuration changes for v5.9-rc1 Enables a few new configuration options that are useful on the new Nexus 7 and Acer A500 devices, as well as the userspace CPU frequency governor that's mainly used for testing. * tag 'tegra-for-5.9-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: ARM: tegra_defconfig: Enable options useful for Nexus 7 and Acer A500 ARM: tegra: Enable CPUFREQ userspace governor Link: https://lore.kernel.org/r/20200717161300.1661002-6-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann --- 5aa988ae21e9ba3dd053339c49602d8bc97b171a diff --cc arch/arm/configs/tegra_defconfig index 8688c715ccde,729069b6d34c..fff5fae0db30 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig @@@ -145,10 -164,15 +164,15 @@@ CONFIG_CHARGER_SMB347= CONFIG_CHARGER_TPS65090=y CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM95245=y + CONFIG_THERMAL=y + CONFIG_THERMAL_STATISTICS=y + CONFIG_CPU_THERMAL=y CONFIG_WATCHDOG=y + CONFIG_MAX77620_WATCHDOG=y CONFIG_TEGRA_WATCHDOG=y CONFIG_MFD_AS3722=y -CONFIG_MFD_CROS_EC=y +CONFIG_MFD_CROS_EC_DEV=y + CONFIG_MFD_MAX77620=y CONFIG_MFD_MAX8907=y CONFIG_MFD_STMPE=y CONFIG_MFD_PALMAS=y