From: Arnd Bergmann Date: Wed, 25 Mar 2020 14:57:39 +0000 (+0100) Subject: Merge tag 'renesas-arm64-defconfig-for-v5.7-tag1' of git://git.kernel.org/pub/scm... X-Git-Tag: v5.10.7~2898^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6825444ac367b450b93fbb5d275b94279f54b49d;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'renesas-arm64-defconfig-for-v5.7-tag1' of git://git./linux/kernel/git/geert/renesas-devel into arm/config 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 --- 6825444ac367b450b93fbb5d275b94279f54b49d diff --cc arch/arm64/configs/defconfig index 905109f,4905332..f824de2 --- a/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