Skip to content

Commit 1a263d3

Browse files
committed
Merge tag 'v6.19-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/defconfig
Rockchip support for basic camera interface (CIF) and Synopsis DW-DP driver, as well as the CEC extension to the DW-HDMI-QP driver. * tag 'v6.19-rockchip-defconfig64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: defconfig: enable rockchip camera interface arm64: defconfig: Enable DW HDMI QP CEC support arm64: defconfig: Enable Rockchip extensions for Synopsys DW DP Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 922ef75 + 60705b0 commit 1a263d3

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

arch/arm64/configs/defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,7 @@ CONFIG_VIDEO_RENESAS_FCP=m
894894
CONFIG_VIDEO_RENESAS_FDP1=m
895895
CONFIG_VIDEO_RENESAS_VSP1=m
896896
CONFIG_VIDEO_RCAR_DRIF=m
897+
CONFIG_VIDEO_ROCKCHIP_CIF=m
897898
CONFIG_VIDEO_ROCKCHIP_RGA=m
898899
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
899900
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
@@ -924,6 +925,7 @@ CONFIG_DRM_ROCKCHIP=m
924925
CONFIG_ROCKCHIP_VOP2=y
925926
CONFIG_ROCKCHIP_ANALOGIX_DP=y
926927
CONFIG_ROCKCHIP_CDN_DP=y
928+
CONFIG_ROCKCHIP_DW_DP=y
927929
CONFIG_ROCKCHIP_DW_HDMI=y
928930
CONFIG_ROCKCHIP_DW_HDMI_QP=y
929931
CONFIG_ROCKCHIP_DW_MIPI_DSI=y
@@ -986,6 +988,7 @@ CONFIG_DRM_CDNS_MHDP8546=m
986988
CONFIG_DRM_IMX8MP_DW_HDMI_BRIDGE=m
987989
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
988990
CONFIG_DRM_DW_HDMI_CEC=m
991+
CONFIG_DRM_DW_HDMI_QP_CEC=y
989992
CONFIG_DRM_IMX_DCSS=m
990993
CONFIG_DRM_V3D=m
991994
CONFIG_DRM_VC4=m

0 commit comments

Comments
 (0)