Merge tag 'at91-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre...

Merge "Second batch of defconfig" from Nicolas Ferre:

- sama5_defconfig: update to support easy use of systemd userspace

* tag 'at91-defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/defconfig: sama5: add CONFIG_FHANDLE
  ARM: at91: sama5: Update defconfig
  ARM: multi_v7_defconfig: add the Atmel sama5d2-compatible ADC driver
  ARM: multi_v7_defconfig: add the Atmel Audio microphone interface PDMIC
  ARM: multi_v7_defconfig: add Atmel ISI (Image Sensor Interface) driver
  ARM: multi_v7_defconfig: add Atmel watchdog timers
  ARM: multi_v7_defconfig: add HLCDC drivers as modules
  ARM: at91/defconfig: add PDMIC driver to sama5_defconfig
  ARM: at91/defconfig: add HLCDC driver to sama5_defconfig
  ARM: at91/defconfig: add the HDMA controller to sama5_defconfig

diff --cc arch/arm/configs/multi_v7_defconfig
index cab2beaf25cc711d38526455877ce60a90527fb4,1aed38fd43379e0c410bc568f8a5d44ba9c68def..8f857564657f13482fe0277840b931d369f20eb6
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -540,10 -536,8 +544,11 @@@ CONFIG_DRM_EXYNOS_DSI=
  CONFIG_DRM_EXYNOS_FIMD=y
  CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_ROCKCHIP=m
 +CONFIG_ROCKCHIP_ANALOGIX_DP=m
  CONFIG_ROCKCHIP_DW_HDMI=m
 +CONFIG_ROCKCHIP_DW_MIPI_DSI=m
 +CONFIG_ROCKCHIP_INNO_HDMI=m
+ CONFIG_DRM_ATMEL_HLCDC=m
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_HDMI=y
  CONFIG_DRM_RCAR_LVDS=y
@@@ -575,7 -569,7 +580,8 @@@ CONFIG_SND_USB_AUDIO=
  CONFIG_SND_SOC=m
  CONFIG_SND_ATMEL_SOC=m
  CONFIG_SND_ATMEL_SOC_WM8904=m
+ CONFIG_SND_ATMEL_SOC_PDMIC=m
 +CONFIG_SND_BCM2835_SOC_I2S=m
  CONFIG_SND_SOC_FSL_SAI=m
  CONFIG_SND_SOC_ROCKCHIP=m
  CONFIG_SND_SOC_ROCKCHIP_SPDIF=m