projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f43c50 ac178e4)
Merge tag 'bcm2835-defconfig-64-next-2016-11-18' into defconfig-arm64/next
authorFlorian Fainelli <f.fainelli@gmail.com>
Tue, 22 Nov 2016 05:22:55 +0000 (21:22 -0800)
committerFlorian Fainelli <f.fainelli@gmail.com>
Tue, 22 Nov 2016 05:22:55 +0000 (21:22 -0800)
This pull enables the BCM2837 (Pi 3) thermal driver in the defconfig.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
1  2 
arch/arm64/configs/defconfig patch | diff1 | diff2 | blob | history

diff --cc arch/arm64/configs/defconfig
index c3fde6f,37b2f0a..ed43f71
--- 1/arch/arm64/configs/defconfig
--- 2/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
Domain: System / Kernel;