diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 17:22:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 17:22:53 +0100 |
| commit | a0705d3c042ad39fb9c5609612bb39ef4bedd284 (patch) | |
| tree | c2c916b70c80b3d74f0221c72412c9d0c6018c06 | |
| parent | bd7a70641e7680dfcd239ac54de8347d3a262d7c (diff) | |
| parent | 91d14ab8d913e798b3f68663ffc2e1f7dc8c4a8b (diff) | |
Merge tag 'at91-5.7-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/config
AT91 defconfig for 5.7
- Add sama5d4 watchdog to at91_dt_defconfig as it is present on sam9x60
* tag 'at91-5.7-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: configs: at91: enable sama5d4 compatible watchdog
Link: https://lore.kernel.org/r/20200322085711.GA208700@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/configs/at91_dt_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig index f66bb98a5cce..4a0ba2ae1a25 100644 --- a/arch/arm/configs/at91_dt_defconfig +++ b/arch/arm/configs/at91_dt_defconfig @@ -118,6 +118,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y CONFIG_AT91SAM9X_WATCHDOG=y +CONFIG_SAMA5D4_WATCHDOG=y CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_ATMEL_HLCDC=y CONFIG_REGULATOR=y |