Merge tag 'tegra-for-5.9-arm-defconfig' of git://git.kernel.org/pub/scm/linux/kernel...

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 <arnd@arndb.de>

diff --cc arch/arm/configs/tegra_defconfig
index 8688c715ccde11b44256d2bcbf8b90deaa4f2806,729069b6d34cd5afaa9c828595d5a451ad69349a..fff5fae0db30f97211a92e7e94056ae926f3136f
--- 1/arch/arm/configs/tegra_defconfig
--- 2/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