diff options
author | Arnd Bergmann <arnd@arndb.de> | 2024-03-04 19:18:34 +0300 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2024-03-04 19:18:34 +0300 |
commit | 3251c2c2b1656081f1c6d888b039370c8b463df9 (patch) | |
tree | d53e3e214337feb8dc29af93d814a33482edb568 /arch/arm64/configs/defconfig | |
parent | a254ec05aeb933f3e04cd84188a8d035df1a3500 (diff) | |
parent | 02b645583e26f38261711f2a8b36c5db06862527 (diff) | |
download | linux-3251c2c2b1656081f1c6d888b039370c8b463df9.tar.xz |
Merge tag 'ti-k3-config-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux into soc/defconfig
TI K2/K3 defconfig updates for v6.9
- Enable Wave5 encoder/decoder driver present on multiple K3 SoCs
- Enable K2 boards via multi_v7_defconfig to move away from keystone
specific defconfig.
* tag 'ti-k3-config-for-v6.9' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux:
arm64: defconfig: Enable Wave5 Video Encoder/Decoder
ARM: multi_v7_defconfig: Add more TI Keystone support
Link: https://lore.kernel.org/r/a555943a-45d0-4e8e-ad25-682638cfcff7@ti.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/configs/defconfig')
-rw-r--r-- | arch/arm64/configs/defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 88bb85a53296..4ff823dc50c9 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -800,6 +800,7 @@ CONFIG_VIDEO_AMPHION_VPU=m CONFIG_VIDEO_CADENCE_CSI2RX=m CONFIG_VIDEO_MEDIATEK_JPEG=m CONFIG_VIDEO_MEDIATEK_VCODEC=m +CONFIG_VIDEO_WAVE_VPU=m CONFIG_VIDEO_IMX7_CSI=m CONFIG_VIDEO_IMX_MIPI_CSIS=m CONFIG_VIDEO_IMX8_ISI=m |