Unverified Commit b0ba9fad authored by Florian Fainelli's avatar Florian Fainelli
Browse files

Merge tag 'bcm2835-defconfig-next-2018-07-03' into defconfig/next 



This pull request enables the new RPi HWMON driver in the 32-bit
defconfigs.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
parents ce397d21 7b54aaff

arch/arm/configs/bcm2835_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -478,6 +478,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_BCM2835_THERMAL=m

CRA Git | Maintained and supported by SUSTech CRA and CCSE