From 065590c161bbf38a5e816a60f0b65f975d2cc67c Mon Sep 17 00:00:00 2001 From: Murali Karicheri Date: Sun, 21 Feb 2010 15:52:45 -0300 Subject: [PATCH] --- yaml --- r: 181737 b: refs/heads/master c: 00cb9f6920aaeb34bcef146085ae57e363641a85 h: refs/heads/master i: 181735: 8bb18f618e3405d6f021462bd39d5da16adb2ef5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/Kconfig | 14 +++++++++++++- trunk/drivers/media/video/davinci/Makefile | 1 + 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b5fd1177cb79..8e1c6952b176 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 85b848caf77a0cc6a9df0a0f40d876211b394682 +refs/heads/master: 00cb9f6920aaeb34bcef146085ae57e363641a85 diff --git a/trunk/drivers/media/video/Kconfig b/trunk/drivers/media/video/Kconfig index 7978afa1edcd..f8fc8654693d 100644 --- a/trunk/drivers/media/video/Kconfig +++ b/trunk/drivers/media/video/Kconfig @@ -557,7 +557,6 @@ config VIDEO_VPSS_SYSTEM depends on ARCH_DAVINCI help Support for vpss system module for video driver - default y config VIDEO_VPFE_CAPTURE tristate "VPFE Video Capture Driver" @@ -601,6 +600,19 @@ config VIDEO_DM355_CCDC To compile this driver as a module, choose M here: the module will be called vpfe. +config VIDEO_ISIF + tristate "ISIF HW module" + depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE + select VIDEO_VPSS_SYSTEM + default y + help + Enables ISIF hw module. This is the hardware module for + configuring ISIF in VPFE to capture Raw Bayer RGB data from + a image sensor or YUV data from a YUV source. + + To compile this driver as a module, choose M here: the + module will be called vpfe. + source "drivers/media/video/bt8xx/Kconfig" config VIDEO_PMS diff --git a/trunk/drivers/media/video/davinci/Makefile b/trunk/drivers/media/video/davinci/Makefile index 1a8b8f3f182e..a37955745aaa 100644 --- a/trunk/drivers/media/video/davinci/Makefile +++ b/trunk/drivers/media/video/davinci/Makefile @@ -15,3 +15,4 @@ obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o +obj-$(CONFIG_VIDEO_ISIF) += isif.o