Commit 11d378ce authored by Olof Johansson's avatar Olof Johansson

Merge tag 'arm-soc/for-4.19/defconfig' of https://github.com/Broadcom/stblinux into next/defconfig

This pull request contains Broadcom ARM-based SoCs defconfig updates
for 4.19, please pull the following:

- Stefan enables the Raspberry Pi voltage sensor driver (HWMON) in both
  multi_v7_defconfig and bcm2835_defconfig

* tag 'arm-soc/for-4.19/defconfig' of https://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Enable RPi voltage sensor
  ARM: bcm2835_defconfig: Enable RPi voltage sensor
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2d74fac5 b0ba9fad
......@@ -86,7 +86,7 @@ CONFIG_SPI=y
CONFIG_SPI_BCM2835=y
CONFIG_SPI_BCM2835AUX=y
CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_THERMAL=y
CONFIG_BCM2835_THERMAL=y
CONFIG_WATCHDOG=y
......
......@@ -447,6 +447,7 @@ CONFIG_SENSORS_LM90=y
CONFIG_SENSORS_LM95245=y
CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_PWM_FAN=m
CONFIG_SENSORS_RASPBERRYPI_HWMON=m
CONFIG_SENSORS_INA2XX=m
CONFIG_CPU_THERMAL=y
CONFIG_IMX_THERMAL=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment