arm64: enable thermal / enable mmc (#2425)

(cherry picked from commit d6bbdf6b130ac9cb8fa6e4ecf02c5fdf50d7a25f
https://github.com/raspberrypi/linux raspi/rpi-4.15.y)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig
index e9d7a133e0fe026eaa5ab809a87b516dde9da8f6..43052ca2aa3564b1c649fab9d33028fcdc6d548c 100644 (file)
--- a/arch/arm64/configs/bcmrpi3_defconfig
+++ b/arch/arm64/configs/bcmrpi3_defconfig
@@ -642,7 +642,7 @@ CONFIG_SENSORS_SHT21=m
 CONFIG_SENSORS_SHTC1=m
 CONFIG_SENSORS_INA2XX=m
 CONFIG_THERMAL=y
-CONFIG_THERMAL_BCM2835=y
+CONFIG_BCM2835_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_BCM2835_WDT=y
 CONFIG_UCB1400_CORE=m
@@ -1287,3 +1287,5 @@ CONFIG_CRYPTO_USER_API_SKCIPHER=m
 CONFIG_ARM64_CRYPTO=y
 CONFIG_CRC_ITU_T=y
 CONFIG_LIBCRC32C=y
+CONFIG_MMC_BCM2835_MMC=y
+CONFIG_MMC_SDHCI_IPROC=m