[media] cobalt: add new driver

The cobalt device is a PCIe card with 4 HDMI inputs (adv7604) and a
connector that can be used to hook up an adv7511 transmitter or an
adv7842 receiver daughterboard.

This device is used within Cisco but is sadly not available outside
of Cisco. Nevertheless it is a very interesting driver that can serve
as an example of how to support HDMI hardware and how to use the popular
adv devices.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 5579b5546445988c6bb4508d678669024ea25cba..3cfb979596969854e5c7ca8c8358785327715ffd 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2602,6 +2602,14 @@ L:       platform-driver-x86@vger.kernel.org
 S:     Supported
 F:     drivers/platform/x86/classmate-laptop.c
 
+COBALT MEDIA DRIVER
+M:     Hans Verkuil <hans.verkuil@cisco.com>
+L:     linux-media@vger.kernel.org
+T:     git git://linuxtv.org/media_tree.git
+W:     http://linuxtv.org
+S:     Supported
+F:     drivers/media/pci/cobalt/
+
 COCCINELLE/Semantic Patches (SmPL)
 M:     Julia Lawall <Julia.Lawall@lip6.fr>
 M:     Gilles Muller <Gilles.Muller@lip6.fr>

diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index fd359fb15e69ffb9ac72f793e5f7d03eaef27c42..f318ae9bb57a09b5e168b642e24e5a676b7fd639 100644 (file)
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -33,6 +33,7 @@ source "drivers/media/pci/cx88/Kconfig"
 source "drivers/media/pci/bt8xx/Kconfig"
 source "drivers/media/pci/saa7134/Kconfig"
 source "drivers/media/pci/saa7164/Kconfig"
+source "drivers/media/pci/cobalt/Kconfig"
 
 endif
 

diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index 3471ab6b9f2220589f063581b9f5b1d8371a7c9f..23ce53bd47c38db76a95fffc68910ff7a9ead60d 100644 (file)
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_VIDEO_DT3155) += dt3155/
 obj-$(CONFIG_VIDEO_MEYE) += meye/
 obj-$(CONFIG_STA2X11_VIP) += sta2x11/
 obj-$(CONFIG_VIDEO_SOLO6X10) += solo6x10/
+obj-$(CONFIG_VIDEO_COBALT) += cobalt/

diff --git a/drivers/media/pci/cobalt/Kconfig b/drivers/media/pci/cobalt/Kconfig
new file mode 100644 (file)
index 0000000..e3c03e9
--- /dev/null
+++ b/drivers/media/pci/cobalt/Kconfig
@@ -0,0 +1,18 @@
+config VIDEO_COBALT
+       tristate "Cisco Cobalt support"
+       depends on VIDEO_V4L2 && I2C && MEDIA_CONTROLLER
+       depends on PCI_MSI && MTD_COMPLEX_MAPPINGS
+       select I2C_ALGOBIT
+       select VIDEO_ADV7604
+       select VIDEO_ADV7511
+       select VIDEO_ADV7842
+       select VIDEOBUF2_DMA_SG
+       ---help---
+         This is a video4linux driver for the Cisco PCIe Cobalt card.
+
+         This board is sadly not available outside of Cisco, but it is
+         very useful as an example of a real driver that uses all the
+         latest frameworks and APIs.
+
+         To compile this driver as a module, choose M here: the
+         module will be called cobalt.

diff --git a/drivers/media/pci/cobalt/Makefile b/drivers/media/pci/cobalt/Makefile
new file mode 100644 (file)
index 0000000..b328955
--- /dev/null
+++ b/drivers/media/pci/cobalt/Makefile
@@ -0,0 +1,5 @@
+cobalt-objs    := cobalt-driver.o cobalt-irq.o cobalt-v4l2.o \
+                 cobalt-i2c.o cobalt-omnitek.o cobalt-flash.o cobalt-cpld.o \
+                 cobalt-alsa-main.o cobalt-alsa-pcm.o
+
+obj-$(CONFIG_VIDEO_COBALT) += cobalt.o

diff --cc drivers/media/pci/cobalt/cobalt-alsa-main.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-alsa-pcm.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-alsa-pcm.h
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-alsa.h
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-cpld.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-cpld.h
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-driver.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-driver.h
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-flash.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-flash.h
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-i2c.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-i2c.h
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-irq.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-irq.h
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-omnitek.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-omnitek.h
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-v4l2.c
Simple merge

diff --cc drivers/media/pci/cobalt/cobalt-v4l2.h
Simple merge

diff --cc drivers/media/pci/cobalt/m00233_video_measure_memmap_package.h
Simple merge

diff --cc drivers/media/pci/cobalt/m00235_fdma_packer_memmap_package.h
Simple merge

diff --cc drivers/media/pci/cobalt/m00389_cvi_memmap_package.h
Simple merge

diff --cc drivers/media/pci/cobalt/m00460_evcnt_memmap_package.h
Simple merge

diff --cc drivers/media/pci/cobalt/m00473_freewheel_memmap_package.h
Simple merge

diff --cc drivers/media/pci/cobalt/m00479_clk_loss_detector_memmap_package.h
Simple merge

diff --cc drivers/media/pci/cobalt/m00514_syncgen_flow_evcnt_memmap_package.h
Simple merge