diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-05-22 00:44:04 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-22 00:44:04 +0300 |
| commit | 016eae21a31735409438e55ee7b8adfb8371133e (patch) | |
| tree | 05b9f64dd4a8263e72ac9e3021c535aff81212af /arch/arm | |
| parent | 929379dd0fa00ab8a63d49e4e2a92a54f07d68ae (diff) | |
| parent | 35cdc3fa00ee3aebf1a25f55db8a114cbb612092 (diff) | |
| download | linux-016eae21a31735409438e55ee7b8adfb8371133e.tar.xz | |
Merge tag 'arm-soc/for-5.8/defconfig' of https://github.com/Broadcom/stblinux into arm/defconfig
This pull request contains Broadcom ARM-based SoCs defconfig file
updates for v5.8, please pull the following:
- Nicolas enables the fixed-regulator in bcm2835_defconfig which is need
to control the Raspberry Pi 4 SD car power supply
* tag 'arm-soc/for-5.8/defconfig' of https://github.com/Broadcom/stblinux:
ARM: bcm2835_defconfig: Enable fixed-regulator
Link: https://lore.kernel.org/r/20200511210522.28243-1-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/bcm2835_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/bcm2835_defconfig b/arch/arm/configs/bcm2835_defconfig index 8e7a3ed2a4df..44ff9cd88d81 100644 --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -103,6 +103,7 @@ CONFIG_WATCHDOG=y CONFIG_BCM2835_WDT=y CONFIG_MFD_SYSCON=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y |