diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-14 14:38:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-14 14:38:11 -0700 |
| commit | 6783a9e0b41756d8d3db87b4a6e6711a6dbcd4b7 (patch) | |
| tree | 630acfeb8d39abcb21814032adc56822cedfef2a /arch/arm/configs | |
| parent | e74f13313490a4c9f47ae1d99fb3a6681d252d24 (diff) | |
| parent | 1b8a8589a3e10997fa8f43e7da874c4903f33ac7 (diff) | |
Merge tag 'stm32-defconfig-for-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/defconfig
STM32 defconfig updates for v4.19, round 1
Highlights:
----------
In multi_v7_defconfig, add support of:
-STM32 RTC
-STM32 DMA, DMAMUX and MDMA
-STM32 DCMI media
* tag 'stm32-defconfig-for-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: multi_v7_defconfig: enable STM32 DCMI media support
ARM: multi_v7_defconfig: enable STM32 DMAv2, DMAMUX and MDMA
ARM: multi_v7_defconfig: enable STM32 RTC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 5ddbe93e189d..4d781aa1a207 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -563,6 +563,7 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_MEDIA_USB_SUPPORT=y CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_STM32_DCMI=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m @@ -826,6 +827,7 @@ CONFIG_RTC_DRV_SUNXI=y CONFIG_RTC_DRV_MV=y CONFIG_RTC_DRV_TEGRA=y CONFIG_RTC_DRV_ST_LPC=y +CONFIG_RTC_DRV_STM32=y CONFIG_RTC_DRV_CPCAP=m CONFIG_DMADEVICES=y CONFIG_AT_HDMAC=y @@ -841,6 +843,9 @@ CONFIG_PL330_DMA=y CONFIG_SIRF_DMA=y CONFIG_STE_DMA40=y CONFIG_ST_FDMA=m +CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y CONFIG_TEGRA20_APB_DMA=y CONFIG_XILINX_DMA=y CONFIG_QCOM_BAM_DMA=y |