Skip to content

Commit 49d248f

Browse files
committed
Merge tag 'v6.15-rockchip-defconfig64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into soc/defconfig
Enabling of the HDMI-receiver driver and new UFS storage driver. * tag 'v6.15-rockchip-defconfig64-1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: defconfig: Enable Synopsys HDMI receiver arm64: defconfig: Enable Rockchip UFS host driver Link: https://lore.kernel.org/r/3415370.aeNJFYEL58@phil Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents da3c926 + 97d8fe4 commit 49d248f

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
@@ -859,6 +859,8 @@ CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
859859
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
860860
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
861861
CONFIG_VIDEO_SUN6I_CSI=m
862+
CONFIG_VIDEO_SYNOPSYS_HDMIRX=m
863+
CONFIG_VIDEO_SYNOPSYS_HDMIRX_LOAD_DEFAULT_EDID=y
862864
CONFIG_VIDEO_TI_J721E_CSI2RX=m
863865
CONFIG_VIDEO_HANTRO=m
864866
CONFIG_VIDEO_IMX219=m
@@ -1188,6 +1190,7 @@ CONFIG_SCSI_UFS_HISI=y
11881190
CONFIG_SCSI_UFS_RENESAS=m
11891191
CONFIG_SCSI_UFS_TI_J721E=m
11901192
CONFIG_SCSI_UFS_EXYNOS=y
1193+
CONFIG_SCSI_UFS_ROCKCHIP=y
11911194
CONFIG_NEW_LEDS=y
11921195
CONFIG_LEDS_CLASS=y
11931196
CONFIG_LEDS_CLASS_MULTICOLOR=m

0 commit comments

Comments
 (0)