Skip to content

Commit de6dff2

Browse files
committed
Merge tag 'at91-defconfig-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/defconfig
Microchip AT91 defconfig updates for v6.13 It contains: - enable PAC1934 power monitor driver for the Microchip AT91 defconfigs * tag 'at91-defconfig-6.13' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: configs: at91: enable PAC1934 driver as module Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 3fba547 + 0789190 commit de6dff2

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

arch/arm/configs/at91_dt_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ CONFIG_AT_XDMAC=y
201201
CONFIG_IIO=y
202202
CONFIG_AT91_ADC=y
203203
CONFIG_AT91_SAMA5D2_ADC=y
204+
CONFIG_PAC1934=m
204205
CONFIG_PWM=y
205206
CONFIG_PWM_ATMEL=y
206207
CONFIG_PWM_ATMEL_HLCDC_PWM=y

arch/arm/configs/sama5_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,7 @@ CONFIG_VIDEO_HANTRO=m
212212
CONFIG_IIO=y
213213
CONFIG_AT91_ADC=y
214214
CONFIG_AT91_SAMA5D2_ADC=y
215+
CONFIG_PAC1934=m
215216
CONFIG_ENVELOPE_DETECTOR=m
216217
CONFIG_DPOT_DAC=m
217218
CONFIG_MCP4531=m

arch/arm/configs/sama7_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ CONFIG_STAGING=y
193193
CONFIG_IIO=y
194194
CONFIG_IIO_SW_TRIGGER=y
195195
CONFIG_AT91_SAMA5D2_ADC=y
196+
CONFIG_PAC1934=m
196197
CONFIG_PWM=y
197198
CONFIG_PWM_ATMEL=y
198199
CONFIG_MCHP_EIC=y

0 commit comments

Comments
 (0)