Merge tag 'imx-defconfig-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawn...

i.MX defconfig update for 5.10:

- Enable i.MX6SLL, i.MX7ULP SoC and CAAM crypto driver support in
  multi_v7_defconfig.
- Enable the eLCDIF and Raydium RM67191 driver in arm64 defconfig to
  support MIPI DSI on imx8mq-evk.
- Enable NWL DSI host controller, dphy and SITRONIX ST7703 panel driver
  in arm64 defconfig to support display on imx8mq-librem5-devkit.
- Enable sl28cpld board management controller driver support in arm64
  defconfig.
- Enable i.MX8M SoCs support in imx_v6_v7_defconfig as they can run in
  AArch32 mode.

* tag 'imx-defconfig-5.10' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: enable the sl28cpld board management controller
  arm64: defconfig: Enable the eLCDIF and Raydium RM67191 drivers
  arm64: defconfig: Enable imx8mq-librem5-devkit display stack
  arm64: defconfig: re-sync DRM related defconfig bits
  ARM: imx_v6_v7_defconfig: Support i.MX8MN/P/Q
  ARM: multi_v7_defconfig: Enable i.MX7ULP SoC
  ARM: multi_v7_defconfig: Enable i.MX6SLL SoC
  ARM: multi_v7_defconfig: enable caam crypto module

Link: https://lore.kernel.org/r/20200923073009.23678-6-shawnguo@kernel.org
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc arch/arm64/configs/defconfig
Simple merge