tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

staging: media: tegra-video: expand VI and VIP support to Tegra30

Existing VI and VIP implementation for Tegra20 is fully compatible with
Tegra30.

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com> # Tegra20 VIP
Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

authored by

Svyatoslav Ryhel and committed by
Hans Verkuil 410ff945 a93a51f4

+6 -5
+1
drivers/staging/media/tegra-video/Makefile
··· 6 6 csi.o 7 7 8 8 tegra-video-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20.o 9 + tegra-video-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra20.o 9 10 tegra-video-$(CONFIG_ARCH_TEGRA_210_SOC) += tegra210.o 10 11 obj-$(CONFIG_VIDEO_TEGRA) += tegra-video.o
+1 -1
drivers/staging/media/tegra-video/vi.c
··· 1959 1959 } 1960 1960 1961 1961 static const struct of_device_id tegra_vi_of_id_table[] = { 1962 - #if defined(CONFIG_ARCH_TEGRA_2x_SOC) 1962 + #if defined(CONFIG_ARCH_TEGRA_2x_SOC) || defined(CONFIG_ARCH_TEGRA_3x_SOC) 1963 1963 { .compatible = "nvidia,tegra20-vi", .data = &tegra20_vi_soc }, 1964 1964 #endif 1965 1965 #if defined(CONFIG_ARCH_TEGRA_210_SOC)
+1 -1
drivers/staging/media/tegra-video/vi.h
··· 296 296 u32 fourcc; 297 297 }; 298 298 299 - #if defined(CONFIG_ARCH_TEGRA_2x_SOC) 299 + #if defined(CONFIG_ARCH_TEGRA_2x_SOC) || defined(CONFIG_ARCH_TEGRA_3x_SOC) 300 300 extern const struct tegra_vi_soc tegra20_vi_soc; 301 301 #endif 302 302 #if defined(CONFIG_ARCH_TEGRA_210_SOC)
+1 -1
drivers/staging/media/tegra-video/video.c
··· 121 121 } 122 122 123 123 static const struct of_device_id host1x_video_subdevs[] = { 124 - #if defined(CONFIG_ARCH_TEGRA_2x_SOC) 124 + #if defined(CONFIG_ARCH_TEGRA_2x_SOC) || defined(CONFIG_ARCH_TEGRA_3x_SOC) 125 125 { .compatible = "nvidia,tegra20-vip", }, 126 126 { .compatible = "nvidia,tegra20-vi", }, 127 127 #endif
+1 -1
drivers/staging/media/tegra-video/vip.c
··· 264 264 } 265 265 266 266 static const struct of_device_id tegra_vip_of_id_table[] = { 267 - #if defined(CONFIG_ARCH_TEGRA_2x_SOC) 267 + #if defined(CONFIG_ARCH_TEGRA_2x_SOC) || defined(CONFIG_ARCH_TEGRA_3x_SOC) 268 268 { .compatible = "nvidia,tegra20-vip", .data = &tegra20_vip_soc }, 269 269 #endif 270 270 { }
+1 -1
drivers/staging/media/tegra-video/vip.h
··· 50 50 const struct tegra_vip_ops *ops; 51 51 }; 52 52 53 - #if defined(CONFIG_ARCH_TEGRA_2x_SOC) 53 + #if defined(CONFIG_ARCH_TEGRA_2x_SOC) || defined(CONFIG_ARCH_TEGRA_3x_SOC) 54 54 extern const struct tegra_vip_soc tegra20_vip_soc; 55 55 #endif 56 56