diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-14 14:08:17 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-14 14:08:17 -0700 |
| commit | 9a90f4db4fe9e1a392dee0cbb61657f7843897ef (patch) | |
| tree | c16dc8e0f40605bc1fc30dac6759a535d55a4a38 /arch/arm64/configs | |
| parent | 11d378ce5d744be5ef74a5663fdcff5da312e9fd (diff) | |
| parent | 163efb68d110d392b54e078ca041f24a4ea7d022 (diff) | |
| download | talos-obmc-linux-9a90f4db4fe9e1a392dee0cbb61657f7843897ef.tar.gz talos-obmc-linux-9a90f4db4fe9e1a392dee0cbb61657f7843897ef.zip | |
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 <olof@lixom.net>
Diffstat (limited to 'arch/arm64/configs')
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index f9a186f6af8a..37c72dbd53da 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -352,6 +352,7 @@ CONFIG_BATTERY_BQ27XXX=y CONFIG_SENSORS_ARM_SCPI=y CONFIG_SENSORS_LM90=m CONFIG_SENSORS_INA2XX=m +CONFIG_SENSORS_RASPBERRYPI_HWMON=m CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y @@ -364,6 +365,7 @@ 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 |
