Commit 7ae0dea9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (94 commits)
  V4L/DVB: tvp7002: fix write to H-PLL Feedback Divider LSB register
  V4L/DVB: dvb: siano: free spinlock before schedule()
  V4L/DVB: media: video: pvrusb2: remove custom hex_to_bin()
  V4L/DVB: drivers: usbvideo: remove custom implementation of hex_to_bin()
  V4L/DVB: Report supported QAM modes on bt8xx
  V4L/DVB: media: ir-keytable: null dereference in debug code
  V4L/DVB: ivtv: convert to the new control framework
  V4L/DVB: ivtv: convert gpio subdev to new control framework
  V4L/DVB: wm8739: convert to the new control framework
  V4L/DVB: cs53l32a: convert to new control framework
  V4L/DVB: wm8775: convert to the new control framework
  V4L/DVB: cx2341x: convert to the control framework
  V4L/DVB: cx25840: convert to the new control framework
  V4L/DVB: cx25840/ivtv: replace ugly priv control with s_config
  V4L/DVB: saa717x: convert to the new control framework
  V4L/DVB: msp3400: convert to the new control framework
  V4L/DVB: saa7115: convert to the new control framework
  V4L/DVB: v4l2: hook up the new control framework into the core framework
  V4L/DVB: Documentation: add v4l2-controls.txt documenting the new controls API
  V4L/DVB: v4l2-ctrls: Whitespace cleanups
  ...
parents 6c74700f 560afa7d

Documentation/DocBook/v4l/lirc_device_interface.xml

+16 −0
Original line number Diff line number Diff line
@@ -229,6 +229,22 @@ on working with the default settings initially.</para> 
      and LIRC_SETUP_END. Drivers can also choose to ignore these ioctls.</para>

    </listitem>

  </varlistentry>

  <varlistentry>

    <term>LIRC_SET_WIDEBAND_RECEIVER</term>

    <listitem>

      <para>Some receivers are equipped with special wide band receiver which is intended

      to be used to learn output of existing remote.

      Calling that ioctl with (1) will enable it, and with (0) disable it.

      This might be useful of receivers that have otherwise narrow band receiver

      that prevents them to be used with some remotes.

      Wide band receiver might also be more precise

      On the other hand its disadvantage it usually reduced range of reception.

      Note: wide band receiver might be implictly enabled if you enable

      carrier reports. In that case it will be disabled as soon as you disable

      carrier reports. Trying to disable wide band receiver while carrier

      reports are active will do nothing.</para>

    </listitem>

  </varlistentry>

</variablelist>



</section>

Documentation/DocBook/v4l/pixfmt-packed-rgb.xml

+78 −0
Original line number Diff line number Diff line
@@ -240,6 +240,45 @@ colorspace <constant>V4L2_COLORSPACE_SRGB</constant>.</para> 
	    <entry>r<subscript>1</subscript></entry>

	    <entry>r<subscript>0</subscript></entry>

	  </row>

	  <row id="V4L2-PIX-FMT-BGR666">

	    <entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>

	    <entry>'BGRH'</entry>

	    <entry></entry>

	    <entry>b<subscript>5</subscript></entry>

	    <entry>b<subscript>4</subscript></entry>

	    <entry>b<subscript>3</subscript></entry>

	    <entry>b<subscript>2</subscript></entry>

	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	    <entry>g<subscript>5</subscript></entry>

	    <entry>g<subscript>4</subscript></entry>

	    <entry></entry>

	    <entry>g<subscript>3</subscript></entry>

	    <entry>g<subscript>2</subscript></entry>

	    <entry>g<subscript>1</subscript></entry>

	    <entry>g<subscript>0</subscript></entry>

	    <entry>r<subscript>5</subscript></entry>

	    <entry>r<subscript>4</subscript></entry>

	    <entry>r<subscript>3</subscript></entry>

	    <entry>r<subscript>2</subscript></entry>

	    <entry></entry>

	    <entry>r<subscript>1</subscript></entry>

	    <entry>r<subscript>0</subscript></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	  </row>

	  <row id="V4L2-PIX-FMT-BGR24">

	    <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>

	    <entry>'BGR3'</entry>
@@ -700,6 +739,45 @@ defined in error. Drivers may interpret them as in <xref 
	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	  </row>

	  <row id="V4L2-PIX-FMT-BGR666">

	    <entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>

	    <entry>'BGRH'</entry>

	    <entry></entry>

	    <entry>b<subscript>5</subscript></entry>

	    <entry>b<subscript>4</subscript></entry>

	    <entry>b<subscript>3</subscript></entry>

	    <entry>b<subscript>2</subscript></entry>

	    <entry>b<subscript>1</subscript></entry>

	    <entry>b<subscript>0</subscript></entry>

	    <entry>g<subscript>5</subscript></entry>

	    <entry>g<subscript>4</subscript></entry>

	    <entry></entry>

	    <entry>g<subscript>3</subscript></entry>

	    <entry>g<subscript>2</subscript></entry>

	    <entry>g<subscript>1</subscript></entry>

	    <entry>g<subscript>0</subscript></entry>

	    <entry>r<subscript>5</subscript></entry>

	    <entry>r<subscript>4</subscript></entry>

	    <entry>r<subscript>3</subscript></entry>

	    <entry>r<subscript>2</subscript></entry>

	    <entry></entry>

	    <entry>r<subscript>1</subscript></entry>

	    <entry>r<subscript>0</subscript></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	    <entry></entry>

	  </row>

	  <row><!-- id="V4L2-PIX-FMT-BGR24" -->

	    <entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>

	    <entry>'BGR3'</entry>

Documentation/video4linux/v4l2-controls.txt

0 → 100644
+648 −0

File added.

Preview size limit exceeded, changes collapsed.

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -2203,6 +2203,12 @@ F: drivers/misc/cb710/ 
F:	drivers/mmc/host/cb710-mmc.*

F:	include/linux/cb710.h



ENE KB2426 (ENE0100/ENE020XX) INFRARED RECEIVER

M:	Maxim Levitsky <maximlevitsky@gmail.com>

S:	Maintained

F:	drivers/media/IR/ene_ir.c

F:	drivers/media/IR/ene_ir.h



EPSON 1355 FRAMEBUFFER DRIVER

M:	Christopher Hoover <ch@murgatroid.com>

M:	Christopher Hoover <ch@hpl.hp.com>

drivers/media/IR/Kconfig

+33 −3
Original line number Diff line number Diff line 
config IR_CORE

	tristate

menuconfig IR_CORE

	tristate "Infrared remote controller adapters"

	depends on INPUT

	default INPUT



if IR_CORE



config VIDEO_IR

	tristate

	depends on IR_CORE
@@ -16,7 +18,7 @@ config LIRC 
	   Enable this option to build the Linux Infrared Remote

	   Control (LIRC) core device interface driver. The LIRC

	   interface passes raw IR to and from userspace, where the

	   LIRC daemon handles protocol decoding for IR reception ann

	   LIRC daemon handles protocol decoding for IR reception and

	   encoding for IR transmitting (aka "blasting").



source "drivers/media/IR/keymaps/Kconfig"
@@ -103,3 +105,31 @@ config IR_MCEUSB 


	   To compile this driver as a module, choose M here: the

	   module will be called mceusb.



config IR_ENE

	tristate "ENE eHome Receiver/Transciever (pnp id: ENE0100/ENE02xxx)"

	depends on PNP

	depends on IR_CORE

	---help---

	   Say Y here to enable support for integrated infrared receiver

	   /transciever made by ENE.



	   You can see if you have it by looking at lspnp output.

	   Output should include ENE0100 ENE0200 or something similiar.



	   To compile this driver as a module, choose M here: the

	   module will be called ene_ir.



config IR_STREAMZAP

	tristate "Streamzap PC Remote IR Receiver"

	depends on USB_ARCH_HAS_HCD

	depends on IR_CORE

	select USB

	---help---

	   Say Y here if you want to use a Streamzap PC Remote

	   Infrared Receiver.



	   To compile this driver as a module, choose M here: the

	   module will be called streamzap.



endif #IR_CORE

CRA Git | Maintained and supported by SUSTech CRA and CCSE