diff options
author | Murali Karicheri <mkaricheri@gmail.com> | 2010-02-21 13:52:45 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-02-26 13:11:06 -0500 |
commit | 00cb9f6920aaeb34bcef146085ae57e363641a85 (patch) | |
tree | 023db18e9e8dbc09f536febb0bf15b61ee45cead | |
parent | 85b848caf77a0cc6a9df0a0f40d876211b394682 (diff) |
V4L/DVB: V4L - vpfe capture - build environment for isif driver
Adding Makefile and Kconfig for ISIF driver
Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl>
Reviewed-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Murali Karicheri <mkaricheri@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/Kconfig | 14 | ||||
-rw-r--r-- | drivers/media/video/davinci/Makefile | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index 7978afa1edcd..f8fc8654693d 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -557,7 +557,6 @@ config VIDEO_VPSS_SYSTEM | |||
557 | depends on ARCH_DAVINCI | 557 | depends on ARCH_DAVINCI |
558 | help | 558 | help |
559 | Support for vpss system module for video driver | 559 | Support for vpss system module for video driver |
560 | default y | ||
561 | 560 | ||
562 | config VIDEO_VPFE_CAPTURE | 561 | config VIDEO_VPFE_CAPTURE |
563 | tristate "VPFE Video Capture Driver" | 562 | tristate "VPFE Video Capture Driver" |
@@ -601,6 +600,19 @@ config VIDEO_DM355_CCDC | |||
601 | To compile this driver as a module, choose M here: the | 600 | To compile this driver as a module, choose M here: the |
602 | module will be called vpfe. | 601 | module will be called vpfe. |
603 | 602 | ||
603 | config VIDEO_ISIF | ||
604 | tristate "ISIF HW module" | ||
605 | depends on ARCH_DAVINCI_DM365 && VIDEO_VPFE_CAPTURE | ||
606 | select VIDEO_VPSS_SYSTEM | ||
607 | default y | ||
608 | help | ||
609 | Enables ISIF hw module. This is the hardware module for | ||
610 | configuring ISIF in VPFE to capture Raw Bayer RGB data from | ||
611 | a image sensor or YUV data from a YUV source. | ||
612 | |||
613 | To compile this driver as a module, choose M here: the | ||
614 | module will be called vpfe. | ||
615 | |||
604 | source "drivers/media/video/bt8xx/Kconfig" | 616 | source "drivers/media/video/bt8xx/Kconfig" |
605 | 617 | ||
606 | config VIDEO_PMS | 618 | config VIDEO_PMS |
diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile index 1a8b8f3f182e..a37955745aaa 100644 --- a/drivers/media/video/davinci/Makefile +++ b/drivers/media/video/davinci/Makefile | |||
@@ -15,3 +15,4 @@ obj-$(CONFIG_VIDEO_VPSS_SYSTEM) += vpss.o | |||
15 | obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o | 15 | obj-$(CONFIG_VIDEO_VPFE_CAPTURE) += vpfe_capture.o |
16 | obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o | 16 | obj-$(CONFIG_VIDEO_DM6446_CCDC) += dm644x_ccdc.o |
17 | obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o | 17 | obj-$(CONFIG_VIDEO_DM355_CCDC) += dm355_ccdc.o |
18 | obj-$(CONFIG_VIDEO_ISIF) += isif.o | ||