From: Arnd Bergmann Date: Mon, 9 May 2022 21:01:00 +0000 (+0200) Subject: Merge tag 'ti-k3-config-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: for-5.19/block-exec-2022-06-02~32^2~5 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=9bc4df1d8b91d8677a547d4d21fde7405e46a39c;hp=553a4ee1c026f5c991937d0f9fec534087d9fdbd;p=linux-block.git Merge tag 'ti-k3-config-for-v5.19' of git://git./linux/kernel/git/ti/linux into arm/defconfig TI K3 defconfig updates for v5.19 * Enable TIDSS and Display Port related configs * Enable Cadence Torrent PHY for Display Port * tag 'ti-k3-config-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux: arm64: defconfig: Enable configs for DisplayPort on J721e Link: https://lore.kernel.org/r/88cd734e-47a7-4307-c119-8f6ec6c40452@ti.com Signed-off-by: Arnd Bergmann --- diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 390ca8452282..323d453b280d 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -739,6 +739,7 @@ CONFIG_DRM_THINE_THC63LVD1024=m CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7511_AUDIO=y +CONFIG_DRM_CDNS_MHDP8546=m CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_DW_HDMI_CEC=m CONFIG_DRM_IMX_DCSS=m @@ -753,6 +754,7 @@ CONFIG_DRM_MESON=m CONFIG_DRM_PL111=m CONFIG_DRM_LIMA=m CONFIG_DRM_PANFROST=m +CONFIG_DRM_TIDSS=m CONFIG_FB=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_EFI=y @@ -1162,6 +1164,7 @@ CONFIG_RESET_RZG2L_USBPHY_CTRL=y CONFIG_RESET_TI_SCI=y CONFIG_PHY_XGENE=y CONFIG_PHY_SUN4I_USB=y +CONFIG_PHY_CADENCE_TORRENT=m CONFIG_PHY_CADENCE_SIERRA=m CONFIG_PHY_MIXEL_MIPI_DPHY=m CONFIG_PHY_FSL_IMX8M_PCIE=y