diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 23:52:40 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-21 23:52:41 +0200 |
commit | 88b1542b06ebaf4ba867d7e14277b0dbdc6e4647 (patch) | |
tree | 875291825219718fb71e37fb59f6d97182494e44 /arch/arm/configs | |
parent | 6e15f0a9c49896d8db4aa0b258efb255af14294e (diff) | |
parent | 6a2ab88ca789804cad89d558625147edd26a1d37 (diff) | |
download | linux-stable-88b1542b06ebaf4ba867d7e14277b0dbdc6e4647.tar.gz linux-stable-88b1542b06ebaf4ba867d7e14277b0dbdc6e4647.tar.bz2 linux-stable-88b1542b06ebaf4ba867d7e14277b0dbdc6e4647.zip |
Merge tag 'at91-5.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig for 5.8
- Add PIOBU and MCP16502 regulator to sama5 defconfig
* tag 'at91-5.8-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: configs: at91: sama5: enable MCP16502 regulator
ARM: configs: at91: sama5: enable SAMA5D2_PIOBU
Link: https://lore.kernel.org/r/20200518213254.GA26598@piout.net
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/sama5_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index bab7861443dc..8e1f78c19920 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -128,6 +128,7 @@ CONFIG_SPI=y CONFIG_SPI_ATMEL=y CONFIG_SPI_GPIO=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_SAMA5D2_PIOBU=m CONFIG_POWER_SUPPLY=y CONFIG_BATTERY_ACT8945A=y CONFIG_POWER_RESET=y @@ -142,6 +143,7 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ACT8865=y CONFIG_REGULATOR_ACT8945A=y +CONFIG_REGULATOR_MCP16502=m CONFIG_REGULATOR_PWM=m CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y |