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

Commit aace99e5 authored Jun 25, 2012 by Linus Torvalds

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

Pull media fixes from Mauro Carvalho Chehab.

Trivial conflict due to new USB HID ID's being added next to each other
(Baanto vs Axentia).

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
  [media] smia: Fix compile failures
  [media]  Fix VIDIOC_DQEVENT docbook entry
  [media] s5p-fimc: Fix control creation function
  [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
  [media] s5p-mfc: Fix setting controls
  [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
  [media] v4l/s5p-mfc: corrected encoder v4l control definitions
  [media] v4l: mem2mem_testdev: Fix race conditions in driver
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] cxd2820r: Fix an incorrect modulation type bitmask
  [media] em28xx: Show a warning if the board does not support remote controls
  [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
  [media] USB: Staging: media: lirc: initialize spinlocks before usage
  [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
  [media] bw-qcam: driver and pixfmt documentation fixes
  [media] cx88: fix firmware load on big-endian systems
  [media] cx18: support big-endian systems
  [media] ivtv: fix support for big-endian systems
  [media] tuner-core: return the frequency range of the correct tuner
  [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
  ...

parents bbcaf411 099987f0

Documentation/DocBook/media/v4l/pixfmt.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -986,13 +986,13 @@ http://www.thedirks.org/winnov/</ulink></para></entry>
	<row id="V4L2-PIX-FMT-Y4">		<row id="V4L2-PIX-FMT-Y4">
	<entry><constant>V4L2_PIX_FMT_Y4</constant></entry>		<entry><constant>V4L2_PIX_FMT_Y4</constant></entry>
	<entry>'Y04 '</entry>		<entry>'Y04 '</entry>
	<entry>Old 4-bit greyscale format. Only the least significant 4 bits of each byte are used,		<entry>Old 4-bit greyscale format. Only the most significant 4 bits of each byte are used,
	the other bits are set to 0.</entry>		the other bits are set to 0.</entry>
	</row>		</row>
	<row id="V4L2-PIX-FMT-Y6">		<row id="V4L2-PIX-FMT-Y6">
	<entry><constant>V4L2_PIX_FMT_Y6</constant></entry>		<entry><constant>V4L2_PIX_FMT_Y6</constant></entry>
	<entry>'Y06 '</entry>		<entry>'Y06 '</entry>
	<entry>Old 6-bit greyscale format. Only the least significant 6 bits of each byte are used,		<entry>Old 6-bit greyscale format. Only the most significant 6 bits of each byte are used,
	the other bits are set to 0.</entry>		the other bits are set to 0.</entry>
	</row>		</row>
	</tbody>		</tbody>

Documentation/DocBook/media/v4l/v4l2.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -560,6 +560,7 @@ and discussions on the V4L mailing list.</revremark>
	&sub-g-tuner;		&sub-g-tuner;
	&sub-log-status;		&sub-log-status;
	&sub-overlay;		&sub-overlay;
			&sub-prepare-buf;
	&sub-qbuf;		&sub-qbuf;
	&sub-querybuf;		&sub-querybuf;
	&sub-querycap;		&sub-querycap;
	@@ -567,7 +568,6 @@ and discussions on the V4L mailing list.</revremark>
	&sub-query-dv-preset;		&sub-query-dv-preset;
	&sub-query-dv-timings;		&sub-query-dv-timings;
	&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

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -108,10 +108,9 @@ information.</para>
	/></entry>		/></entry>
	</row>		</row>
	<row>		<row>
	<entry>__u32</entry>		<entry>struct v4l2_format</entry>
	<entry><structfield>format</structfield></entry>		<entry><structfield>format</structfield></entry>
	<entry>Filled in by the application, preserved by the driver.		<entry>Filled in by the application, preserved by the driver.</entry>
	See <xref linkend="v4l2-format" />.</entry>
	</row>		</row>
	<row>		<row>
	<entry>__u32</entry>		<entry>__u32</entry>

Documentation/DocBook/media/v4l/vidioc-dqevent.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -89,7 +89,7 @@
	<row>		<row>
	<entry></entry>		<entry></entry>
	<entry>&v4l2-event-frame-sync;</entry>		<entry>&v4l2-event-frame-sync;</entry>
	<entry><structfield>frame</structfield></entry>		<entry><structfield>frame_sync</structfield></entry>
	<entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>		<entry>Event data for event V4L2_EVENT_FRAME_SYNC.</entry>
	</row>		</row>
	<row>		<row>

arch/arm/plat-mxc/include/mach/mx2_cam.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@
	#ifndef __MACH_MX2_CAM_H_		#ifndef __MACH_MX2_CAM_H_
	#define __MACH_MX2_CAM_H_		#define __MACH_MX2_CAM_H_

			#define MX2_CAMERA_SWAP16 (1 << 0)
	#define MX2_CAMERA_EXT_VSYNC (1 << 1)		#define MX2_CAMERA_EXT_VSYNC (1 << 1)
	#define MX2_CAMERA_CCIR (1 << 2)		#define MX2_CAMERA_CCIR (1 << 2)
	#define MX2_CAMERA_CCIR_INTERLACE (1 << 3)		#define MX2_CAMERA_CCIR_INTERLACE (1 << 3)
	@@ -30,6 +31,7 @@
	#define MX2_CAMERA_GATED_CLOCK (1 << 5)		#define MX2_CAMERA_GATED_CLOCK (1 << 5)
	#define MX2_CAMERA_INV_DATA (1 << 6)		#define MX2_CAMERA_INV_DATA (1 << 6)
	#define MX2_CAMERA_PCLK_SAMPLE_RISING (1 << 7)		#define MX2_CAMERA_PCLK_SAMPLE_RISING (1 << 7)
			#define MX2_CAMERA_PACK_DIR_MSB (1 << 8)

	/**		/**
	* struct mx2_camera_platform_data - optional platform data for mx2_camera		* struct mx2_camera_platform_data - optional platform data for mx2_camera