diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-08-14 15:22:02 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-08-14 15:22:02 +0200 |
| commit | f50365a192c8a9cd1ba044b4a5c44c97472de3a6 (patch) | |
| tree | 7cb4d1d59c60747021340ed661f3d07d63c79621 /arch/arm/configs | |
| parent | 2e925d23150186962497f6b91f4a6ba6c7c42b16 (diff) | |
| parent | b5deabd439ed644c7e22e3217883550d86791851 (diff) | |
Merge tag 'stm32-defconfig-for-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into arm/defconfig
STM32 defconfig updates for v5.4, round 1
Highlights:
----------
-Enable FMC2 NAND (used for STM32MP socs)
-Enable STM32 booster regulator as module
-Enable STM32 QSPI as module
* tag 'stm32-defconfig-for-v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: multi_v7_defconfig: Enable SPI_STM32_QSPI support
ARM: multi_v7_defconfig: enable STM32 booster regulator
ARM: multi_v7_defconfig: add FMC2 NAND controller support
Link: https://lore.kernel.org/r/b164eaa8-4553-9c0f-0729-2ecc96fbae7a@st.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 78d1d93298af..c5d37dfafe98 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -197,6 +197,7 @@ CONFIG_MTD_NAND_GPMI_NAND=y CONFIG_MTD_NAND_BRCMNAND=y CONFIG_MTD_NAND_VF610_NFC=y CONFIG_MTD_NAND_DAVINCI=y +CONFIG_MTD_NAND_STM32_FMC2=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y CONFIG_BLK_DEV_LOOP=y @@ -570,6 +571,7 @@ CONFIG_REGULATOR_RK808=y CONFIG_REGULATOR_RN5T618=y CONFIG_REGULATOR_S2MPS11=y CONFIG_REGULATOR_S5M8767=y +CONFIG_REGULATOR_STM32_BOOSTER=m CONFIG_REGULATOR_STM32_VREFBUF=m CONFIG_REGULATOR_STPMIC1=y CONFIG_REGULATOR_TI_ABB=y |