Skip to content

L
linux
Commit 1046a2c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (144 commits)
  [media] saa7134.h: Suppress compiler warnings when CONFIG_VIDEO_SAA7134_RC is not set
  [media] it913x [VER 1.07] Support for single ITE 9135 devices
  [media] Support for Terratec G1
  [media] cx25821: off by one in cx25821_vidioc_s_input()
  [media] media: tea5764: reconcile Kconfig symbol and macro
  [media] omap_vout: Add poll() support
  [media] omap3isp: preview: Add crop support on the sink pad
  [media] omap3isp: preview: Rename min/max input/output sizes defines
  [media] omap3isp: preview: Remove horizontal averager support
  [media] omap3isp: Report the ISP revision through the media controller API
  [media] omap3isp: ccdc: remove redundant operation
  [media] omap3isp: Fix memory leaks in initialization error paths
  [media] omap3isp: Add missing mutex_destroy() calls
  [media] omap3isp: Move *_init_entities() functions to the init/cleanup section
  [media] omap3isp: Move media_entity_cleanup() from unregister() to cleanup()
  [media] MFC: Change MFC firmware binary name
  [media] vb2: add vb2_get_unmapped_area in vb2 core
  [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor
  [media] v4l: Add AUTO option for the V4L2_CID_POWER_LINE_FREQUENCY control
  [media] media: ov6650: stylistic improvements
  ...
parents 46e85f5f b3f4e1eb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10316 additions and 3785 deletions
Documentation/DocBook/media/v4l/compat.xml
View file @ 1046a2c4
...@@ -2486,6 +2486,9 @@ ioctls.</para> ...@@ -2486,6 +2486,9 @@ ioctls.</para>
<listitem> <listitem>
<para>Flash API. <xref linkend="flash-controls" /></para> <para>Flash API. <xref linkend="flash-controls" /></para>
</listitem> </listitem>
<listitem>
<para>&VIDIOC-CREATE-BUFS; and &VIDIOC-PREPARE-BUF; ioctls.</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>
......
Documentation/DocBook/media/v4l/controls.xml
View file @ 1046a2c4
...@@ -232,8 +232,9 @@ control is deprecated. New drivers and applications should use the ...@@ -232,8 +232,9 @@ control is deprecated. New drivers and applications should use the
<entry>Enables a power line frequency filter to avoid <entry>Enables a power line frequency filter to avoid
flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are: flicker. Possible values for <constant>enum v4l2_power_line_frequency</constant> are:
<constant>V4L2_CID_POWER_LINE_FREQUENCY_DISABLED</constant> (0), <constant>V4L2_CID_POWER_LINE_FREQUENCY_DISABLED</constant> (0),
<constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1) and <constant>V4L2_CID_POWER_LINE_FREQUENCY_50HZ</constant> (1),
<constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2).</entry> <constant>V4L2_CID_POWER_LINE_FREQUENCY_60HZ</constant> (2) and
<constant>V4L2_CID_POWER_LINE_FREQUENCY_AUTO</constant> (3).</entry>
</row> </row>
<row> <row>
<entry><constant>V4L2_CID_HUE_AUTO</constant></entry> <entry><constant>V4L2_CID_HUE_AUTO</constant></entry>
......
Documentation/DocBook/media/v4l/io.xml
View file @ 1046a2c4
...@@ -927,6 +927,33 @@ ioctl is called.</entry> ...@@ -927,6 +927,33 @@ ioctl is called.</entry>
Applications set or clear this flag before calling the Applications set or clear this flag before calling the
<constant>VIDIOC_QBUF</constant> ioctl.</entry> <constant>VIDIOC_QBUF</constant> ioctl.</entry>
</row> </row>
<row>
<entry><constant>V4L2_BUF_FLAG_PREPARED</constant></entry>
<entry>0x0400</entry>
<entry>The buffer has been prepared for I/O and can be queued by the
application. Drivers set or clear this flag when the
<link linkend="vidioc-querybuf">VIDIOC_QUERYBUF</link>, <link
linkend="vidioc-qbuf">VIDIOC_PREPARE_BUF</link>, <link
linkend="vidioc-qbuf">VIDIOC_QBUF</link> or <link
linkend="vidioc-qbuf">VIDIOC_DQBUF</link> ioctl is called.</entry>
</row>
<row>
<entry><constant>V4L2_BUF_FLAG_NO_CACHE_INVALIDATE</constant></entry>
<entry>0x0400</entry>
<entry>Caches do not have to be invalidated for this buffer.
Typically applications shall use this flag if the data captured in the buffer
is not going to be touched by the CPU, instead the buffer will, probably, be
passed on to a DMA-capable hardware unit for further processing or output.
</entry>
</row>
<row>
<entry><constant>V4L2_BUF_FLAG_NO_CACHE_CLEAN</constant></entry>
<entry>0x0800</entry>
<entry>Caches do not have to be cleaned for this buffer.
Typically applications shall use this flag for output buffers if the data
in this buffer has not been created by the CPU but by some DMA-capable unit,
in which case caches have not been used.</entry>
</row>
</tbody> </tbody>
</tgroup> </tgroup>
</table> </table>
......
Documentation/DocBook/media/v4l/v4l2.xml
View file @ 1046a2c4
...@@ -469,6 +469,7 @@ and discussions on the V4L mailing list.</revremark> ...@@ -469,6 +469,7 @@ and discussions on the V4L mailing list.</revremark>
&sub-close; &sub-close;
&sub-ioctl; &sub-ioctl;
<!-- All ioctls go here. --> <!-- All ioctls go here. -->
&sub-create-bufs;
&sub-cropcap; &sub-cropcap;
&sub-dbg-g-chip-ident; &sub-dbg-g-chip-ident;
&sub-dbg-g-register; &sub-dbg-g-register;
...@@ -511,6 +512,7 @@ and discussions on the V4L mailing list.</revremark> ...@@ -511,6 +512,7 @@ and discussions on the V4L mailing list.</revremark>
&sub-queryctrl; &sub-queryctrl;
&sub-query-dv-preset; &sub-query-dv-preset;
&sub-querystd; &sub-querystd;
&sub-prepare-buf;
&sub-reqbufs; &sub-reqbufs;
&sub-s-hw-freq-seek; &sub-s-hw-freq-seek;
&sub-streamon; &sub-streamon;
......
Documentation/DocBook/media/v4l/vidioc-create-bufs.xml 0 → 100644
View file @ 1046a2c4
<refentry id="vidioc-create-bufs">
<refmeta>
<refentrytitle>ioctl VIDIOC_CREATE_BUFS</refentrytitle>
&manvol;
</refmeta>
<refnamediv>
<refname>VIDIOC_CREATE_BUFS</refname>
<refpurpose>Create buffers for Memory Mapped or User Pointer I/O</refpurpose>
</refnamediv>
<refsynopsisdiv>
<funcsynopsis>
<funcprototype>
<funcdef>int <function>ioctl</function></funcdef>
<paramdef>int <parameter>fd</parameter></paramdef>
<paramdef>int <parameter>request</parameter></paramdef>
<paramdef>struct v4l2_create_buffers *<parameter>argp</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
<refsect1>
<title>Arguments</title>
<variablelist>
<varlistentry>
<term><parameter>fd</parameter></term>
<listitem>
<para>&fd;</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>request</parameter></term>
<listitem>
<para>VIDIOC_CREATE_BUFS</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>argp</parameter></term>
<listitem>
<para></para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>Description</title>
<para>This ioctl is used to create buffers for <link linkend="mmap">memory
mapped</link> or <link linkend="userp">user pointer</link>
I/O. It can be used as an alternative or in addition to the
<constant>VIDIOC_REQBUFS</constant> ioctl, when a tighter control over buffers
is required. This ioctl can be called multiple times to create buffers of
different sizes.</para>
<para>To allocate device buffers applications initialize relevant fields of
the <structname>v4l2_create_buffers</structname> structure. They set the
<structfield>type</structfield> field in the
<structname>v4l2_format</structname> structure, embedded in this
structure, to the respective stream or buffer type.
<structfield>count</structfield> must be set to the number of required buffers.
<structfield>memory</structfield> specifies the required I/O method. The
<structfield>format</structfield> field shall typically be filled in using
either the <constant>VIDIOC_TRY_FMT</constant> or
<constant>VIDIOC_G_FMT</constant> ioctl(). Additionally, applications can adjust
<structfield>sizeimage</structfield> fields to fit their specific needs. The
<structfield>reserved</structfield> array must be zeroed.</para>
<para>When the ioctl is called with a pointer to this structure the driver
will attempt to allocate up to the requested number of buffers and store the
actual number allocated and the starting index in the
<structfield>count</structfield> and the <structfield>index</structfield> fields
respectively. On return <structfield>count</structfield> can be smaller than
the number requested. The driver may also increase buffer sizes if required,
however, it will not update <structfield>sizeimage</structfield> field values.
The user has to use <constant>VIDIOC_QUERYBUF</constant> to retrieve that
information.</para>
<table pgwide="1" frame="none" id="v4l2-create-buffers">
<title>struct <structname>v4l2_create_buffers</structname></title>
<tgroup cols="3">
&cs-str;
<tbody valign="top">
<row>
<entry>__u32</entry>
<entry><structfield>index</structfield></entry>
<entry>The starting buffer index, returned by the driver.</entry>
</row>
<row>
<entry>__u32</entry>
<entry><structfield>count</structfield></entry>
<entry>The number of buffers requested or granted.</entry>
</row>
<row>
<entry>&v4l2-memory;</entry>
<entry><structfield>memory</structfield></entry>
<entry>Applications set this field to
<constant>V4L2_MEMORY_MMAP</constant> or
<constant>V4L2_MEMORY_USERPTR</constant>.</entry>
</row>
<row>
<entry>&v4l2-format;</entry>
<entry><structfield>format</structfield></entry>
<entry>Filled in by the application, preserved by the driver.</entry>
</row>
<row>
<entry>__u32</entry>
<entry><structfield>reserved</structfield>[8]</entry>
<entry>A place holder for future extensions.</entry>
</row>
</tbody>
</tgroup>
</table>
</refsect1>
<refsect1>
&return-value;
<variablelist>
<varlistentry>
<term><errorcode>ENOMEM</errorcode></term>
<listitem>
<para>No memory to allocate buffers for <link linkend="mmap">memory
mapped</link> I/O.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><errorcode>EINVAL</errorcode></term>
<listitem>
<para>The buffer type (<structfield>type</structfield> field) or the
requested I/O method (<structfield>memory</structfield>) is not
supported.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
</refentry>
Documentation/DocBook/media/v4l/vidioc-prepare-buf.xml 0 → 100644
View file @ 1046a2c4
<refentry id="vidioc-prepare-buf">
<refmeta>
<refentrytitle>ioctl VIDIOC_PREPARE_BUF</refentrytitle>
&manvol;
</refmeta>
<refnamediv>
<refname>VIDIOC_PREPARE_BUF</refname>
<refpurpose>Prepare a buffer for I/O</refpurpose>
</refnamediv>
<refsynopsisdiv>
<funcsynopsis>
<funcprototype>
<funcdef>int <function>ioctl</function></funcdef>
<paramdef>int <parameter>fd</parameter></paramdef>
<paramdef>int <parameter>request</parameter></paramdef>
<paramdef>struct v4l2_buffer *<parameter>argp</parameter></paramdef>
</funcprototype>
</funcsynopsis>
</refsynopsisdiv>
<refsect1>
<title>Arguments</title>
<variablelist>
<varlistentry>
<term><parameter>fd</parameter></term>
<listitem>
<para>&fd;</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>request</parameter></term>
<listitem>
<para>VIDIOC_PREPARE_BUF</para>
</listitem>
</varlistentry>
<varlistentry>
<term><parameter>argp</parameter></term>
<listitem>
<para></para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>Description</title>
<para>Applications can optionally call the
<constant>VIDIOC_PREPARE_BUF</constant> ioctl to pass ownership of the buffer
to the driver before actually enqueuing it, using the
<constant>VIDIOC_QBUF</constant> ioctl, and to prepare it for future I/O.
Such preparations may include cache invalidation or cleaning. Performing them
in advance saves time during the actual I/O. In case such cache operations are
not required, the application can use one of
<constant>V4L2_BUF_FLAG_NO_CACHE_INVALIDATE</constant> and
<constant>V4L2_BUF_FLAG_NO_CACHE_CLEAN</constant> flags to skip the respective
step.</para>
<para>The <structname>v4l2_buffer</structname> structure is
specified in <xref linkend="buffer" />.</para>
</refsect1>
<refsect1>
&return-value;
<variablelist>
<varlistentry>
<term><errorcode>EBUSY</errorcode></term>
<listitem>
<para>File I/O is in progress.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><errorcode>EINVAL</errorcode></term>
<listitem>
<para>The buffer <structfield>type</structfield> is not
supported, or the <structfield>index</structfield> is out of bounds,
or no buffers have been allocated yet, or the
<structfield>userptr</structfield> or
<structfield>length</structfield> are invalid.</para>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
</refentry>
arch/arm/mach-pxa/pcm990-baseboard.c
View file @ 1046a2c4
...@@ -394,9 +394,9 @@ static int pcm990_camera_set_bus_param(struct soc_camera_link *link, ...@@ -394,9 +394,9 @@ static int pcm990_camera_set_bus_param(struct soc_camera_link *link,
} }
if (flags & SOCAM_DATAWIDTH_8) if (flags & SOCAM_DATAWIDTH_8)
gpio_set_value(gpio_bus_switch, 1); gpio_set_value_cansleep(gpio_bus_switch, 1);
else else
gpio_set_value(gpio_bus_switch, 0); gpio_set_value_cansleep(gpio_bus_switch, 0);
return 0; return 0;
} }
......
arch/arm/mach-shmobile/board-ap4evb.c
View file @ 1046a2c4
...@@ -933,7 +933,7 @@ static struct platform_device ap4evb_camera = { ...@@ -933,7 +933,7 @@ static struct platform_device ap4evb_camera = {
static struct sh_csi2_client_config csi2_clients[] = { static struct sh_csi2_client_config csi2_clients[] = {
{ {
.phy = SH_CSI2_PHY_MAIN, .phy = SH_CSI2_PHY_MAIN,
.lanes = 3, .lanes = 0, /* default: 2 lanes */
.channel = 0, .channel = 0,
.pdev = &ap4evb_camera, .pdev = &ap4evb_camera,
}, },
......
arch/arm/mach-shmobile/board-mackerel.c
View file @ 1046a2c4
...@@ -1223,9 +1223,10 @@ static struct soc_camera_platform_info camera_info = { ...@@ -1223,9 +1223,10 @@ static struct soc_camera_platform_info camera_info = {
.width = 640, .width = 640,
.height = 480, .height = 480,
}, },
.bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 | V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
SOCAM_DATA_ACTIVE_HIGH, V4L2_MBUS_DATA_ACTIVE_HIGH,
.mbus_type = V4L2_MBUS_PARALLEL,
.set_capture = camera_set_capture, .set_capture = camera_set_capture,
}; };
......
arch/sh/boards/mach-ap325rxa/setup.c
View file @ 1046a2c4
...@@ -345,9 +345,10 @@ static struct soc_camera_platform_info camera_info = { ...@@ -345,9 +345,10 @@ static struct soc_camera_platform_info camera_info = {
.width = 640, .width = 640,
.height = 480, .height = 480,
}, },
.bus_param = SOCAM_PCLK_SAMPLE_RISING | SOCAM_HSYNC_ACTIVE_HIGH | .mbus_param = V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_MASTER |
SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_MASTER | SOCAM_DATAWIDTH_8 | V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_HSYNC_ACTIVE_HIGH |
SOCAM_DATA_ACTIVE_HIGH, V4L2_MBUS_DATA_ACTIVE_HIGH,
.mbus_type = V4L2_MBUS_PARALLEL,
.set_capture = camera_set_capture, .set_capture = camera_set_capture,
}; };
...@@ -501,8 +502,7 @@ static struct i2c_board_info ap325rxa_i2c_camera[] = { ...@@ -501,8 +502,7 @@ static struct i2c_board_info ap325rxa_i2c_camera[] = {
}; };
static struct ov772x_camera_info ov7725_info = { static struct ov772x_camera_info ov7725_info = {
.flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP | \ .flags = OV772X_FLAG_VFLIP | OV772X_FLAG_HFLIP,
OV772X_FLAG_8BIT,
.edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0), .edgectrl = OV772X_AUTO_EDGECTRL(0xf, 0),
}; };
......
arch/sh/boards/mach-migor/setup.c
View file @ 1046a2c4
...@@ -448,9 +448,7 @@ static struct i2c_board_info migor_i2c_camera[] = { ...@@ -448,9 +448,7 @@ static struct i2c_board_info migor_i2c_camera[] = {
}, },
}; };
static struct ov772x_camera_info ov7725_info = { static struct ov772x_camera_info ov7725_info;
.flags = OV772X_FLAG_8BIT,
};
static struct soc_camera_link ov7725_link = { static struct soc_camera_link ov7725_link = {
.power = ov7725_power, .power = ov7725_power,
......
drivers/dma/ipu/ipu_idmac.c
View file @ 1046a2c4
...@@ -1307,6 +1307,7 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id) ...@@ -1307,6 +1307,7 @@ static irqreturn_t idmac_interrupt(int irq, void *dev_id)
ipu_submit_buffer(ichan, descnew, sgnew, ichan->active_buffer) < 0) { ipu_submit_buffer(ichan, descnew, sgnew, ichan->active_buffer) < 0) {
callback = descnew->txd.callback; callback = descnew->txd.callback;
callback_param = descnew->txd.callback_param; callback_param = descnew->txd.callback_param;
list_del_init(&descnew->list);
spin_unlock(&ichan->lock); spin_unlock(&ichan->lock);
if (callback) if (callback)
callback(callback_param); callback(callback_param);
...@@ -1428,39 +1429,58 @@ static int __idmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, ...@@ -1428,39 +1429,58 @@ static int __idmac_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
{ {
struct idmac_channel *ichan = to_idmac_chan(chan); struct idmac_channel *ichan = to_idmac_chan(chan);
struct idmac *idmac = to_idmac(chan->device); struct idmac *idmac = to_idmac(chan->device);
struct ipu *ipu = to_ipu(idmac);
struct list_head *list, *tmp;
unsigned long flags; unsigned long flags;
int i; int i;
/* Only supports DMA_TERMINATE_ALL */ switch (cmd) {
if (cmd != DMA_TERMINATE_ALL) case DMA_PAUSE:
return -ENXIO; spin_lock_irqsave(&ipu->lock, flags);
ipu_ic_disable_task(ipu, chan->chan_id);
ipu_disable_channel(idmac, ichan, /* Return all descriptors into "prepared" state */
ichan->status >= IPU_CHANNEL_ENABLED); list_for_each_safe(list, tmp, &ichan->queue)
list_del_init(list);
tasklet_disable(&to_ipu(idmac)->tasklet); ichan->sg[0] = NULL;
ichan->sg[1] = NULL;
/* ichan->queue is modified in ISR, have to spinlock */ spin_unlock_irqrestore(&ipu->lock, flags);
spin_lock_irqsave(&ichan->lock, flags);
list_splice_init(&ichan->queue, &ichan->free_list);
if (ichan->desc) ichan->status = IPU_CHANNEL_INITIALIZED;
for (i = 0; i < ichan->n_tx_desc; i++) { break;
struct idmac_tx_desc *desc = ichan->desc + i; case DMA_TERMINATE_ALL:
if (list_empty(&desc->list)) ipu_disable_channel(idmac, ichan,
/* Descriptor was prepared, but not submitted */ ichan->status >= IPU_CHANNEL_ENABLED);
list_add(&desc->list, &ichan->free_list);
async_tx_clear_ack(&desc->txd); tasklet_disable(&ipu->tasklet);
}
ichan->sg[0] = NULL; /* ichan->queue is modified in ISR, have to spinlock */
ichan->sg[1] = NULL; spin_lock_irqsave(&ichan->lock, flags);
spin_unlock_irqrestore(&ichan->lock, flags); list_splice_init(&ichan->queue, &ichan->free_list);
tasklet_enable(&to_ipu(idmac)->tasklet); if (ichan->desc)
for (i = 0; i < ichan->n_tx_desc; i++) {
struct idmac_tx_desc *desc = ichan->desc + i;
if (list_empty(&desc->list))
/* Descriptor was prepared, but not submitted */
list_add(&desc->list, &ichan->free_list);
ichan->status = IPU_CHANNEL_INITIALIZED; async_tx_clear_ack(&desc->txd);
}
ichan->sg[0] = NULL;
ichan->sg[1] = NULL;
spin_unlock_irqrestore(&ichan->lock, flags);
tasklet_enable(&ipu->tasklet);
ichan->status = IPU_CHANNEL_INITIALIZED;
break;
default:
return -ENOSYS;
}
return 0; return 0;
} }
...@@ -1663,7 +1683,6 @@ static void __exit ipu_idmac_exit(struct ipu *ipu) ...@@ -1663,7 +1683,6 @@ static void __exit ipu_idmac_exit(struct ipu *ipu)
struct idmac_channel *ichan = ipu->channel + i; struct idmac_channel *ichan = ipu->channel + i;
idmac_control(&ichan->dma_chan, DMA_TERMINATE_ALL, 0); idmac_control(&ichan->dma_chan, DMA_TERMINATE_ALL, 0);
idmac_prep_slave_sg(&ichan->dma_chan, NULL, 0, DMA_NONE, 0);
} }
dma_async_device_unregister(&idmac->dma); dma_async_device_unregister(&idmac->dma);
......
drivers/media/dvb/ddbridge/Makefile
View file @ 1046a2c4
...@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/ ...@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/ ccflags-y += -Idrivers/media/common/tuners/
# For the staging CI driver cxd2099 # For the staging CI driver cxd2099
ccflags-y += -Idrivers/staging/cxd2099/ ccflags-y += -Idrivers/staging/media/cxd2099/
drivers/media/dvb/dvb-usb/Makefile
View file @ 1046a2c4
...@@ -102,6 +102,7 @@ obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o ...@@ -102,6 +102,7 @@ obj-$(CONFIG_DVB_USB_IT913X) += dvb-usb-it913x.o
dvb-usb-mxl111sf-objs = mxl111sf.o mxl111sf-phy.o mxl111sf-i2c.o mxl111sf-gpio.o dvb-usb-mxl111sf-objs = mxl111sf.o mxl111sf-phy.o mxl111sf-i2c.o mxl111sf-gpio.o
obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o obj-$(CONFIG_DVB_USB_MXL111SF) += dvb-usb-mxl111sf.o
obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-demod.o
obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o obj-$(CONFIG_DVB_USB_MXL111SF) += mxl111sf-tuner.o
ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/ ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/
......
drivers/media/dvb/dvb-usb/dvb-usb-ids.h
View file @ 1046a2c4
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#define USB_VID_HAUPPAUGE 0x2040 #define USB_VID_HAUPPAUGE 0x2040
#define USB_VID_HYPER_PALTEK 0x1025 #define USB_VID_HYPER_PALTEK 0x1025
#define USB_VID_INTEL 0x8086 #define USB_VID_INTEL 0x8086
#define USB_VID_ITETECH 0x048d
#define USB_VID_KWORLD 0xeb2a #define USB_VID_KWORLD 0xeb2a
#define USB_VID_KWORLD_2 0x1b80 #define USB_VID_KWORLD_2 0x1b80
#define USB_VID_KYE 0x0458 #define USB_VID_KYE 0x0458
...@@ -126,6 +127,7 @@ ...@@ -126,6 +127,7 @@
#define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0 #define USB_PID_GRANDTEC_DVBT_USB_COLD 0x0fa0
#define USB_PID_GRANDTEC_DVBT_USB_WARM 0x0fa1 #define USB_PID_GRANDTEC_DVBT_USB_WARM 0x0fa1
#define USB_PID_INTEL_CE9500 0x9500 #define USB_PID_INTEL_CE9500 0x9500
#define USB_PID_ITETECH_IT9135 0x9135
#define USB_PID_KWORLD_399U 0xe399 #define USB_PID_KWORLD_399U 0xe399
#define USB_PID_KWORLD_399U_2 0xe400 #define USB_PID_KWORLD_399U_2 0xe400
#define USB_PID_KWORLD_395U 0xe396 #define USB_PID_KWORLD_395U 0xe396
......
drivers/media/dvb/dvb-usb/it913x.c
View file @ 1046a2c4
...@@ -60,6 +60,17 @@ struct it913x_state { ...@@ -60,6 +60,17 @@ struct it913x_state {
u8 id; u8 id;
}; };
struct ite_config {
u8 chip_ver;
u16 chip_type;
u32 firmware;
u8 tuner_id_0;
u8 tuner_id_1;
u8 dual_mode;
};
struct ite_config it913x_config;
static int it913x_bulk_write(struct usb_device *dev, static int it913x_bulk_write(struct usb_device *dev,
u8 *snd, int len, u8 pipe) u8 *snd, int len, u8 pipe)
{ {
...@@ -191,18 +202,23 @@ static int it913x_read_reg(struct usb_device *udev, u32 reg) ...@@ -191,18 +202,23 @@ static int it913x_read_reg(struct usb_device *udev, u32 reg)
static u32 it913x_query(struct usb_device *udev, u8 pro) static u32 it913x_query(struct usb_device *udev, u8 pro)
{ {
int ret; int ret;
u32 res = 0;
u8 data[4]; u8 data[4];
ret = it913x_io(udev, READ_LONG, pro, CMD_DEMOD_READ, ret = it913x_io(udev, READ_LONG, pro, CMD_DEMOD_READ,
0x1222, 0, &data[0], 1); 0x1222, 0, &data[0], 3);
if (data[0] == 0x1) {
ret = it913x_io(udev, READ_SHORT, pro, it913x_config.chip_ver = data[0];
it913x_config.chip_type = (u16)(data[2] << 8) + data[1];
info("Chip Version=%02x Chip Type=%04x", it913x_config.chip_ver,
it913x_config.chip_type);
ret |= it913x_io(udev, READ_SHORT, pro,
CMD_QUERYINFO, 0, 0x1, &data[0], 4); CMD_QUERYINFO, 0, 0x1, &data[0], 4);
res = (data[0] << 24) + (data[1] << 16) +
it913x_config.firmware = (data[0] << 24) + (data[1] << 16) +
(data[2] << 8) + data[3]; (data[2] << 8) + data[3];
}
return (ret < 0) ? 0 : res; return (ret < 0) ? 0 : it913x_config.firmware;
} }
static int it913x_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff) static int it913x_pid_filter_ctrl(struct dvb_usb_adapter *adap, int onoff)
...@@ -336,26 +352,35 @@ static int it913x_identify_state(struct usb_device *udev, ...@@ -336,26 +352,35 @@ static int it913x_identify_state(struct usb_device *udev,
int *cold) int *cold)
{ {
int ret = 0, firm_no; int ret = 0, firm_no;
u8 reg, adap, ep, tun0, tun1; u8 reg, remote;
firm_no = it913x_return_status(udev); firm_no = it913x_return_status(udev);
ep = it913x_read_reg(udev, 0x49ac); /* checnk for dual mode */
adap = it913x_read_reg(udev, 0x49c5); it913x_config.dual_mode = it913x_read_reg(udev, 0x49c5);
tun0 = it913x_read_reg(udev, 0x49d0);
info("No. Adapters=%x Endpoints=%x Tuner Type=%x", adap, ep, tun0); /* TODO different remotes */
remote = it913x_read_reg(udev, 0x49ac); /* Remote */
if (remote == 0)
props->rc.core.rc_codes = NULL;
/* TODO at the moment tuner_id is always assigned to 0x38 */
it913x_config.tuner_id_0 = it913x_read_reg(udev, 0x49d0);
info("Dual mode=%x Remote=%x Tuner Type=%x", it913x_config.dual_mode
, remote, it913x_config.tuner_id_0);
if (firm_no > 0) { if (firm_no > 0) {
*cold = 0; *cold = 0;
return 0; return 0;
} }
if (adap > 2) { if (it913x_config.dual_mode) {
tun1 = it913x_read_reg(udev, 0x49e0); it913x_config.tuner_id_1 = it913x_read_reg(udev, 0x49e0);
ret = it913x_wr_reg(udev, DEV_0, GPIOH1_EN, 0x1); ret = it913x_wr_reg(udev, DEV_0, GPIOH1_EN, 0x1);
ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_ON, 0x1); ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_ON, 0x1);
ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_O, 0x1); ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_O, 0x1);
msleep(50); /* Delay noticed reset cycle ? */ msleep(50);
ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_O, 0x0); ret |= it913x_wr_reg(udev, DEV_0, GPIOH1_O, 0x0);
msleep(50); msleep(50);
reg = it913x_read_reg(udev, GPIOH1_O); reg = it913x_read_reg(udev, GPIOH1_O);
...@@ -366,14 +391,19 @@ static int it913x_identify_state(struct usb_device *udev, ...@@ -366,14 +391,19 @@ static int it913x_identify_state(struct usb_device *udev,
ret = it913x_wr_reg(udev, DEV_0, ret = it913x_wr_reg(udev, DEV_0,
GPIOH1_O, 0x0); GPIOH1_O, 0x0);
} }
props->num_adapters = 2;
} else } else
props->num_adapters = 1; props->num_adapters = 1;
reg = it913x_read_reg(udev, IO_MUX_POWER_CLK); reg = it913x_read_reg(udev, IO_MUX_POWER_CLK);
ret |= it913x_wr_reg(udev, DEV_0, 0x4bfb, CHIP2_I2C_ADDR); if (it913x_config.dual_mode) {
ret |= it913x_wr_reg(udev, DEV_0, 0x4bfb, CHIP2_I2C_ADDR);
ret |= it913x_wr_reg(udev, DEV_0, CLK_O_EN, 0x1); ret |= it913x_wr_reg(udev, DEV_0, CLK_O_EN, 0x1);
} else {
ret |= it913x_wr_reg(udev, DEV_0, 0x4bfb, 0x0);
ret |= it913x_wr_reg(udev, DEV_0, CLK_O_EN, 0x0);
}
*cold = 1; *cold = 1;
...@@ -403,13 +433,11 @@ static int it913x_download_firmware(struct usb_device *udev, ...@@ -403,13 +433,11 @@ static int it913x_download_firmware(struct usb_device *udev,
const struct firmware *fw) const struct firmware *fw)
{ {
int ret = 0, i; int ret = 0, i;
u8 packet_size, dlen, tun1; u8 packet_size, dlen;
u8 *fw_data; u8 *fw_data;
packet_size = 0x29; packet_size = 0x29;
tun1 = it913x_read_reg(udev, 0x49e0);
ret = it913x_wr_reg(udev, DEV_0, I2C_CLK, I2C_CLK_100); ret = it913x_wr_reg(udev, DEV_0, I2C_CLK, I2C_CLK_100);
info("FRM Starting Firmware Download"); info("FRM Starting Firmware Download");
...@@ -444,11 +472,12 @@ static int it913x_download_firmware(struct usb_device *udev, ...@@ -444,11 +472,12 @@ static int it913x_download_firmware(struct usb_device *udev,
ret |= it913x_wr_reg(udev, DEV_0, I2C_CLK, I2C_CLK_400); ret |= it913x_wr_reg(udev, DEV_0, I2C_CLK, I2C_CLK_400);
/* Tuner function */ /* Tuner function */
ret |= it913x_wr_reg(udev, DEV_0_DMOD , 0xec4c, 0xa0); if (it913x_config.dual_mode)
ret |= it913x_wr_reg(udev, DEV_0_DMOD , 0xec4c, 0xa0);
ret |= it913x_wr_reg(udev, DEV_0, PADODPU, 0x0); ret |= it913x_wr_reg(udev, DEV_0, PADODPU, 0x0);
ret |= it913x_wr_reg(udev, DEV_0, AGC_O_D, 0x0); ret |= it913x_wr_reg(udev, DEV_0, AGC_O_D, 0x0);
if (tun1 > 0) { if (it913x_config.dual_mode) {
ret |= it913x_wr_reg(udev, DEV_1, PADODPU, 0x0); ret |= it913x_wr_reg(udev, DEV_1, PADODPU, 0x0);
ret |= it913x_wr_reg(udev, DEV_1, AGC_O_D, 0x0); ret |= it913x_wr_reg(udev, DEV_1, AGC_O_D, 0x0);
} }
...@@ -475,9 +504,28 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -475,9 +504,28 @@ static int it913x_frontend_attach(struct dvb_usb_adapter *adap)
u8 adf = it913x_read_reg(udev, IO_MUX_POWER_CLK); u8 adf = it913x_read_reg(udev, IO_MUX_POWER_CLK);
u8 adap_addr = I2C_BASE_ADDR + (adap->id << 5); u8 adap_addr = I2C_BASE_ADDR + (adap->id << 5);
u16 ep_size = adap->props.fe[0].stream.u.bulk.buffersize; u16 ep_size = adap->props.fe[0].stream.u.bulk.buffersize;
u8 tuner_id, tuner_type;
if (adap->id == 0)
tuner_id = it913x_config.tuner_id_0;
else
tuner_id = it913x_config.tuner_id_1;
/* TODO we always use IT9137 possible references here*/
/* Documentation suggests don't care */
switch (tuner_id) {
case 0x51:
case 0x52:
case 0x60:
case 0x61:
case 0x62:
default:
case 0x38:
tuner_type = IT9137;
}
adap->fe_adap[0].fe = dvb_attach(it913x_fe_attach, adap->fe_adap[0].fe = dvb_attach(it913x_fe_attach,
&adap->dev->i2c_adap, adap_addr, adf, IT9137); &adap->dev->i2c_adap, adap_addr, adf, tuner_type);
if (adap->id == 0 && adap->fe_adap[0].fe) { if (adap->id == 0 && adap->fe_adap[0].fe) {
ret = it913x_wr_reg(udev, DEV_0_DMOD, MP2_SW_RST, 0x1); ret = it913x_wr_reg(udev, DEV_0_DMOD, MP2_SW_RST, 0x1);
...@@ -533,6 +581,7 @@ static int it913x_probe(struct usb_interface *intf, ...@@ -533,6 +581,7 @@ static int it913x_probe(struct usb_interface *intf,
static struct usb_device_id it913x_table[] = { static struct usb_device_id it913x_table[] = {
{ USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB499_2T_T09) }, { USB_DEVICE(USB_VID_KWORLD_2, USB_PID_KWORLD_UB499_2T_T09) },
{ USB_DEVICE(USB_VID_ITETECH, USB_PID_ITETECH_IT9135) },
{} /* Terminating entry */ {} /* Terminating entry */
}; };
...@@ -608,12 +657,14 @@ static struct dvb_usb_device_properties it913x_properties = { ...@@ -608,12 +657,14 @@ static struct dvb_usb_device_properties it913x_properties = {
.rc_codes = RC_MAP_KWORLD_315U, .rc_codes = RC_MAP_KWORLD_315U,
}, },
.i2c_algo = &it913x_i2c_algo, .i2c_algo = &it913x_i2c_algo,
.num_device_descs = 1, .num_device_descs = 2,
.devices = { .devices = {
{ "Kworld UB499-2T T09(IT9137)", { "Kworld UB499-2T T09(IT9137)",
{ &it913x_table[0], NULL }, { &it913x_table[0], NULL },
}, },
{ "ITE 9135 Generic",
{ &it913x_table[1], NULL },
},
} }
}; };
...@@ -647,5 +698,5 @@ module_exit(it913x_module_exit); ...@@ -647,5 +698,5 @@ module_exit(it913x_module_exit);
MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>"); MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
MODULE_DESCRIPTION("it913x USB 2 Driver"); MODULE_DESCRIPTION("it913x USB 2 Driver");
MODULE_VERSION("1.06"); MODULE_VERSION("1.07");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
drivers/media/dvb/dvb-usb/mxl111sf-demod.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/media/dvb/dvb-usb/mxl111sf-demod.h 0 → 100644
View file @ 1046a2c4
/*
* mxl111sf-demod.h - driver for the MaxLinear MXL111SF DVB-T demodulator
*
* Copyright (C) 2010 Michael Krufky <mkrufky@kernellabs.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __MXL111SF_DEMOD_H__
#define __MXL111SF_DEMOD_H__
#include "dvb_frontend.h"
#include "mxl111sf.h"
struct mxl111sf_demod_config {
int (*read_reg)(struct mxl111sf_state *state, u8 addr, u8 *data);
int (*write_reg)(struct mxl111sf_state *state, u8 addr, u8 data);
int (*program_regs)(struct mxl111sf_state *state,
struct mxl111sf_reg_ctrl_info *ctrl_reg_info);
};
#if defined(CONFIG_DVB_USB_MXL111SF) || \
(defined(CONFIG_DVB_USB_MXL111SF_MODULE) && defined(MODULE))
extern
struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state,
struct mxl111sf_demod_config *cfg);
#else
static inline
struct dvb_frontend *mxl111sf_demod_attach(struct mxl111sf_state *mxl_state,
struct mxl111sf_demod_config *cfg)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return NULL;
}
#endif /* CONFIG_DVB_USB_MXL111SF */
#endif /* __MXL111SF_DEMOD_H__ */
/*
* Local variables:
* c-basic-offset: 8
* End:
*/
drivers/media/dvb/dvb-usb/mxl111sf.c
View file @ 1046a2c4
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "mxl111sf-i2c.h" #include "mxl111sf-i2c.h"
#include "mxl111sf-gpio.h" #include "mxl111sf-gpio.h"
#include "mxl111sf-demod.h"
#include "mxl111sf-tuner.h" #include "mxl111sf-tuner.h"
#include "lgdt3305.h" #include "lgdt3305.h"
...@@ -362,6 +363,22 @@ static int mxl111sf_ep6_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff) ...@@ -362,6 +363,22 @@ static int mxl111sf_ep6_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
return ret; return ret;
} }
static int mxl111sf_ep4_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
{
struct dvb_usb_device *d = adap->dev;
struct mxl111sf_state *state = d->priv;
int ret = 0;
deb_info("%s(%d)\n", __func__, onoff);
if (onoff) {
ret = mxl111sf_enable_usb_output(state);
mxl_fail(ret);
}
return ret;
}
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
static struct lgdt3305_config hauppauge_lgdt3305_config = { static struct lgdt3305_config hauppauge_lgdt3305_config = {
...@@ -438,6 +455,70 @@ static int mxl111sf_lgdt3305_frontend_attach(struct dvb_usb_adapter *adap) ...@@ -438,6 +455,70 @@ static int mxl111sf_lgdt3305_frontend_attach(struct dvb_usb_adapter *adap)
return ret; return ret;
} }
static struct mxl111sf_demod_config mxl_demod_config = {
.read_reg = mxl111sf_read_reg,
.write_reg = mxl111sf_write_reg,
.program_regs = mxl111sf_ctrl_program_regs,
};
static int mxl111sf_attach_demod(struct dvb_usb_adapter *adap)
{
struct dvb_usb_device *d = adap->dev;
struct mxl111sf_state *state = d->priv;
int fe_id = adap->num_frontends_initialized;
struct mxl111sf_adap_state *adap_state = adap->fe_adap[fe_id].priv;
int ret;
deb_adv("%s()\n", __func__);
/* save a pointer to the dvb_usb_device in device state */
state->d = d;
adap_state->alt_mode = (dvb_usb_mxl111sf_isoc) ? 1 : 2;
state->alt_mode = adap_state->alt_mode;
if (usb_set_interface(adap->dev->udev, 0, state->alt_mode) < 0)
err("set interface failed");
state->gpio_mode = MXL111SF_GPIO_MOD_DVBT;
adap_state->gpio_mode = state->gpio_mode;
adap_state->device_mode = MXL_SOC_MODE;
adap_state->ep6_clockphase = 1;
ret = mxl1x1sf_soft_reset(state);
if (mxl_fail(ret))
goto fail;
ret = mxl111sf_init_tuner_demod(state);
if (mxl_fail(ret))
goto fail;
ret = mxl1x1sf_set_device_mode(state, adap_state->device_mode);
if (mxl_fail(ret))
goto fail;
ret = mxl111sf_enable_usb_output(state);
if (mxl_fail(ret))
goto fail;
ret = mxl1x1sf_top_master_ctrl(state, 1);
if (mxl_fail(ret))
goto fail;
/* dont care if this fails */
mxl111sf_init_port_expander(state);
adap->fe_adap[fe_id].fe = dvb_attach(mxl111sf_demod_attach, state,
&mxl_demod_config);
if (adap->fe_adap[fe_id].fe) {
adap_state->fe_init = adap->fe_adap[fe_id].fe->ops.init;
adap->fe_adap[fe_id].fe->ops.init = mxl111sf_adap_fe_init;
adap_state->fe_sleep = adap->fe_adap[fe_id].fe->ops.sleep;
adap->fe_adap[fe_id].fe->ops.sleep = mxl111sf_adap_fe_sleep;
return 0;
}
ret = -EIO;
fail:
return ret;
}
static inline int mxl111sf_set_ant_path(struct mxl111sf_state *state, static inline int mxl111sf_set_ant_path(struct mxl111sf_state *state,
int antpath) int antpath)
{ {
...@@ -567,7 +648,8 @@ struct i2c_algorithm mxl111sf_i2c_algo = { ...@@ -567,7 +648,8 @@ struct i2c_algorithm mxl111sf_i2c_algo = {
#endif #endif
}; };
/* DVB USB Driver stuff */ static struct dvb_usb_device_properties mxl111sf_dvbt_bulk_properties;
static struct dvb_usb_device_properties mxl111sf_dvbt_isoc_properties;
static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties; static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties;
static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties; static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties;
...@@ -580,8 +662,14 @@ static int mxl111sf_probe(struct usb_interface *intf, ...@@ -580,8 +662,14 @@ static int mxl111sf_probe(struct usb_interface *intf,
if (((dvb_usb_mxl111sf_isoc) && if (((dvb_usb_mxl111sf_isoc) &&
(0 == dvb_usb_device_init(intf, (0 == dvb_usb_device_init(intf,
&mxl111sf_dvbt_isoc_properties,
THIS_MODULE, &d, adapter_nr) ||
0 == dvb_usb_device_init(intf,
&mxl111sf_atsc_isoc_properties, &mxl111sf_atsc_isoc_properties,
THIS_MODULE, &d, adapter_nr))) || THIS_MODULE, &d, adapter_nr))) ||
0 == dvb_usb_device_init(intf,
&mxl111sf_dvbt_bulk_properties,
THIS_MODULE, &d, adapter_nr) ||
0 == dvb_usb_device_init(intf, 0 == dvb_usb_device_init(intf,
&mxl111sf_atsc_bulk_properties, &mxl111sf_atsc_bulk_properties,
THIS_MODULE, &d, adapter_nr) || 0) { THIS_MODULE, &d, adapter_nr) || 0) {
...@@ -669,6 +757,36 @@ static struct usb_device_id mxl111sf_table[] = { ...@@ -669,6 +757,36 @@ static struct usb_device_id mxl111sf_table[] = {
MODULE_DEVICE_TABLE(usb, mxl111sf_table); MODULE_DEVICE_TABLE(usb, mxl111sf_table);
#define MXL111SF_EP4_BULK_STREAMING_CONFIG \
.streaming_ctrl = mxl111sf_ep4_streaming_ctrl, \
.stream = { \
.type = USB_BULK, \
.count = 5, \
.endpoint = 0x04, \
.u = { \
.bulk = { \
.buffersize = 8192, \
} \
} \
}
/* FIXME: works for v6 but not v8 silicon */
#define MXL111SF_EP4_ISOC_STREAMING_CONFIG \
.streaming_ctrl = mxl111sf_ep4_streaming_ctrl, \
.stream = { \
.type = USB_ISOC, \
.count = 5, \
.endpoint = 0x04, \
.u = { \
.isoc = { \
.framesperurb = 96, \
/* FIXME: v6 SILICON: */ \
.framesize = 564, \
.interval = 1, \
} \
} \
}
#define MXL111SF_EP6_BULK_STREAMING_CONFIG \ #define MXL111SF_EP6_BULK_STREAMING_CONFIG \
.streaming_ctrl = mxl111sf_ep6_streaming_ctrl, \ .streaming_ctrl = mxl111sf_ep6_streaming_ctrl, \
.stream = { \ .stream = { \
...@@ -712,7 +830,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table); ...@@ -712,7 +830,7 @@ MODULE_DEVICE_TABLE(usb, mxl111sf_table);
.generic_bulk_ctrl_endpoint_response = MXL_EP1_REG_READ, \ .generic_bulk_ctrl_endpoint_response = MXL_EP1_REG_READ, \
.size_of_priv = sizeof(struct mxl111sf_state) .size_of_priv = sizeof(struct mxl111sf_state)
static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = { static struct dvb_usb_device_properties mxl111sf_dvbt_bulk_properties = {
MXL111SF_DEFAULT_DEVICE_PROPERTIES, MXL111SF_DEFAULT_DEVICE_PROPERTIES,
.num_adapters = 1, .num_adapters = 1,
...@@ -723,10 +841,106 @@ static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = { ...@@ -723,10 +841,106 @@ static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = {
.fe = {{ .fe = {{
.size_of_priv = sizeof(struct mxl111sf_adap_state), .size_of_priv = sizeof(struct mxl111sf_adap_state),
.frontend_attach = mxl111sf_attach_demod,
.tuner_attach = mxl111sf_attach_tuner,
MXL111SF_EP4_BULK_STREAMING_CONFIG,
} },
},
},
.num_device_descs = 4,
.devices = {
{ "Hauppauge 126xxx DVBT (bulk)",
{ NULL },
{ &mxl111sf_table[4], &mxl111sf_table[8],
NULL },
},
{ "Hauppauge 117xxx DVBT (bulk)",
{ NULL },
{ &mxl111sf_table[15], &mxl111sf_table[18],
NULL },
},
{ "Hauppauge 138xxx DVBT (bulk)",
{ NULL },
{ &mxl111sf_table[20], &mxl111sf_table[22],
&mxl111sf_table[24], &mxl111sf_table[26],
NULL },
},
{ "Hauppauge 126xxx (tp-bulk)",
{ NULL },
{ &mxl111sf_table[28], &mxl111sf_table[30],
NULL },
},
}
};
static struct dvb_usb_device_properties mxl111sf_dvbt_isoc_properties = {
MXL111SF_DEFAULT_DEVICE_PROPERTIES,
.num_adapters = 1,
.adapter = {
{
.fe_ioctl_override = mxl111sf_fe_ioctl_override,
.num_frontends = 1,
.fe = {{
.size_of_priv = sizeof(struct mxl111sf_adap_state),
.frontend_attach = mxl111sf_attach_demod,
.tuner_attach = mxl111sf_attach_tuner,
MXL111SF_EP4_ISOC_STREAMING_CONFIG,
} },
},
},
.num_device_descs = 4,
.devices = {
{ "Hauppauge 126xxx DVBT (isoc)",
{ NULL },
{ &mxl111sf_table[4], &mxl111sf_table[8],
NULL },
},
{ "Hauppauge 117xxx DVBT (isoc)",
{ NULL },
{ &mxl111sf_table[15], &mxl111sf_table[18],
NULL },
},
{ "Hauppauge 138xxx DVBT (isoc)",
{ NULL },
{ &mxl111sf_table[20], &mxl111sf_table[22],
&mxl111sf_table[24], &mxl111sf_table[26],
NULL },
},
{ "Hauppauge 126xxx (tp-isoc)",
{ NULL },
{ &mxl111sf_table[28], &mxl111sf_table[30],
NULL },
},
}
};
static struct dvb_usb_device_properties mxl111sf_atsc_bulk_properties = {
MXL111SF_DEFAULT_DEVICE_PROPERTIES,
.num_adapters = 1,
.adapter = {
{
.fe_ioctl_override = mxl111sf_fe_ioctl_override,
.num_frontends = 2,
.fe = {{
.size_of_priv = sizeof(struct mxl111sf_adap_state),
.frontend_attach = mxl111sf_lgdt3305_frontend_attach, .frontend_attach = mxl111sf_lgdt3305_frontend_attach,
.tuner_attach = mxl111sf_attach_tuner, .tuner_attach = mxl111sf_attach_tuner,
MXL111SF_EP6_BULK_STREAMING_CONFIG, MXL111SF_EP6_BULK_STREAMING_CONFIG,
},
{
.size_of_priv = sizeof(struct mxl111sf_adap_state),
.frontend_attach = mxl111sf_attach_demod,
.tuner_attach = mxl111sf_attach_tuner,
MXL111SF_EP4_BULK_STREAMING_CONFIG,
}}, }},
}, },
}, },
...@@ -776,7 +990,7 @@ static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties = { ...@@ -776,7 +990,7 @@ static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties = {
.adapter = { .adapter = {
{ {
.fe_ioctl_override = mxl111sf_fe_ioctl_override, .fe_ioctl_override = mxl111sf_fe_ioctl_override,
.num_frontends = 1, .num_frontends = 2,
.fe = {{ .fe = {{
.size_of_priv = sizeof(struct mxl111sf_adap_state), .size_of_priv = sizeof(struct mxl111sf_adap_state),
...@@ -784,6 +998,14 @@ static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties = { ...@@ -784,6 +998,14 @@ static struct dvb_usb_device_properties mxl111sf_atsc_isoc_properties = {
.tuner_attach = mxl111sf_attach_tuner, .tuner_attach = mxl111sf_attach_tuner,
MXL111SF_EP6_ISOC_STREAMING_CONFIG, MXL111SF_EP6_ISOC_STREAMING_CONFIG,
},
{
.size_of_priv = sizeof(struct mxl111sf_adap_state),
.frontend_attach = mxl111sf_attach_demod,
.tuner_attach = mxl111sf_attach_tuner,
MXL111SF_EP4_ISOC_STREAMING_CONFIG,
}}, }},
}, },
}, },
......
drivers/media/dvb/dvb-usb/mxl111sf.h
View file @ 1046a2c4
...@@ -133,7 +133,7 @@ extern int dvb_usb_mxl111sf_debug; ...@@ -133,7 +133,7 @@ extern int dvb_usb_mxl111sf_debug;
/* The following allows the mxl_fail() macro defined below to work /* The following allows the mxl_fail() macro defined below to work
* in externel modules, such as mxl111sf-tuner.ko, even though * in externel modules, such as mxl111sf-tuner.ko, even though
* dvb_usb_mxl111sf_debug is not defined within those modules */ * dvb_usb_mxl111sf_debug is not defined within those modules */
#ifdef __MXL111SF_TUNER_H__ #if (defined(__MXL111SF_TUNER_H__)) || (defined(__MXL111SF_DEMOD_H__))
#define MXL_ADV_DEBUG_ENABLED MXL_ADV_DBG #define MXL_ADV_DEBUG_ENABLED MXL_ADV_DBG
#else #else
#define MXL_ADV_DEBUG_ENABLED dvb_usb_mxl111sf_debug #define MXL_ADV_DEBUG_ENABLED dvb_usb_mxl111sf_debug
......
drivers/media/dvb/ngene/Makefile
View file @ 1046a2c4
...@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/ ...@@ -11,4 +11,4 @@ ccflags-y += -Idrivers/media/dvb/frontends/
ccflags-y += -Idrivers/media/common/tuners/ ccflags-y += -Idrivers/media/common/tuners/
# For the staging CI driver cxd2099 # For the staging CI driver cxd2099
ccflags-y += -Idrivers/staging/cxd2099/ ccflags-y += -Idrivers/staging/media/cxd2099/
drivers/media/radio/radio-tea5764.c
View file @ 1046a2c4
...@@ -128,8 +128,10 @@ struct tea5764_write_regs { ...@@ -128,8 +128,10 @@ struct tea5764_write_regs {
u16 rdsbbl; /* PAUSEDET & RDSBBL */ u16 rdsbbl; /* PAUSEDET & RDSBBL */
} __attribute__ ((packed)); } __attribute__ ((packed));
#ifndef RADIO_TEA5764_XTAL #ifdef CONFIG_RADIO_TEA5764_XTAL
#define RADIO_TEA5764_XTAL 1 #define RADIO_TEA5764_XTAL 1
#else
#define RADIO_TEA5764_XTAL 0
#endif #endif
static int radio_nr = -1; static int radio_nr = -1;
......
drivers/media/video/Kconfig
View file @ 1046a2c4
...@@ -517,6 +517,13 @@ config VIDEO_NOON010PC30 ...@@ -517,6 +517,13 @@ config VIDEO_NOON010PC30
source "drivers/media/video/m5mols/Kconfig" source "drivers/media/video/m5mols/Kconfig"
config VIDEO_S5K6AA
tristate "Samsung S5K6AAFX sensor support"
depends on I2C && VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API
---help---
This is a V4L2 sensor-level driver for Samsung S5K6AA(FX) 1.3M
camera sensor with an embedded SoC image signal processor.
comment "Flash devices" comment "Flash devices"
config VIDEO_ADP1653 config VIDEO_ADP1653
...@@ -736,6 +743,8 @@ source "drivers/media/video/cx88/Kconfig" ...@@ -736,6 +743,8 @@ source "drivers/media/video/cx88/Kconfig"
source "drivers/media/video/cx23885/Kconfig" source "drivers/media/video/cx23885/Kconfig"
source "drivers/media/video/cx25821/Kconfig"
source "drivers/media/video/au0828/Kconfig" source "drivers/media/video/au0828/Kconfig"
source "drivers/media/video/ivtv/Kconfig" source "drivers/media/video/ivtv/Kconfig"
......
drivers/media/video/Makefile
View file @ 1046a2c4
...@@ -72,6 +72,7 @@ obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o ...@@ -72,6 +72,7 @@ obj-$(CONFIG_VIDEO_MT9V032) += mt9v032.o
obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o obj-$(CONFIG_VIDEO_SR030PC30) += sr030pc30.o
obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o obj-$(CONFIG_VIDEO_NOON010PC30) += noon010pc30.o
obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/ obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/
obj-$(CONFIG_VIDEO_S5K6AA) += s5k6aa.o
obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o obj-$(CONFIG_VIDEO_ADP1653) += adp1653.o
obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o obj-$(CONFIG_SOC_CAMERA_IMX074) += imx074.o
...@@ -104,6 +105,7 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/ ...@@ -104,6 +105,7 @@ obj-$(CONFIG_VIDEO_CX88) += cx88/
obj-$(CONFIG_VIDEO_EM28XX) += em28xx/ obj-$(CONFIG_VIDEO_EM28XX) += em28xx/
obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/ obj-$(CONFIG_VIDEO_TLG2300) += tlg2300/
obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/ obj-$(CONFIG_VIDEO_CX231XX) += cx231xx/
obj-$(CONFIG_VIDEO_CX25821) += cx25821/
obj-$(CONFIG_VIDEO_USBVISION) += usbvision/ obj-$(CONFIG_VIDEO_USBVISION) += usbvision/
obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/ obj-$(CONFIG_VIDEO_PVRUSB2) += pvrusb2/
obj-$(CONFIG_VIDEO_CPIA2) += cpia2/ obj-$(CONFIG_VIDEO_CPIA2) += cpia2/
......
drivers/media/video/atmel-isi.c
View file @ 1046a2c4
...@@ -94,6 +94,7 @@ struct atmel_isi { ...@@ -94,6 +94,7 @@ struct atmel_isi {
unsigned int irq; unsigned int irq;
struct isi_platform_data *pdata; struct isi_platform_data *pdata;
u16 width_flags; /* max 12 bits */
struct list_head video_buffer_list; struct list_head video_buffer_list;
struct frame_buffer *active; struct frame_buffer *active;
...@@ -248,9 +249,9 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset) ...@@ -248,9 +249,9 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset)
/* ------------------------------------------------------------------ /* ------------------------------------------------------------------
Videobuf operations Videobuf operations
------------------------------------------------------------------*/ ------------------------------------------------------------------*/
static int queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, static int queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
unsigned int *nplanes, unsigned int sizes[], unsigned int *nbuffers, unsigned int *nplanes,
void *alloc_ctxs[]) unsigned int sizes[], void *alloc_ctxs[])
{ {
struct soc_camera_device *icd = soc_camera_from_vb2q(vq); struct soc_camera_device *icd = soc_camera_from_vb2q(vq);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
...@@ -647,50 +648,42 @@ static bool isi_camera_packing_supported(const struct soc_mbus_pixelfmt *fmt) ...@@ -647,50 +648,42 @@ static bool isi_camera_packing_supported(const struct soc_mbus_pixelfmt *fmt)
fmt->packing == SOC_MBUS_PACKING_EXTEND16); fmt->packing == SOC_MBUS_PACKING_EXTEND16);
} }
static unsigned long make_bus_param(struct atmel_isi *isi) #define ISI_BUS_PARAM (V4L2_MBUS_MASTER | \
{ V4L2_MBUS_HSYNC_ACTIVE_HIGH | \
unsigned long flags; V4L2_MBUS_HSYNC_ACTIVE_LOW | \
/* V4L2_MBUS_VSYNC_ACTIVE_HIGH | \
* Platform specified synchronization and pixel clock polarities are V4L2_MBUS_VSYNC_ACTIVE_LOW | \
* only a recommendation and are only used during probing. Atmel ISI V4L2_MBUS_PCLK_SAMPLE_RISING | \
* camera interface only works in master mode, i.e., uses HSYNC and V4L2_MBUS_PCLK_SAMPLE_FALLING | \
* VSYNC signals from the sensor V4L2_MBUS_DATA_ACTIVE_HIGH)
*/
flags = SOCAM_MASTER |
SOCAM_HSYNC_ACTIVE_HIGH |
SOCAM_HSYNC_ACTIVE_LOW |
SOCAM_VSYNC_ACTIVE_HIGH |
SOCAM_VSYNC_ACTIVE_LOW |
SOCAM_PCLK_SAMPLE_RISING |
SOCAM_PCLK_SAMPLE_FALLING |
SOCAM_DATA_ACTIVE_HIGH;
if (isi->pdata->data_width_flags & ISI_DATAWIDTH_10)
flags |= SOCAM_DATAWIDTH_10;
if (isi->pdata->data_width_flags & ISI_DATAWIDTH_8)
flags |= SOCAM_DATAWIDTH_8;
if (flags & SOCAM_DATAWIDTH_MASK)
return flags;
return 0;
}
static int isi_camera_try_bus_param(struct soc_camera_device *icd, static int isi_camera_try_bus_param(struct soc_camera_device *icd,
unsigned char buswidth) unsigned char buswidth)
{ {
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct atmel_isi *isi = ici->priv; struct atmel_isi *isi = ici->priv;
unsigned long camera_flags; struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
unsigned long common_flags;
int ret; int ret;
camera_flags = icd->ops->query_bus_param(icd); ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
ret = soc_camera_bus_param_compatible(camera_flags, if (!ret) {
make_bus_param(isi)); common_flags = soc_mbus_config_compatible(&cfg,
if (!ret) ISI_BUS_PARAM);
return -EINVAL; if (!common_flags) {
return 0; dev_warn(icd->parent,
"Flags incompatible: camera 0x%x, host 0x%x\n",
cfg.flags, ISI_BUS_PARAM);
return -EINVAL;
}
} else if (ret != -ENOIOCTLCMD) {
return ret;
}
if ((1 << (buswidth - 1)) & isi->width_flags)
return 0;
return -EINVAL;
} }
...@@ -812,59 +805,71 @@ static int isi_camera_querycap(struct soc_camera_host *ici, ...@@ -812,59 +805,71 @@ static int isi_camera_querycap(struct soc_camera_host *ici,
static int isi_camera_set_bus_param(struct soc_camera_device *icd, u32 pixfmt) static int isi_camera_set_bus_param(struct soc_camera_device *icd, u32 pixfmt)
{ {
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct atmel_isi *isi = ici->priv; struct atmel_isi *isi = ici->priv;
unsigned long bus_flags, camera_flags, common_flags; struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
unsigned long common_flags;
int ret; int ret;
u32 cfg1 = 0; u32 cfg1 = 0;
camera_flags = icd->ops->query_bus_param(icd); ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
if (!ret) {
bus_flags = make_bus_param(isi); common_flags = soc_mbus_config_compatible(&cfg,
common_flags = soc_camera_bus_param_compatible(camera_flags, bus_flags); ISI_BUS_PARAM);
dev_dbg(icd->parent, "Flags cam: 0x%lx host: 0x%lx common: 0x%lx\n", if (!common_flags) {
camera_flags, bus_flags, common_flags); dev_warn(icd->parent,
if (!common_flags) "Flags incompatible: camera 0x%x, host 0x%x\n",
return -EINVAL; cfg.flags, ISI_BUS_PARAM);
return -EINVAL;
}
} else if (ret != -ENOIOCTLCMD) {
return ret;
} else {
common_flags = ISI_BUS_PARAM;
}
dev_dbg(icd->parent, "Flags cam: 0x%x host: 0x%x common: 0x%lx\n",
cfg.flags, ISI_BUS_PARAM, common_flags);
/* Make choises, based on platform preferences */ /* Make choises, based on platform preferences */
if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) && if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
(common_flags & SOCAM_HSYNC_ACTIVE_LOW)) { (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
if (isi->pdata->hsync_act_low) if (isi->pdata->hsync_act_low)
common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH; common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
else else
common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW; common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
} }
if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) && if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
(common_flags & SOCAM_VSYNC_ACTIVE_LOW)) { (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
if (isi->pdata->vsync_act_low) if (isi->pdata->vsync_act_low)
common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH; common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
else else
common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW; common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
} }
if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) && if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
(common_flags & SOCAM_PCLK_SAMPLE_FALLING)) { (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
if (isi->pdata->pclk_act_falling) if (isi->pdata->pclk_act_falling)
common_flags &= ~SOCAM_PCLK_SAMPLE_RISING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
else else
common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
} }
ret = icd->ops->set_bus_param(icd, common_flags); cfg.flags = common_flags;
if (ret < 0) { ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
dev_dbg(icd->parent, "Camera set_bus_param(%lx) returned %d\n", if (ret < 0 && ret != -ENOIOCTLCMD) {
dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
common_flags, ret); common_flags, ret);
return ret; return ret;
} }
/* set bus param for ISI */ /* set bus param for ISI */
if (common_flags & SOCAM_HSYNC_ACTIVE_LOW) if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)
cfg1 |= ISI_CFG1_HSYNC_POL_ACTIVE_LOW; cfg1 |= ISI_CFG1_HSYNC_POL_ACTIVE_LOW;
if (common_flags & SOCAM_VSYNC_ACTIVE_LOW) if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)
cfg1 |= ISI_CFG1_VSYNC_POL_ACTIVE_LOW; cfg1 |= ISI_CFG1_VSYNC_POL_ACTIVE_LOW;
if (common_flags & SOCAM_PCLK_SAMPLE_FALLING) if (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)
cfg1 |= ISI_CFG1_PIXCLK_POL_ACTIVE_FALLING; cfg1 |= ISI_CFG1_PIXCLK_POL_ACTIVE_FALLING;
if (isi->pdata->has_emb_sync) if (isi->pdata->has_emb_sync)
...@@ -983,6 +988,11 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev) ...@@ -983,6 +988,11 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
goto err_ioremap; goto err_ioremap;
} }
if (pdata->data_width_flags & ISI_DATAWIDTH_8)
isi->width_flags = 1 << 7;
if (pdata->data_width_flags & ISI_DATAWIDTH_10)
isi->width_flags |= 1 << 9;
isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS); isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS);
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
......
drivers/media/video/cx18/cx18-driver.c
View file @ 1046a2c4
...@@ -1085,6 +1085,8 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev, ...@@ -1085,6 +1085,8 @@ static int __devinit cx18_probe(struct pci_dev *pci_dev,
setup.addr = ADDR_UNSET; setup.addr = ADDR_UNSET;
setup.type = cx->options.tuner; setup.type = cx->options.tuner;
setup.mode_mask = T_ANALOG_TV; /* matches TV tuners */ setup.mode_mask = T_ANALOG_TV; /* matches TV tuners */
if (cx->options.radio > 0)
setup.mode_mask |= T_RADIO;
setup.tuner_callback = (setup.type == TUNER_XC2028) ? setup.tuner_callback = (setup.type == TUNER_XC2028) ?
cx18_reset_tuner_gpio : NULL; cx18_reset_tuner_gpio : NULL;
cx18_call_all(cx, tuner, s_type_addr, &setup); cx18_call_all(cx, tuner, s_type_addr, &setup);
......
drivers/staging/cx25821/cx25821-video.c → drivers/media/video/cx25821/cx25821-video.c
View file @ 1046a2c4
...@@ -1312,7 +1312,7 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i) ...@@ -1312,7 +1312,7 @@ int cx25821_vidioc_s_input(struct file *file, void *priv, unsigned int i)
return err; return err;
} }
if (i > 2) { if (i >= CX25821_NR_INPUT) {
dprintk(1, "%s(): -EINVAL\n", __func__); dprintk(1, "%s(): -EINVAL\n", __func__);
return -EINVAL; return -EINVAL;
} }
......
drivers/staging/cx25821/cx25821.h → drivers/media/video/cx25821/cx25821.h
View file @ 1046a2c4
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
#define CX25821_BOARD_CONEXANT_ATHENA10 1 #define CX25821_BOARD_CONEXANT_ATHENA10 1
#define MAX_VID_CHANNEL_NUM 12 #define MAX_VID_CHANNEL_NUM 12
#define VID_CHANNEL_NUM 8 #define VID_CHANNEL_NUM 8
#define CX25821_NR_INPUT 2
struct cx25821_fmt { struct cx25821_fmt {
char *name; char *name;
...@@ -196,7 +197,7 @@ struct cx25821_board { ...@@ -196,7 +197,7 @@ struct cx25821_board {
unsigned char radio_addr; unsigned char radio_addr;
u32 clk_freq; u32 clk_freq;
struct cx25821_input input[2]; struct cx25821_input input[CX25821_NR_INPUT];
}; };
struct cx25821_subid { struct cx25821_subid {
......
drivers/media/video/em28xx/em28xx-cards.c
View file @ 1046a2c4
...@@ -1923,6 +1923,8 @@ struct usb_device_id em28xx_id_table[] = { ...@@ -1923,6 +1923,8 @@ struct usb_device_id em28xx_id_table[] = {
.driver_info = EM2860_BOARD_TERRATEC_AV350 }, .driver_info = EM2860_BOARD_TERRATEC_AV350 },
{ USB_DEVICE(0x0ccd, 0x0096), { USB_DEVICE(0x0ccd, 0x0096),
.driver_info = EM2860_BOARD_TERRATEC_GRABBY }, .driver_info = EM2860_BOARD_TERRATEC_GRABBY },
{ USB_DEVICE(0x0ccd, 0x10AF),
.driver_info = EM2860_BOARD_TERRATEC_GRABBY },
{ USB_DEVICE(0x0fd9, 0x0033), { USB_DEVICE(0x0fd9, 0x0033),
.driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE}, .driver_info = EM2860_BOARD_ELGATO_VIDEO_CAPTURE},
{ USB_DEVICE(0x185b, 0x2870), { USB_DEVICE(0x185b, 0x2870),
......
drivers/media/video/imx074.c
View file @ 1046a2c4
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/v4l2-mediabus.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/videodev2.h> #include <linux/videodev2.h>
#include <media/soc_camera.h> #include <media/soc_camera.h>
#include <media/soc_mediabus.h>
#include <media/v4l2-subdev.h> #include <media/v4l2-subdev.h>
#include <media/v4l2-chip-ident.h> #include <media/v4l2-chip-ident.h>
...@@ -267,6 +267,17 @@ static int imx074_g_chip_ident(struct v4l2_subdev *sd, ...@@ -267,6 +267,17 @@ static int imx074_g_chip_ident(struct v4l2_subdev *sd,
return 0; return 0;
} }
static int imx074_g_mbus_config(struct v4l2_subdev *sd,
struct v4l2_mbus_config *cfg)
{
cfg->type = V4L2_MBUS_CSI2;
cfg->flags = V4L2_MBUS_CSI2_2_LANE |
V4L2_MBUS_CSI2_CHANNEL_0 |
V4L2_MBUS_CSI2_CONTINUOUS_CLOCK;
return 0;
}
static struct v4l2_subdev_video_ops imx074_subdev_video_ops = { static struct v4l2_subdev_video_ops imx074_subdev_video_ops = {
.s_stream = imx074_s_stream, .s_stream = imx074_s_stream,
.s_mbus_fmt = imx074_s_fmt, .s_mbus_fmt = imx074_s_fmt,
...@@ -275,6 +286,7 @@ static struct v4l2_subdev_video_ops imx074_subdev_video_ops = { ...@@ -275,6 +286,7 @@ static struct v4l2_subdev_video_ops imx074_subdev_video_ops = {
.enum_mbus_fmt = imx074_enum_fmt, .enum_mbus_fmt = imx074_enum_fmt,
.g_crop = imx074_g_crop, .g_crop = imx074_g_crop,
.cropcap = imx074_cropcap, .cropcap = imx074_cropcap,
.g_mbus_config = imx074_g_mbus_config,
}; };
static struct v4l2_subdev_core_ops imx074_subdev_core_ops = { static struct v4l2_subdev_core_ops imx074_subdev_core_ops = {
...@@ -286,28 +298,7 @@ static struct v4l2_subdev_ops imx074_subdev_ops = { ...@@ -286,28 +298,7 @@ static struct v4l2_subdev_ops imx074_subdev_ops = {
.video = &imx074_subdev_video_ops, .video = &imx074_subdev_video_ops,
}; };
/* static int imx074_video_probe(struct i2c_client *client)
* We have to provide soc-camera operations, but we don't have anything to say
* there. The MIPI CSI2 driver will provide .query_bus_param and .set_bus_param
*/
static unsigned long imx074_query_bus_param(struct soc_camera_device *icd)
{
return 0;
}
static int imx074_set_bus_param(struct soc_camera_device *icd,
unsigned long flags)
{
return -EINVAL;
}
static struct soc_camera_ops imx074_ops = {
.query_bus_param = imx074_query_bus_param,
.set_bus_param = imx074_set_bus_param,
};
static int imx074_video_probe(struct soc_camera_device *icd,
struct i2c_client *client)
{ {
int ret; int ret;
u16 id; u16 id;
...@@ -417,17 +408,10 @@ static int imx074_probe(struct i2c_client *client, ...@@ -417,17 +408,10 @@ static int imx074_probe(struct i2c_client *client,
const struct i2c_device_id *did) const struct i2c_device_id *did)
{ {
struct imx074 *priv; struct imx074 *priv;
struct soc_camera_device *icd = client->dev.platform_data;
struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent);
struct soc_camera_link *icl; struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
int ret; int ret;
if (!icd) {
dev_err(&client->dev, "IMX074: missing soc-camera data!\n");
return -EINVAL;
}
icl = to_soc_camera_link(icd);
if (!icl) { if (!icl) {
dev_err(&client->dev, "IMX074: missing platform data!\n"); dev_err(&client->dev, "IMX074: missing platform data!\n");
return -EINVAL; return -EINVAL;
...@@ -445,12 +429,10 @@ static int imx074_probe(struct i2c_client *client, ...@@ -445,12 +429,10 @@ static int imx074_probe(struct i2c_client *client,
v4l2_i2c_subdev_init(&priv->subdev, client, &imx074_subdev_ops); v4l2_i2c_subdev_init(&priv->subdev, client, &imx074_subdev_ops);
icd->ops = &imx074_ops;
priv->fmt = &imx074_colour_fmts[0]; priv->fmt = &imx074_colour_fmts[0];
ret = imx074_video_probe(icd, client); ret = imx074_video_probe(client);
if (ret < 0) { if (ret < 0) {
icd->ops = NULL;
kfree(priv); kfree(priv);
return ret; return ret;
} }
...@@ -461,10 +443,8 @@ static int imx074_probe(struct i2c_client *client, ...@@ -461,10 +443,8 @@ static int imx074_probe(struct i2c_client *client,
static int imx074_remove(struct i2c_client *client) static int imx074_remove(struct i2c_client *client)
{ {
struct imx074 *priv = to_imx074(client); struct imx074 *priv = to_imx074(client);
struct soc_camera_device *icd = client->dev.platform_data; struct soc_camera_link *icl = soc_camera_i2c_to_link(client);
struct soc_camera_link *icl = to_soc_camera_link(icd);
icd->ops = NULL;
if (icl->free_bus) if (icl->free_bus)
icl->free_bus(icl); icl->free_bus(icl);
kfree(priv); kfree(priv);
......
drivers/media/video/ivtv/ivtv-driver.c
View file @ 1046a2c4
...@@ -1180,6 +1180,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev, ...@@ -1180,6 +1180,8 @@ static int __devinit ivtv_probe(struct pci_dev *pdev,
setup.addr = ADDR_UNSET; setup.addr = ADDR_UNSET;
setup.type = itv->options.tuner; setup.type = itv->options.tuner;
setup.mode_mask = T_ANALOG_TV; /* matches TV tuners */ setup.mode_mask = T_ANALOG_TV; /* matches TV tuners */
if (itv->options.radio > 0)
setup.mode_mask |= T_RADIO;
setup.tuner_callback = (setup.type == TUNER_XC2028) ? setup.tuner_callback = (setup.type == TUNER_XC2028) ?
ivtv_reset_tuner_gpio : NULL; ivtv_reset_tuner_gpio : NULL;
ivtv_call_all(itv, tuner, s_type_addr, &setup); ivtv_call_all(itv, tuner, s_type_addr, &setup);
......
drivers/media/video/marvell-ccic/mcam-core.c
View file @ 1046a2c4
...@@ -883,7 +883,8 @@ static int mcam_read_setup(struct mcam_camera *cam) ...@@ -883,7 +883,8 @@ static int mcam_read_setup(struct mcam_camera *cam)
* Videobuf2 interface code. * Videobuf2 interface code.
*/ */
static int mcam_vb_queue_setup(struct vb2_queue *vq, unsigned int *nbufs, static int mcam_vb_queue_setup(struct vb2_queue *vq,
const struct v4l2_format *fmt, unsigned int *nbufs,
unsigned int *num_planes, unsigned int sizes[], unsigned int *num_planes, unsigned int sizes[],
void *alloc_ctxs[]) void *alloc_ctxs[])
{ {
......
drivers/media/video/mem2mem_testdev.c
View file @ 1046a2c4
...@@ -738,9 +738,10 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = { ...@@ -738,9 +738,10 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
* Queue operations * Queue operations
*/ */
static int m2mtest_queue_setup(struct vb2_queue *vq, unsigned int *nbuffers, static int m2mtest_queue_setup(struct vb2_queue *vq,
unsigned int *nplanes, unsigned int sizes[], const struct v4l2_format *fmt,
void *alloc_ctxs[]) unsigned int *nbuffers, unsigned int *nplanes,
unsigned int sizes[], void *alloc_ctxs[])
{ {
struct m2mtest_ctx *ctx = vb2_get_drv_priv(vq); struct m2mtest_ctx *ctx = vb2_get_drv_priv(vq);
struct m2mtest_q_data *q_data; struct m2mtest_q_data *q_data;
......
drivers/media/video/mt9m001.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/mt9m111.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/mt9t031.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/mt9t112.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/mt9v022.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/mx1_camera.c
View file @ 1046a2c4
...@@ -78,11 +78,10 @@ ...@@ -78,11 +78,10 @@
#define CSI_IRQ_MASK (CSISR_SFF_OR_INT | CSISR_RFF_OR_INT | \ #define CSI_IRQ_MASK (CSISR_SFF_OR_INT | CSISR_RFF_OR_INT | \
CSISR_STATFF_INT | CSISR_RXFF_INT | CSISR_SOF_INT) CSISR_STATFF_INT | CSISR_RXFF_INT | CSISR_SOF_INT)
#define CSI_BUS_FLAGS (SOCAM_MASTER | SOCAM_HSYNC_ACTIVE_HIGH | \ #define CSI_BUS_FLAGS (V4L2_MBUS_MASTER | V4L2_MBUS_HSYNC_ACTIVE_HIGH | \
SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW | \ V4L2_MBUS_VSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_LOW | \
SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING | \ V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING | \
SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW | \ V4L2_MBUS_DATA_ACTIVE_HIGH | V4L2_MBUS_DATA_ACTIVE_LOW)
SOCAM_DATAWIDTH_8)
#define MAX_VIDEO_MEM 16 /* Video memory limit in megabytes */ #define MAX_VIDEO_MEM 16 /* Video memory limit in megabytes */
...@@ -490,59 +489,73 @@ static int mx1_camera_set_crop(struct soc_camera_device *icd, ...@@ -490,59 +489,73 @@ static int mx1_camera_set_crop(struct soc_camera_device *icd,
static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt) static int mx1_camera_set_bus_param(struct soc_camera_device *icd, __u32 pixfmt)
{ {
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
struct soc_camera_host *ici = to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx1_camera_dev *pcdev = ici->priv; struct mx1_camera_dev *pcdev = ici->priv;
unsigned long camera_flags, common_flags; struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
unsigned long common_flags;
unsigned int csicr1; unsigned int csicr1;
int ret; int ret;
camera_flags = icd->ops->query_bus_param(icd);
/* MX1 supports only 8bit buswidth */ /* MX1 supports only 8bit buswidth */
common_flags = soc_camera_bus_param_compatible(camera_flags, ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
CSI_BUS_FLAGS); if (!ret) {
if (!common_flags) common_flags = soc_mbus_config_compatible(&cfg, CSI_BUS_FLAGS);
return -EINVAL; if (!common_flags) {
dev_warn(icd->parent,
"Flags incompatible: camera 0x%x, host 0x%x\n",
cfg.flags, CSI_BUS_FLAGS);
return -EINVAL;
}
} else if (ret != -ENOIOCTLCMD) {
return ret;
} else {
common_flags = CSI_BUS_FLAGS;
}
/* Make choises, based on platform choice */ /* Make choises, based on platform choice */
if ((common_flags & SOCAM_VSYNC_ACTIVE_HIGH) && if ((common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH) &&
(common_flags & SOCAM_VSYNC_ACTIVE_LOW)) { (common_flags & V4L2_MBUS_VSYNC_ACTIVE_LOW)) {
if (!pcdev->pdata || if (!pcdev->pdata ||
pcdev->pdata->flags & MX1_CAMERA_VSYNC_HIGH) pcdev->pdata->flags & MX1_CAMERA_VSYNC_HIGH)
common_flags &= ~SOCAM_VSYNC_ACTIVE_LOW; common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_LOW;
else else
common_flags &= ~SOCAM_VSYNC_ACTIVE_HIGH; common_flags &= ~V4L2_MBUS_VSYNC_ACTIVE_HIGH;
} }
if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) && if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
(common_flags & SOCAM_PCLK_SAMPLE_FALLING)) { (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
if (!pcdev->pdata || if (!pcdev->pdata ||
pcdev->pdata->flags & MX1_CAMERA_PCLK_RISING) pcdev->pdata->flags & MX1_CAMERA_PCLK_RISING)
common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
else else
common_flags &= ~SOCAM_PCLK_SAMPLE_RISING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
} }
if ((common_flags & SOCAM_DATA_ACTIVE_HIGH) && if ((common_flags & V4L2_MBUS_DATA_ACTIVE_HIGH) &&
(common_flags & SOCAM_DATA_ACTIVE_LOW)) { (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)) {
if (!pcdev->pdata || if (!pcdev->pdata ||
pcdev->pdata->flags & MX1_CAMERA_DATA_HIGH) pcdev->pdata->flags & MX1_CAMERA_DATA_HIGH)
common_flags &= ~SOCAM_DATA_ACTIVE_LOW; common_flags &= ~V4L2_MBUS_DATA_ACTIVE_LOW;
else else
common_flags &= ~SOCAM_DATA_ACTIVE_HIGH; common_flags &= ~V4L2_MBUS_DATA_ACTIVE_HIGH;
} }
ret = icd->ops->set_bus_param(icd, common_flags); cfg.flags = common_flags;
if (ret < 0) ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
if (ret < 0 && ret != -ENOIOCTLCMD) {
dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
common_flags, ret);
return ret; return ret;
}
csicr1 = __raw_readl(pcdev->base + CSICR1); csicr1 = __raw_readl(pcdev->base + CSICR1);
if (common_flags & SOCAM_PCLK_SAMPLE_RISING) if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
csicr1 |= CSICR1_REDGE; csicr1 |= CSICR1_REDGE;
if (common_flags & SOCAM_VSYNC_ACTIVE_HIGH) if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
csicr1 |= CSICR1_SOF_POL; csicr1 |= CSICR1_SOF_POL;
if (common_flags & SOCAM_DATA_ACTIVE_LOW) if (common_flags & V4L2_MBUS_DATA_ACTIVE_LOW)
csicr1 |= CSICR1_DATA_POL; csicr1 |= CSICR1_DATA_POL;
__raw_writel(csicr1, pcdev->base + CSICR1); __raw_writel(csicr1, pcdev->base + CSICR1);
......
drivers/media/video/mx2_camera.c
View file @ 1046a2c4
...@@ -686,16 +686,15 @@ static void mx2_camera_init_videobuf(struct videobuf_queue *q, ...@@ -686,16 +686,15 @@ static void mx2_camera_init_videobuf(struct videobuf_queue *q,
icd, &icd->video_lock); icd, &icd->video_lock);
} }
#define MX2_BUS_FLAGS (SOCAM_DATAWIDTH_8 | \ #define MX2_BUS_FLAGS (V4L2_MBUS_MASTER | \
SOCAM_MASTER | \ V4L2_MBUS_VSYNC_ACTIVE_HIGH | \
SOCAM_VSYNC_ACTIVE_HIGH | \ V4L2_MBUS_VSYNC_ACTIVE_LOW | \
SOCAM_VSYNC_ACTIVE_LOW | \ V4L2_MBUS_HSYNC_ACTIVE_HIGH | \
SOCAM_HSYNC_ACTIVE_HIGH | \ V4L2_MBUS_HSYNC_ACTIVE_LOW | \
SOCAM_HSYNC_ACTIVE_LOW | \ V4L2_MBUS_PCLK_SAMPLE_RISING | \
SOCAM_PCLK_SAMPLE_RISING | \ V4L2_MBUS_PCLK_SAMPLE_FALLING | \
SOCAM_PCLK_SAMPLE_FALLING | \ V4L2_MBUS_DATA_ACTIVE_HIGH | \
SOCAM_DATA_ACTIVE_HIGH | \ V4L2_MBUS_DATA_ACTIVE_LOW)
SOCAM_DATA_ACTIVE_LOW)
static int mx27_camera_emma_prp_reset(struct mx2_camera_dev *pcdev) static int mx27_camera_emma_prp_reset(struct mx2_camera_dev *pcdev)
{ {
...@@ -770,46 +769,59 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd, ...@@ -770,46 +769,59 @@ static void mx27_camera_emma_buf_init(struct soc_camera_device *icd,
static int mx2_camera_set_bus_param(struct soc_camera_device *icd, static int mx2_camera_set_bus_param(struct soc_camera_device *icd,
__u32 pixfmt) __u32 pixfmt)
{ {
struct soc_camera_host *ici = struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
to_soc_camera_host(icd->parent); struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
struct mx2_camera_dev *pcdev = ici->priv; struct mx2_camera_dev *pcdev = ici->priv;
unsigned long camera_flags, common_flags; struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
int ret = 0; unsigned long common_flags;
int ret;
int bytesperline; int bytesperline;
u32 csicr1 = pcdev->csicr1; u32 csicr1 = pcdev->csicr1;
camera_flags = icd->ops->query_bus_param(icd); ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
if (!ret) {
common_flags = soc_camera_bus_param_compatible(camera_flags, common_flags = soc_mbus_config_compatible(&cfg, MX2_BUS_FLAGS);
MX2_BUS_FLAGS); if (!common_flags) {
if (!common_flags) dev_warn(icd->parent,
return -EINVAL; "Flags incompatible: camera 0x%x, host 0x%x\n",
cfg.flags, MX2_BUS_FLAGS);
return -EINVAL;
}
} else if (ret != -ENOIOCTLCMD) {
return ret;
} else {
common_flags = MX2_BUS_FLAGS;
}
if ((common_flags & SOCAM_HSYNC_ACTIVE_HIGH) && if ((common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH) &&
(common_flags & SOCAM_HSYNC_ACTIVE_LOW)) { (common_flags & V4L2_MBUS_HSYNC_ACTIVE_LOW)) {
if (pcdev->platform_flags & MX2_CAMERA_HSYNC_HIGH) if (pcdev->platform_flags & MX2_CAMERA_HSYNC_HIGH)
common_flags &= ~SOCAM_HSYNC_ACTIVE_LOW; common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_LOW;
else else
common_flags &= ~SOCAM_HSYNC_ACTIVE_HIGH; common_flags &= ~V4L2_MBUS_HSYNC_ACTIVE_HIGH;
} }
if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) && if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
(common_flags & SOCAM_PCLK_SAMPLE_FALLING)) { (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
if (pcdev->platform_flags & MX2_CAMERA_PCLK_SAMPLE_RISING) if (pcdev->platform_flags & MX2_CAMERA_PCLK_SAMPLE_RISING)
common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
else else
common_flags &= ~SOCAM_PCLK_SAMPLE_RISING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
} }
ret = icd->ops->set_bus_param(icd, common_flags); cfg.flags = common_flags;
if (ret < 0) ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
if (ret < 0 && ret != -ENOIOCTLCMD) {
dev_dbg(icd->parent, "camera s_mbus_config(0x%lx) returned %d\n",
common_flags, ret);
return ret; return ret;
}
if (common_flags & SOCAM_PCLK_SAMPLE_RISING) if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING)
csicr1 |= CSICR1_REDGE; csicr1 |= CSICR1_REDGE;
if (common_flags & SOCAM_VSYNC_ACTIVE_HIGH) if (common_flags & V4L2_MBUS_VSYNC_ACTIVE_HIGH)
csicr1 |= CSICR1_SOF_POL; csicr1 |= CSICR1_SOF_POL;
if (common_flags & SOCAM_HSYNC_ACTIVE_HIGH) if (common_flags & V4L2_MBUS_HSYNC_ACTIVE_HIGH)
csicr1 |= CSICR1_HSYNC_POL; csicr1 |= CSICR1_HSYNC_POL;
if (pcdev->platform_flags & MX2_CAMERA_SWAP16) if (pcdev->platform_flags & MX2_CAMERA_SWAP16)
csicr1 |= CSICR1_SWAP16_EN; csicr1 |= CSICR1_SWAP16_EN;
......
drivers/media/video/mx3_camera.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap/omap_vout.c
View file @ 1046a2c4
...@@ -833,6 +833,15 @@ static void omap_vout_buffer_release(struct videobuf_queue *q, ...@@ -833,6 +833,15 @@ static void omap_vout_buffer_release(struct videobuf_queue *q,
/* /*
* File operations * File operations
*/ */
static unsigned int omap_vout_poll(struct file *file,
struct poll_table_struct *wait)
{
struct omap_vout_device *vout = file->private_data;
struct videobuf_queue *q = &vout->vbq;
return videobuf_poll_stream(file, q, wait);
}
static void omap_vout_vm_open(struct vm_area_struct *vma) static void omap_vout_vm_open(struct vm_area_struct *vma)
{ {
struct omap_vout_device *vout = vma->vm_private_data; struct omap_vout_device *vout = vma->vm_private_data;
...@@ -1861,6 +1870,7 @@ static const struct v4l2_ioctl_ops vout_ioctl_ops = { ...@@ -1861,6 +1870,7 @@ static const struct v4l2_ioctl_ops vout_ioctl_ops = {
static const struct v4l2_file_operations omap_vout_fops = { static const struct v4l2_file_operations omap_vout_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.poll = omap_vout_poll,
.unlocked_ioctl = video_ioctl2, .unlocked_ioctl = video_ioctl2,
.mmap = omap_vout_mmap, .mmap = omap_vout_mmap,
.open = omap_vout_open, .open = omap_vout_open,
......
drivers/media/video/omap1_camera.c
View file @ 1046a2c4
...@@ -102,10 +102,10 @@ ...@@ -102,10 +102,10 @@
/* end of OMAP1 Camera Interface registers */ /* end of OMAP1 Camera Interface registers */
#define SOCAM_BUS_FLAGS (SOCAM_MASTER | \ #define SOCAM_BUS_FLAGS (V4L2_MBUS_MASTER | \
SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_HIGH | \ V4L2_MBUS_HSYNC_ACTIVE_HIGH | V4L2_MBUS_VSYNC_ACTIVE_HIGH | \
SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING | \ V4L2_MBUS_PCLK_SAMPLE_RISING | V4L2_MBUS_PCLK_SAMPLE_FALLING | \
SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATAWIDTH_8) V4L2_MBUS_DATA_ACTIVE_HIGH)
#define FIFO_SIZE ((THRESHOLD_MASK >> THRESHOLD_SHIFT) + 1) #define FIFO_SIZE ((THRESHOLD_MASK >> THRESHOLD_SHIFT) + 1)
...@@ -1438,41 +1438,55 @@ static int omap1_cam_querycap(struct soc_camera_host *ici, ...@@ -1438,41 +1438,55 @@ static int omap1_cam_querycap(struct soc_camera_host *ici,
static int omap1_cam_set_bus_param(struct soc_camera_device *icd, static int omap1_cam_set_bus_param(struct soc_camera_device *icd,
__u32 pixfmt) __u32 pixfmt)
{ {
struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
struct device *dev = icd->parent; struct device *dev = icd->parent;
struct soc_camera_host *ici = to_soc_camera_host(dev); struct soc_camera_host *ici = to_soc_camera_host(dev);
struct omap1_cam_dev *pcdev = ici->priv; struct omap1_cam_dev *pcdev = ici->priv;
const struct soc_camera_format_xlate *xlate; const struct soc_camera_format_xlate *xlate;
const struct soc_mbus_pixelfmt *fmt; const struct soc_mbus_pixelfmt *fmt;
unsigned long camera_flags, common_flags; struct v4l2_mbus_config cfg = {.type = V4L2_MBUS_PARALLEL,};
unsigned long common_flags;
u32 ctrlclock, mode; u32 ctrlclock, mode;
int ret; int ret;
camera_flags = icd->ops->query_bus_param(icd); ret = v4l2_subdev_call(sd, video, g_mbus_config, &cfg);
if (!ret) {
common_flags = soc_camera_bus_param_compatible(camera_flags, common_flags = soc_mbus_config_compatible(&cfg, SOCAM_BUS_FLAGS);
SOCAM_BUS_FLAGS); if (!common_flags) {
if (!common_flags) dev_warn(dev,
return -EINVAL; "Flags incompatible: camera 0x%x, host 0x%x\n",
cfg.flags, SOCAM_BUS_FLAGS);
return -EINVAL;
}
} else if (ret != -ENOIOCTLCMD) {
return ret;
} else {
common_flags = SOCAM_BUS_FLAGS;
}
/* Make choices, possibly based on platform configuration */ /* Make choices, possibly based on platform configuration */
if ((common_flags & SOCAM_PCLK_SAMPLE_RISING) && if ((common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) &&
(common_flags & SOCAM_PCLK_SAMPLE_FALLING)) { (common_flags & V4L2_MBUS_PCLK_SAMPLE_FALLING)) {
if (!pcdev->pdata || if (!pcdev->pdata ||
pcdev->pdata->flags & OMAP1_CAMERA_LCLK_RISING) pcdev->pdata->flags & OMAP1_CAMERA_LCLK_RISING)
common_flags &= ~SOCAM_PCLK_SAMPLE_FALLING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_FALLING;
else else
common_flags &= ~SOCAM_PCLK_SAMPLE_RISING; common_flags &= ~V4L2_MBUS_PCLK_SAMPLE_RISING;
} }
ret = icd->ops->set_bus_param(icd, common_flags); cfg.flags = common_flags;
if (ret < 0) ret = v4l2_subdev_call(sd, video, s_mbus_config, &cfg);
if (ret < 0 && ret != -ENOIOCTLCMD) {
dev_dbg(dev, "camera s_mbus_config(0x%lx) returned %d\n",
common_flags, ret);
return ret; return ret;
}
ctrlclock = CAM_READ_CACHE(pcdev, CTRLCLOCK); ctrlclock = CAM_READ_CACHE(pcdev, CTRLCLOCK);
if (ctrlclock & LCLK_EN) if (ctrlclock & LCLK_EN)
CAM_WRITE(pcdev, CTRLCLOCK, ctrlclock & ~LCLK_EN); CAM_WRITE(pcdev, CTRLCLOCK, ctrlclock & ~LCLK_EN);
if (common_flags & SOCAM_PCLK_SAMPLE_RISING) { if (common_flags & V4L2_MBUS_PCLK_SAMPLE_RISING) {
dev_dbg(dev, "CTRLCLOCK_REG |= POLCLK\n"); dev_dbg(dev, "CTRLCLOCK_REG |= POLCLK\n");
ctrlclock |= POLCLK; ctrlclock |= POLCLK;
} else { } else {
...@@ -1565,10 +1579,10 @@ static int __init omap1_cam_probe(struct platform_device *pdev) ...@@ -1565,10 +1579,10 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
pcdev->clk = clk; pcdev->clk = clk;
pcdev->pdata = pdev->dev.platform_data; pcdev->pdata = pdev->dev.platform_data;
pcdev->pflags = pcdev->pdata->flags; if (pcdev->pdata) {
pcdev->pflags = pcdev->pdata->flags;
if (pcdev->pdata)
pcdev->camexclk = pcdev->pdata->camexclk_khz * 1000; pcdev->camexclk = pcdev->pdata->camexclk_khz * 1000;
}
switch (pcdev->camexclk) { switch (pcdev->camexclk) {
case 6000000: case 6000000:
...@@ -1578,6 +1592,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev) ...@@ -1578,6 +1592,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
case 24000000: case 24000000:
break; break;
default: default:
/* pcdev->camexclk != 0 => pcdev->pdata != NULL */
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"Incorrect sensor clock frequency %ld kHz, " "Incorrect sensor clock frequency %ld kHz, "
"should be one of 0, 6, 8, 9.6, 12 or 24 MHz, " "should be one of 0, 6, 8, 9.6, 12 or 24 MHz, "
...@@ -1585,8 +1600,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev) ...@@ -1585,8 +1600,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
pcdev->pdata->camexclk_khz); pcdev->pdata->camexclk_khz);
pcdev->camexclk = 0; pcdev->camexclk = 0;
case 0: case 0:
dev_info(&pdev->dev, dev_info(&pdev->dev, "Not providing sensor clock\n");
"Not providing sensor clock\n");
} }
INIT_LIST_HEAD(&pcdev->capture); INIT_LIST_HEAD(&pcdev->capture);
...@@ -1716,5 +1730,5 @@ MODULE_PARM_DESC(sg_mode, "videobuf mode, 0: dma-contig (default), 1: dma-sg"); ...@@ -1716,5 +1730,5 @@ MODULE_PARM_DESC(sg_mode, "videobuf mode, 0: dma-contig (default), 1: dma-sg");
MODULE_DESCRIPTION("OMAP1 Camera Interface driver"); MODULE_DESCRIPTION("OMAP1 Camera Interface driver");
MODULE_AUTHOR("Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>"); MODULE_AUTHOR("Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_LICENSE(DRIVER_VERSION); MODULE_VERSION(DRIVER_VERSION);
MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_ALIAS("platform:" DRIVER_NAME);
drivers/media/video/omap3isp/isp.c
View file @ 1046a2c4
...@@ -1704,6 +1704,7 @@ static int isp_register_entities(struct isp_device *isp) ...@@ -1704,6 +1704,7 @@ static int isp_register_entities(struct isp_device *isp)
isp->media_dev.dev = isp->dev; isp->media_dev.dev = isp->dev;
strlcpy(isp->media_dev.model, "TI OMAP3 ISP", strlcpy(isp->media_dev.model, "TI OMAP3 ISP",
sizeof(isp->media_dev.model)); sizeof(isp->media_dev.model));
isp->media_dev.hw_revision = isp->revision;
isp->media_dev.link_notify = isp_pipeline_link_notify; isp->media_dev.link_notify = isp_pipeline_link_notify;
ret = media_device_register(&isp->media_dev); ret = media_device_register(&isp->media_dev);
if (ret < 0) { if (ret < 0) {
...@@ -2210,6 +2211,8 @@ static int isp_probe(struct platform_device *pdev) ...@@ -2210,6 +2211,8 @@ static int isp_probe(struct platform_device *pdev)
regulator_put(isp->isp_csiphy2.vdd); regulator_put(isp->isp_csiphy2.vdd);
regulator_put(isp->isp_csiphy1.vdd); regulator_put(isp->isp_csiphy1.vdd);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
mutex_destroy(&isp->isp_mutex);
kfree(isp); kfree(isp);
return ret; return ret;
......
drivers/media/video/omap3isp/ispccdc.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/ispccp2.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/ispcsi2.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/isph3a_aewb.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/isph3a_af.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/isphist.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/isppreview.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/isppreview.h
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/ispreg.h
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/ispresizer.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/ispstat.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/ispstat.h
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/ispvideo.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/omap3isp/ispvideo.h
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/ov2640.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/ov5642.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/ov6650.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/ov772x.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/ov9640.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/ov9640.h
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/ov9740.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/pwc/pwc-if.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/pxa_camera.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/rj54n1cb0c.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/s5k6aa.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/s5p-fimc/fimc-capture.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/s5p-fimc/fimc-core.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/s5p-mfc/s5p_mfc_ctrl.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/s5p-mfc/s5p_mfc_dec.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/s5p-mfc/s5p_mfc_enc.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/s5p-tv/mixer_video.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/saa7134/saa7134.h
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/sh_mobile_ceu_camera.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/sh_mobile_csi2.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/soc_camera.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/soc_camera_platform.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/soc_mediabus.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/tw9910.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/v4l2-compat-ioctl32.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/v4l2-ctrls.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/v4l2-device.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/v4l2-ioctl.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/videobuf2-core.c
View file @ 1046a2c4
This diff is collapsed.
drivers/media/video/vivi.c
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/Kconfig
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/Makefile
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/cx25821/README deleted 100644 → 0
View file @ 46e85f5f
This diff is collapsed.
drivers/staging/media/Kconfig 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/Makefile 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/Kconfig 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/Makefile 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as102_drv.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as102_drv.h 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as102_fe.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as102_fw.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as102_fw.h 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as102_usb_drv.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as102_usb_drv.h 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as10x_cmd.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as10x_cmd.h 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as10x_cmd_cfg.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as10x_cmd_stream.c 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as10x_handle.h 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
drivers/staging/media/as102/as10x_types.h 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
include/linux/videodev2.h
View file @ 1046a2c4
This diff is collapsed.
include/media/ov772x.h
View file @ 1046a2c4
This diff is collapsed.
include/media/s5k6aa.h 0 → 100644
View file @ 1046a2c4
This diff is collapsed.
include/media/soc_camera.h
View file @ 1046a2c4
This diff is collapsed.
include/media/soc_camera_platform.h
View file @ 1046a2c4
This diff is collapsed.
include/media/soc_mediabus.h
View file @ 1046a2c4
This diff is collapsed.
include/media/v4l2-ioctl.h
View file @ 1046a2c4
This diff is collapsed.
include/media/v4l2-subdev.h
View file @ 1046a2c4
This diff is collapsed.
include/media/videobuf2-core.h
View file @ 1046a2c4
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7