Skip to content

Commit 025977d

Browse files
committed
Merge branch 'linux-5.15-trunk/at91/config' into linux-5.15-mchp
2 parents 6c7bb9a + 6b0fd5d commit 025977d

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

arch/arm/configs/sama7_defconfig

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,11 @@ CONFIG_GPIO_SYSFS=y
127127
CONFIG_POWER_RESET=y
128128
CONFIG_POWER_RESET_AT91_RESET=y
129129
CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y
130-
# CONFIG_HWMON is not set
130+
CONFIG_THERMAL=y
131+
CONFIG_THERMAL_STATISTICS=y
132+
CONFIG_CPU_THERMAL=y
133+
CONFIG_CPU_IDLE_THERMAL=y
134+
CONFIG_GENERIC_ADC_THERMAL=y
131135
CONFIG_WATCHDOG=y
132136
CONFIG_SAMA5D4_WATCHDOG=y
133137
CONFIG_MFD_ATMEL_FLEXCOM=y
@@ -207,6 +211,10 @@ CONFIG_PWM_ATMEL=y
207211
CONFIG_MCHP_EIC=y
208212
CONFIG_RESET_CONTROLLER=y
209213
CONFIG_PHY_MICROCHIP_SAMA7_USB=y
214+
CONFIG_POWERCAP=y
215+
CONFIG_IDLE_INJECT=y
216+
CONFIG_DTPM=y
217+
CONFIG_MICROCHIP_OTPC=y
210218
CONFIG_EXT2_FS=y
211219
CONFIG_EXT3_FS=y
212220
CONFIG_FANOTIFY=y

0 commit comments

Comments
 (0)