Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9eae42e5 authored by Richard Röjfors's avatar Richard Röjfors Committed by Mauro Carvalho Chehab
Browse files

[media] media: Add timberdale video-in driver 



This patch adds the timberdale video-in driver.

The video IP of timberdale delivers the video data via DMA.
The driver uses the DMA api to handle DMA transfers, and make use
of the V4L2 video buffers to handle buffers against user space.

If available the driver uses an encoder to get/set the video standard

Signed-off-by: default avatarRichard Röjfors <richard.rojfors@pelagicore.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 36d89f7d

drivers/media/video/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -666,6 +666,15 @@ config VIDEO_HEXIUM_GEMINI 
	  To compile this driver as a module, choose M here: the

	  module will be called hexium_gemini.



config VIDEO_TIMBERDALE

	tristate "Support for timberdale Video In/LogiWIN"

	depends on VIDEO_V4L2 && I2C

	select TIMB_DMA

	select VIDEO_ADV7180

	select VIDEOBUF_DMA_CONTIG

	---help---

	Add support for the Video In peripherial of the timberdale FPGA.



source "drivers/media/video/cx88/Kconfig"



source "drivers/media/video/cx23885/Kconfig"

drivers/media/video/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ 
obj-$(CONFIG_VIDEO_MXB) += mxb.o

obj-$(CONFIG_VIDEO_HEXIUM_ORION) += hexium_orion.o

obj-$(CONFIG_VIDEO_HEXIUM_GEMINI) += hexium_gemini.o

obj-$(CONFIG_VIDEO_TIMBERDALE)	+= timblogiw.o



obj-$(CONFIG_VIDEOBUF_GEN) += videobuf-core.o

obj-$(CONFIG_VIDEOBUF_DMA_SG) += videobuf-dma-sg.o

drivers/media/video/timblogiw.c

0 → 100644
+894 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/mfd/timberdale.c

+0 −2
Original line number Diff line number Diff line
@@ -271,11 +271,9 @@ static __devinitdata struct timb_radio_platform_data 
	timberdale_radio_platform_data = {

	.i2c_adapter = 0,

	.tuner = {

		.module_name = "tef6862",

		.info = &timberdale_tef6868_i2c_board_info

	},

	.dsp = {

		.module_name = "saa7706h",

		.info = &timberdale_saa7706_i2c_board_info

	}

};

include/media/timb_radio.h

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
struct timb_radio_platform_data {

	int i2c_adapter; /* I2C adapter where the tuner and dsp are attached */

	struct {

		const char *module_name;

		struct i2c_board_info *info;

	} tuner;

	struct {