OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJbQ3kaAAoJEIfQlpxEBwcEPm8QAKHZGNkqwrx6rI/BkptUrOAh
 gQOqPkjKFkOSY4lUCLYHert6aL+tC0jC03DYFUj0uTHJIKxwXQMktOuj1fB32K16
 rp7IbZnhDNhFbiUSwetT7HHSM3xf0ca9j1R+ELwbmeku+HVAnr1J9398w1y0gKEy
 rMq799jyoLN+2EkgtqlAEPpsdziCCE083qmjkzfbIbvgL/YL0osfj32Ps67Zv/JI
 vGWRH3z0QMQBi6Owj19V4ZktCtQNzMacgSlTdekrEfCdSOfGuTBO56SL9Sepg94D
 NyY49STOLJJV9MgJCO66lU3CvGV/fGYxvE70NXUMkj1H3RTf88uBogalMFXDMkOk
 sw8viqv3txKhBetQq8TVX3wT1Zcdr9elgm4zoYntuiI00Sasrfy4d8Nky8cKzGqK
 Pf0MCZ+OX517Ct4E3v9OyoUUjCqvHGYF37Lrw3I+lUTKXo7czXAVCioJ19ZdPhOu
 59AYflZpmntGNKkbvLiVixXug0kw2XYNy2ozIAydoyV77OzqVwZY5hkV4Rdf61HU
 canONXNc5VWg00cvW/br/r5LFe0FZxaqFpvze27M0QBx+f+TjUjkzq8LWja0BH0V
 A6638xaKNxEjARVEoEFLJ+bY+NL8TfXqgwwmF9zUC78ikP+W3735dyQ6RyNIx3Ek
 sVGhvonjat2A2nliMGNh
 =C2uA
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-07-14 14:07:48 -07:00
parent 2d74fac5ac b0ba9fad81
commit 11d378ce5d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/configs/bcm2835_defconfig
View File

@ -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

1
arch/arm/configs/multi_v7_defconfig
View File

@ -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