diff options
author | Bryan Wu <pengw@nvidia.com> | 2013-06-28 15:46:35 -0700 |
---|---|---|
committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-09-14 13:40:31 -0700 |
commit | c69502c8079b38fced7fae63b9e643713b439e73 (patch) | |
tree | ba5d5f4903b2c1192a28531f14d77d6e9fe33cf4 /drivers/media/platform/soc_camera | |
parent | 9d7e399db1f6161103e4c7f568d8d92063e9c934 (diff) |
media: tegra: move V4L2 soc_camera driver to the right place
Also update DeviceTree entries and some API changes
Change-Id: I3588b706f2b91e379ba6008f737ba2d21e4ec7a8
Signed-off-by: Bryan Wu <pengw@nvidia.com>
Reviewed-on: http://git-master/r/246271
Reviewed-by: Allen Martin <amartin@nvidia.com>
Diffstat (limited to 'drivers/media/platform/soc_camera')
-rw-r--r-- | drivers/media/platform/soc_camera/Kconfig | 6 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/platform/soc_camera/tegra_v4l2_camera.c | 10 |
3 files changed, 18 insertions, 0 deletions
diff --git a/drivers/media/platform/soc_camera/Kconfig b/drivers/media/platform/soc_camera/Kconfig index 86d25b13b2ae..1bfc5fca9d3c 100644 --- a/drivers/media/platform/soc_camera/Kconfig +++ b/drivers/media/platform/soc_camera/Kconfig @@ -92,3 +92,9 @@ config VIDEO_ATMEL_ISI This module makes the ATMEL Image Sensor Interface available as a v4l2 device. +config VIDEO_TEGRA + tristate "Tegra soc_camera host driver" + depends on VIDEO_DEV && ARCH_TEGRA && SOC_CAMERA && HAS_DMA && HAVE_CLK + select VIDEOBUF2_DMA_NVMAP + ---help--- + This is a v4l2 driver for the Tegra camera interface diff --git a/drivers/media/platform/soc_camera/Makefile b/drivers/media/platform/soc_camera/Makefile index 8be30af30589..a660d2889088 100644 --- a/drivers/media/platform/soc_camera/Makefile +++ b/drivers/media/platform/soc_camera/Makefile @@ -11,5 +11,7 @@ obj-$(CONFIG_VIDEO_OMAP1) += omap1_camera.o obj-$(CONFIG_VIDEO_PXA27x) += pxa_camera.o obj-$(CONFIG_VIDEO_SH_MOBILE_CEU) += sh_mobile_ceu_camera.o obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2) += sh_mobile_csi2.o +obj-$(CONFIG_VIDEO_TEGRA) += tegra_v4l2_camera.o ccflags-y += -I$(srctree)/drivers/media/i2c/soc_camera +ccflags-y += -I$(srctree)/drivers/video/tegra/host diff --git a/drivers/media/platform/soc_camera/tegra_v4l2_camera.c b/drivers/media/platform/soc_camera/tegra_v4l2_camera.c index ba2e68a49ad1..20df0bbe4a82 100644 --- a/drivers/media/platform/soc_camera/tegra_v4l2_camera.c +++ b/drivers/media/platform/soc_camera/tegra_v4l2_camera.c @@ -1703,12 +1703,22 @@ static struct soc_camera_host_ops tegra_soc_camera_host_ops = { }; static struct of_device_id tegra_vi_of_match[] = { +#ifdef TEGRA_2X_OR_HIGHER_CONFIG { .compatible = "nvidia,tegra20-vi", .data = (struct nvhost_device_data *)&t20_vi_info }, +#endif +#ifdef TEGRA_3X_OR_HIGHER_CONFIG { .compatible = "nvidia,tegra30-vi", .data = (struct nvhost_device_data *)&t30_vi_info }, +#endif +#ifdef TEGRA_11X_OR_HIGHER_CONFIG { .compatible = "nvidia,tegra114-vi", .data = (struct nvhost_device_data *)&t11_vi_info }, +#endif +#ifdef TEGRA_14X_OR_HIGHER_CONFIG + { .compatible = "nvidia,tegra148-vi", + .data = (struct nvhost_device_data *)&t14_vi_info }, +#endif { }, }; |