From: Florian Fainelli <f.fainelli@gmail.com>
Date: Tue, 22 Nov 2016 05:22:55 +0000 (-0800)
Subject: Merge tag 'bcm2835-defconfig-64-next-2016-11-18' into defconfig-arm64/next
X-Git-Tag: rel_imx_4.19.35_1.1.0~13518^2~2^2
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=9efacfc80902c6ddf538a2f396e0112c1f6d1e23;p=linux.git

Merge tag 'bcm2835-defconfig-64-next-2016-11-18' into defconfig-arm64/next

This pull enables the BCM2837 (Pi 3) thermal driver in the defconfig.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---

9efacfc80902c6ddf538a2f396e0112c1f6d1e23
diff --cc arch/arm64/configs/defconfig
index c3fde6f16974,37b2f0ae9ccf..ed43f7198d1b
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -280,9 -271,9 +280,10 @@@ CONFIG_THERMAL=
  CONFIG_THERMAL_EMULATION=y
  CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
  CONFIG_CPU_THERMAL=y
+ CONFIG_BCM2835_THERMAL=y
  CONFIG_EXYNOS_THERMAL=y
  CONFIG_WATCHDOG=y
 +CONFIG_BCM2835_WDT=y
  CONFIG_RENESAS_WDT=y
  CONFIG_S3C2410_WATCHDOG=y
  CONFIG_MESON_GXBB_WATCHDOG=m