From da7bd436d614854e80604953ceb0ff630d7fbf52 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Sun, 31 May 2020 23:18:35 +0200 Subject: [PATCH] linux (RPi): config options for 5.4.42-a180c1c Switch to upstream thermal driver for RPi 4 Signed-off-by: Matthias Reichl --- projects/RPi/devices/RPi/linux/linux.arm.conf | 1 - projects/RPi/devices/RPi2/linux/linux.arm.conf | 2 +- projects/RPi/devices/RPi4/linux/linux.arm.conf | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/RPi/devices/RPi/linux/linux.arm.conf b/projects/RPi/devices/RPi/linux/linux.arm.conf index 4a335813c7..117343163b 100644 --- a/projects/RPi/devices/RPi/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi/linux/linux.arm.conf @@ -2410,7 +2410,6 @@ CONFIG_THERMAL_GOV_STEP_WISE=y # Broadcom thermal drivers # CONFIG_BCM2835_THERMAL=y -# CONFIG_BRCMSTB_THERMAL is not set # end of Broadcom thermal drivers CONFIG_WATCHDOG=y diff --git a/projects/RPi/devices/RPi2/linux/linux.arm.conf b/projects/RPi/devices/RPi2/linux/linux.arm.conf index 56a50dc388..c7099cd965 100644 --- a/projects/RPi/devices/RPi2/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf @@ -2538,8 +2538,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y # # Broadcom thermal drivers # +# CONFIG_BCM2711_THERMAL is not set CONFIG_BCM2835_THERMAL=y -# CONFIG_BRCMSTB_THERMAL is not set # end of Broadcom thermal drivers CONFIG_WATCHDOG=y diff --git a/projects/RPi/devices/RPi4/linux/linux.arm.conf b/projects/RPi/devices/RPi4/linux/linux.arm.conf index 9bc56e1a86..50383632ea 100644 --- a/projects/RPi/devices/RPi4/linux/linux.arm.conf +++ b/projects/RPi/devices/RPi4/linux/linux.arm.conf @@ -2964,8 +2964,8 @@ CONFIG_THERMAL_GOV_STEP_WISE=y # # Broadcom thermal drivers # +CONFIG_BCM2711_THERMAL=y CONFIG_BCM2835_THERMAL=y -CONFIG_BRCMSTB_THERMAL=y # end of Broadcom thermal drivers CONFIG_WATCHDOG=y