public inbox for linux-media@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH v18 5/6] davinci vpbe: Build infrastructure for VPBE driver
@ 2011-05-24 14:03 Manjunath Hadli
  2011-05-24 14:58 ` Sergei Shtylyov
  0 siblings, 1 reply; 2+ messages in thread
From: Manjunath Hadli @ 2011-05-24 14:03 UTC (permalink / raw)
  To: LMML; +Cc: dlos, Manjunath Hadli

This patch adds the build infra-structure for Davinci
VPBE dislay driver.

Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Muralidharan Karicheri <m-karicheri2@ti.com>
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
---
 drivers/media/video/davinci/Kconfig        |   23 +++++++++++++++++++++++
 drivers/media/video/davinci/Makefile       |    2 ++
 2 files changed, 25 insertions(+), 0 deletions(-)
 delete mode 100644 drivers/staging/vme/bridges/Module.symvers

diff --git a/drivers/media/video/davinci/Kconfig b/drivers/media/video/davinci/Kconfig
index 6b19540..60a456e 100644
--- a/drivers/media/video/davinci/Kconfig
+++ b/drivers/media/video/davinci/Kconfig
@@ -91,3 +91,26 @@ config VIDEO_ISIF
 
 	   To compile this driver as a module, choose M here: the
 	   module will be called vpfe.
+
+config VIDEO_DM644X_VPBE
+	tristate "DM644X VPBE HW module"
+	depends on ARCH_DAVINCI_DM644x
+	select VIDEO_VPSS_SYSTEM
+	select VIDEOBUF_DMA_CONTIG
+	help
+	    Enables VPBE modules used for display on a DM644x
+	    SoC.
+
+	    To compile this driver as a module, choose M here: the
+	    module will be called vpbe.
+
+
+config VIDEO_VPBE_DISPLAY
+	tristate "VPBE V4L2 Display driver"
+	depends on ARCH_DAVINCI_DM644x
+	select VIDEO_DM644X_VPBE
+	help
+	    Enables VPBE V4L2 Display driver on a DM644x device
+
+	    To compile this driver as a module, choose M here: the
+	    module will be called vpbe_display.
diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile
index a379557..ae7dafb 100644
--- a/drivers/media/video/davinci/Makefile
+++ b/drivers/media/video/davinci/Makefile
@@ -16,3 +16,5 @@ 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
+obj-$(CONFIG_VIDEO_DM644X_VPBE) += vpbe.o vpbe_osd.o vpbe_venc.o
+obj-$(CONFIG_VIDEO_VPBE_DISPLAY) += vpbe_display.o
diff --git a/drivers/staging/vme/bridges/Module.symvers b/drivers/staging/vme/bridges/Module.symvers
deleted file mode 100644
index e69de29..0000000
-- 
1.6.2.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v18 5/6] davinci vpbe: Build infrastructure for VPBE driver
  2011-05-24 14:03 [PATCH v18 5/6] davinci vpbe: Build infrastructure for VPBE driver Manjunath Hadli
@ 2011-05-24 14:58 ` Sergei Shtylyov
  0 siblings, 0 replies; 2+ messages in thread
From: Sergei Shtylyov @ 2011-05-24 14:58 UTC (permalink / raw)
  To: Manjunath Hadli; +Cc: LMML, dlos

Hello.

Manjunath Hadli wrote:

> This patch adds the build infra-structure for Davinci
> VPBE dislay driver.

> Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
> Acked-by: Muralidharan Karicheri <m-karicheri2@ti.com>
> Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
> ---
>  drivers/media/video/davinci/Kconfig        |   23 +++++++++++++++++++++++
>  drivers/media/video/davinci/Makefile       |    2 ++
>  2 files changed, 25 insertions(+), 0 deletions(-)
>  delete mode 100644 drivers/staging/vme/bridges/Module.symvers
[...]

> diff --git a/drivers/staging/vme/bridges/Module.symvers b/drivers/staging/vme/bridges/Module.symvers
> deleted file mode 100644
> index e69de29..0000000

    Looks like a stray file got added to the patch...

WBR, Sergei


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-05-24 15:00 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-24 14:03 [PATCH v18 5/6] davinci vpbe: Build infrastructure for VPBE driver Manjunath Hadli
2011-05-24 14:58 ` Sergei Shtylyov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox