From 68f1565aa4c7403f2e3a622ed163c15a2f5a9fa8 Mon Sep 17 00:00:00 2001 From: Manjunath Hadli Date: Wed, 28 Nov 2012 02:26:17 -0300 Subject: [PATCH] --- yaml --- r: 357067 b: refs/heads/master c: 44261e38059385ca1cd9c5018c579b4fc48b5a52 h: refs/heads/master i: 357065: e450429a6d387fd1069888ad9532663adc364d2f 357063: 9a266a98a4a00c73bebcad94e44a275251ed0b52 v: v3 --- [refs] | 2 +- trunk/drivers/staging/media/Kconfig | 2 ++ trunk/drivers/staging/media/Makefile | 1 + trunk/drivers/staging/media/davinci_vpfe/Kconfig | 9 +++++++++ trunk/drivers/staging/media/davinci_vpfe/Makefile | 3 +++ 5 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 trunk/drivers/staging/media/davinci_vpfe/Kconfig create mode 100644 trunk/drivers/staging/media/davinci_vpfe/Makefile diff --git a/[refs] b/[refs] index 1c571a72ab01..b4b9794cab10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 45e46b3bbe187a1bfc8f44c8d7ceaf851f0f4219 +refs/heads/master: 44261e38059385ca1cd9c5018c579b4fc48b5a52 diff --git a/trunk/drivers/staging/media/Kconfig b/trunk/drivers/staging/media/Kconfig index 427218b8b10f..ae0abc350e34 100644 --- a/trunk/drivers/staging/media/Kconfig +++ b/trunk/drivers/staging/media/Kconfig @@ -23,6 +23,8 @@ source "drivers/staging/media/as102/Kconfig" source "drivers/staging/media/cxd2099/Kconfig" +source "drivers/staging/media/davinci_vpfe/Kconfig" + source "drivers/staging/media/dt3155v4l/Kconfig" source "drivers/staging/media/go7007/Kconfig" diff --git a/trunk/drivers/staging/media/Makefile b/trunk/drivers/staging/media/Makefile index aec6eb963940..2b97cae99499 100644 --- a/trunk/drivers/staging/media/Makefile +++ b/trunk/drivers/staging/media/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_LIRC_STAGING) += lirc/ obj-$(CONFIG_SOLO6X10) += solo6x10/ obj-$(CONFIG_VIDEO_DT3155) += dt3155v4l/ obj-$(CONFIG_VIDEO_GO7007) += go7007/ +obj-$(CONFIG_VIDEO_DM365_VPFE) += davinci_vpfe/ diff --git a/trunk/drivers/staging/media/davinci_vpfe/Kconfig b/trunk/drivers/staging/media/davinci_vpfe/Kconfig new file mode 100644 index 000000000000..2e4a28b018e8 --- /dev/null +++ b/trunk/drivers/staging/media/davinci_vpfe/Kconfig @@ -0,0 +1,9 @@ +config VIDEO_DM365_VPFE + tristate "DM365 VPFE Media Controller Capture Driver" + depends on VIDEO_V4L2 && ARCH_DAVINCI_DM365 && !VIDEO_VPFE_CAPTURE + select VIDEOBUF2_DMA_CONTIG + help + Support for DM365 VPFE based Media Controller Capture driver. + + To compile this driver as a module, choose M here: the + module will be called vpfe-mc-capture. diff --git a/trunk/drivers/staging/media/davinci_vpfe/Makefile b/trunk/drivers/staging/media/davinci_vpfe/Makefile new file mode 100644 index 000000000000..c64515c644cd --- /dev/null +++ b/trunk/drivers/staging/media/davinci_vpfe/Makefile @@ -0,0 +1,3 @@ +obj-$(CONFIG_VIDEO_DM365_VPFE) += \ + dm365_isif.o dm365_ipipe_hw.o dm365_ipipe.o \ + dm365_resizer.o dm365_ipipeif.o vpfe_mc_capture.o vpfe_video.o