Skip to content

Commit 4b4dcb7

Browse files
committed
Merge branch 'at91-5.4-trunk/defconfig' into linux-5.4-at91
2 parents 7646053 + 23c1827 commit 4b4dcb7

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ CONFIG_GPIO_SYSFS=y
138138
CONFIG_GPIO_PCA953X=m
139139
CONFIG_POWER_RESET=y
140140
CONFIG_POWER_SUPPLY=y
141-
# CONFIG_HWMON is not set
141+
CONFIG_HWMON=m
142+
CONFIG_SENSORS_LM75=m
142143
CONFIG_WATCHDOG=y
143144
CONFIG_AT91SAM9X_WATCHDOG=y
144145
CONFIG_SAMA5D4_WATCHDOG=y
@@ -215,6 +216,7 @@ CONFIG_AT_HDMAC=y
215216
CONFIG_AT_XDMAC=y
216217
CONFIG_STAGING=y
217218
CONFIG_WILC_SDIO=m
219+
CONFIG_WILC_SPI=m
218220
CONFIG_MICROCHIP_PIT64B=y
219221
# CONFIG_IOMMU_SUPPORT is not set
220222
CONFIG_IIO=y

arch/arm/configs/sama5_defconfig

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ CONFIG_GPIO_PCA953X=m
177177
CONFIG_POWER_RESET=y
178178
CONFIG_POWER_SUPPLY=y
179179
CONFIG_BATTERY_ACT8945A=y
180-
# CONFIG_HWMON is not set
180+
CONFIG_HWMON=m
181+
CONFIG_SENSORS_LM75=m
181182
CONFIG_WATCHDOG=y
182183
CONFIG_AT91SAM9X_WATCHDOG=y
183184
CONFIG_SAMA5D4_WATCHDOG=y
@@ -263,6 +264,7 @@ CONFIG_AT_HDMAC=y
263264
CONFIG_AT_XDMAC=y
264265
CONFIG_STAGING=y
265266
CONFIG_WILC_SDIO=m
267+
CONFIG_WILC_SPI=m
266268
# CONFIG_IOMMU_SUPPORT is not set
267269
CONFIG_IIO=y
268270
CONFIG_AT91_ADC=y

0 commit comments

Comments
 (0)