Merge tag 'renesas-arm64-defconfig-for-v5.7-tag1' of git://git.kernel.org/pub/scm...

Renesas ARM64 defconfig updates for v5.7

  - Restore R-Car M3-W support,
  - Enable additional support for Renesas platforms.

* tag 'renesas-arm64-defconfig-for-v5.7-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  arm64: defconfig: Enable additional support for Renesas platforms
  arm64: defconfig: Replace ARCH_R8A7796 by ARCH_R8A77960

Link: https://lore.kernel.org/r/20200226110221.19288-4-geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm64/configs/defconfig
index 905109f6814ff9e026c994d87dc65d6bf4370dac,49053323323fe68b0436a4f42c0fa27cebbb4ee7..f824de247f9d78aaaf9949eddd684c37c01a01b1
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -547,8 -557,8 +558,9 @@@ CONFIG_ROCKCHIP_DW_HDMI=
  CONFIG_ROCKCHIP_DW_MIPI_DSI=y
  CONFIG_ROCKCHIP_INNO_HDMI=y
  CONFIG_DRM_RCAR_DU=m
+ CONFIG_DRM_RCAR_DW_HDMI=m
  CONFIG_DRM_SUN4I=m
 +CONFIG_DRM_SUN6I_DSI=m
  CONFIG_DRM_SUN8I_DW_HDMI=m
  CONFIG_DRM_SUN8I_MIXER=m
  CONFIG_DRM_MSM=m