From: Olof Johansson <olof@lixom.net>
Date: Sat, 14 Jul 2018 21:38:11 +0000 (-0700)
Subject: Merge tag 'stm32-defconfig-for-v4.19-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=6783a9e0b41756d8d3db87b4a6e6711a6dbcd4b7;p=linux.git

Merge tag 'stm32-defconfig-for-v4.19-1' of git://git./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>
---

6783a9e0b41756d8d3db87b4a6e6711a6dbcd4b7
diff --cc arch/arm/configs/multi_v7_defconfig
index 5ddbe93e189de,b749d1ef0f9fb..4d781aa1a2077
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -561,10 -592,13 +561,11 @@@ CONFIG_MEDIA_CEC_SUPPORT=
  CONFIG_MEDIA_CONTROLLER=y
  CONFIG_VIDEO_V4L2_SUBDEV_API=y
  CONFIG_MEDIA_USB_SUPPORT=y
 -CONFIG_USB_VIDEO_CLASS=y
 -CONFIG_USB_GSPCA=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_RCAR_VIN=m
 -CONFIG_VIDEO_ATMEL_ISI=m
  CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
  CONFIG_VIDEO_S5P_FIMC=m
  CONFIG_VIDEO_S5P_MIPI_CSIS=m
@@@ -825,32 -868,38 +826,36 @@@ CONFIG_RTC_DRV_VT8500=
  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_DW_DMAC=y
  CONFIG_AT_HDMAC=y
  CONFIG_AT_XDMAC=y
 +CONFIG_DMA_BCM2835=y
 +CONFIG_DMA_SUN6I=y
  CONFIG_FSL_EDMA=y
 -CONFIG_MV_XOR=y
 -CONFIG_TEGRA20_APB_DMA=y
 -CONFIG_SH_DMAE=y
 -CONFIG_RCAR_DMAC=y
 -CONFIG_RENESAS_USB_DMAC=m
 -CONFIG_STE_DMA40=y
 -CONFIG_SIRF_DMA=y
 -CONFIG_TI_EDMA=y
 -CONFIG_PL330_DMA=y
 -CONFIG_IMX_SDMA=y
  CONFIG_IMX_DMA=y
 +CONFIG_IMX_SDMA=y
 +CONFIG_MV_XOR=y
  CONFIG_MXS_DMA=y
 -CONFIG_DMA_BCM2835=y
 -CONFIG_DMA_OMAP=y
 -CONFIG_QCOM_BAM_DMA=y
 -CONFIG_XILINX_DMA=y
 -CONFIG_DMA_SUN6I=y
 +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
 +CONFIG_DW_DMAC=y
 +CONFIG_SH_DMAE=y
 +CONFIG_RCAR_DMAC=y
 +CONFIG_RENESAS_USB_DMAC=m
 +CONFIG_VIRTIO_PCI=y
 +CONFIG_VIRTIO_MMIO=y
  CONFIG_STAGING=y
 -CONFIG_SENSORS_ISL29018=y
 -CONFIG_SENSORS_ISL29028=y
  CONFIG_MFD_NVEC=y
  CONFIG_KEYBOARD_NVEC=y
  CONFIG_SERIO_NVEC_PS2=y