diff options
author | andy.hu <andy.hu@starfivetech.com> | 2023-08-30 13:09:35 +0300 |
---|---|---|
committer | andy.hu <andy.hu@starfivetech.com> | 2023-08-30 13:09:35 +0300 |
commit | 2b56f2488ce2fc1a40cca9f9f78094eba0b24f97 (patch) | |
tree | 5111e3694a8f497c00e91d599a65d50bee41acc5 /arch | |
parent | 3155f26e98f182402a3ce9bf7434cf86e0bb6fc1 (diff) | |
parent | ed137a80cd88571d5d7169cae8379f7f763eedef (diff) | |
download | linux-2b56f2488ce2fc1a40cca9f9f78094eba0b24f97.tar.xz |
Merge branch 'CR_7278_wave5_v4l2_6.1.y_Som.Qin' into 'jh7110-6.1.y-devel'
CR 7278 media: porting wave5 deocder driver to kernel 6.1
See merge request sdk/linux!951
Diffstat (limited to 'arch')
-rw-r--r-- | arch/riscv/configs/starfive_jh7110_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/riscv/configs/starfive_jh7110_defconfig b/arch/riscv/configs/starfive_jh7110_defconfig index 23369a099323..a487f0dce723 100644 --- a/arch/riscv/configs/starfive_jh7110_defconfig +++ b/arch/riscv/configs/starfive_jh7110_defconfig @@ -204,6 +204,8 @@ CONFIG_VIN_SENSOR_OV4689=y CONFIG_VIN_SENSOR_IMX219=y CONFIG_VIDEO_STF_VIN=y CONFIG_VIDEO_IMX708=y +CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_WAVE_VPU=m CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_I2C_NXP_TDA9950=y CONFIG_DRM_RADEON=m |