diff options
author | Chaithrika U S <chaithrika@ti.com> | 2009-06-09 05:38:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:18:05 -0400 |
commit | e9f4bb559c39cd85ef5365fa50e1893df4b67b96 (patch) | |
tree | 4d0f3f54b9a44da1043b077e32709edc92f54893 | |
parent | e7332e3a552f6e18b39f5b77ce964818d10c9743 (diff) |
V4L/DVB (12177): dm646x: Add an entry for dm646x EVM card at building system
Makefile and Kconfig changes for DM646x Video Display device, using
davinci/vpif, adv7343 and ths7303 drivers.
Signed-off-by: Manjunath Hadli <mrh@ti.com>
Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
Signed-off-by: Chaithrika U S <chaithrika@ti.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r-- | drivers/media/video/Kconfig | 22 | ||||
-rw-r--r-- | drivers/media/video/Makefile | 2 | ||||
-rw-r--r-- | drivers/media/video/davinci/Makefile | 9 |
3 files changed, 33 insertions, 0 deletions
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index e01b759faf5c..df20283151c8 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -493,6 +493,28 @@ config VIDEO_UPD64083 | |||
493 | 493 | ||
494 | endmenu # encoder / decoder chips | 494 | endmenu # encoder / decoder chips |
495 | 495 | ||
496 | config DISPLAY_DAVINCI_DM646X_EVM | ||
497 | tristate "DM646x EVM Video Display" | ||
498 | depends on VIDEO_DEV && MACH_DAVINCI_DM6467_EVM | ||
499 | select VIDEOBUF_DMA_CONTIG | ||
500 | select VIDEO_DAVINCI_VPIF | ||
501 | select VIDEO_ADV7343 | ||
502 | select VIDEO_THS7303 | ||
503 | help | ||
504 | Support for DaVinci based display device. | ||
505 | |||
506 | To compile this driver as a module, choose M here: the | ||
507 | module will be called davincihd_display. | ||
508 | |||
509 | config VIDEO_DAVINCI_VPIF | ||
510 | tristate "DaVinci VPIF Driver" | ||
511 | depends on DISPLAY_DAVINCI_DM646X_EVM | ||
512 | help | ||
513 | Support for DaVinci VPIF Driver. | ||
514 | |||
515 | To compile this driver as a module, choose M here: the | ||
516 | module will be called vpif. | ||
517 | |||
496 | config VIDEO_VIVI | 518 | config VIDEO_VIVI |
497 | tristate "Virtual Video Driver" | 519 | tristate "Virtual Video Driver" |
498 | depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 | 520 | depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 |
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 1dddea1ada5d..70804caa5f37 100644 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile | |||
@@ -161,6 +161,8 @@ obj-$(CONFIG_VIDEO_SAA7164) += saa7164/ | |||
161 | 161 | ||
162 | obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o | 162 | obj-$(CONFIG_VIDEO_IR_I2C) += ir-kbd-i2c.o |
163 | 163 | ||
164 | obj-$(CONFIG_ARCH_DAVINCI) += davinci/ | ||
165 | |||
164 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core | 166 | EXTRA_CFLAGS += -Idrivers/media/dvb/dvb-core |
165 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends | 167 | EXTRA_CFLAGS += -Idrivers/media/dvb/frontends |
166 | EXTRA_CFLAGS += -Idrivers/media/common/tuners | 168 | EXTRA_CFLAGS += -Idrivers/media/common/tuners |
diff --git a/drivers/media/video/davinci/Makefile b/drivers/media/video/davinci/Makefile new file mode 100644 index 000000000000..7fe9bce97167 --- /dev/null +++ b/drivers/media/video/davinci/Makefile | |||
@@ -0,0 +1,9 @@ | |||
1 | # | ||
2 | # Makefile for the davinci video device drivers. | ||
3 | # | ||
4 | |||
5 | # VPIF | ||
6 | obj-$(CONFIG_VIDEO_DAVINCI_VPIF) += vpif.o | ||
7 | |||
8 | #DM646x EVM Display driver | ||
9 | obj-$(CONFIG_DISPLAY_DAVINCI_DM646X_EVM) += vpif_display.o | ||