From: Olof Johansson Date: Sat, 14 Jul 2018 21:08:17 +0000 (-0700) Subject: Merge tag 'arm-soc/for-4.19/defconfig-arm64' of https://github.com/Broadcom/stblinux... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9a90f4db4fe9e1a392dee0cbb61657f7843897ef;p=linux.git Merge tag 'arm-soc/for-4.19/defconfig-arm64' of https://github.com/Broadcom/stblinux into next/defconfig This pull request contains Broadcom ARM64-based SoCs defconfig changes for 4.19, please pull the following changes: - Stefan enables the Raspberry Pi voltage sensor driver (HWMON) in the arm64 defconfig file - Ray enables the ARM SP805 watchdog driver in the arm64 defconfig file * tag 'arm-soc/for-4.19/defconfig-arm64' of https://github.com/Broadcom/stblinux: arm64: defconfig: add CONFIG_ARM_SP805_WATCHDOG arm64: defconfig: Enable RPi voltage sensor Signed-off-by: Olof Johansson --- 9a90f4db4fe9e1a392dee0cbb61657f7843897ef diff --cc arch/arm64/configs/defconfig index f9a186f6af8a9,7a0182c7c74b8..37c72dbd53da1 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@@ -360,10 -372,13 +361,11 @@@ CONFIG_RCAR_GEN3_THERMAL= CONFIG_ARMADA_THERMAL=y CONFIG_BRCMSTB_THERMAL=m CONFIG_EXYNOS_THERMAL=y -CONFIG_RCAR_GEN3_THERMAL=y -CONFIG_QCOM_TSENS=y -CONFIG_ROCKCHIP_THERMAL=m CONFIG_TEGRA_BPMP_THERMAL=m +CONFIG_QCOM_TSENS=y CONFIG_UNIPHIER_THERMAL=y CONFIG_WATCHDOG=y + CONFIG_ARM_SP805_WATCHDOG=y CONFIG_S3C2410_WATCHDOG=y CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m