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

Commit 35eb304b authored by Paul Mundt's avatar Paul Mundt
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-fixes-for-linus

parents ca0cc301 bb4c7e9a

Documentation/DocBook/device-drivers.tmpl

+13 −4
Original line number Diff line number Diff line
@@ -50,7 +50,9 @@ 


     <sect1><title>Delaying, scheduling, and timer routines</title>

!Iinclude/linux/sched.h

!Ekernel/sched.c

!Ekernel/sched/core.c

!Ikernel/sched/cpupri.c

!Ikernel/sched/fair.c

!Iinclude/linux/completion.h

!Ekernel/timer.c

     </sect1>
@@ -100,9 +102,12 @@ X!Iinclude/linux/kobject.h 
!Iinclude/linux/device.h

     </sect1>

     <sect1><title>Device Drivers Base</title>

!Idrivers/base/init.c

!Edrivers/base/driver.c

!Edrivers/base/core.c

!Edrivers/base/syscore.c

!Edrivers/base/class.c

!Idrivers/base/node.c

!Edrivers/base/firmware_class.c

!Edrivers/base/transport_class.c

<!-- Cannot be included, because
@@ -111,13 +116,18 @@ X!Iinclude/linux/kobject.h 
     exceed allowed 44 characters maximum

X!Edrivers/base/attribute_container.c

-->

!Edrivers/base/sys.c

!Edrivers/base/dd.c

<!--

X!Edrivers/base/interface.c

-->

!Iinclude/linux/platform_device.h

!Edrivers/base/platform.c

!Edrivers/base/bus.c

     </sect1>

     <sect1><title>Device Drivers DMA Management</title>

!Edrivers/base/dma-buf.c

!Edrivers/base/dma-coherent.c

!Edrivers/base/dma-mapping.c

     </sect1>

     <sect1><title>Device Drivers Power Management</title>

!Edrivers/base/power/main.c
@@ -216,9 +226,8 @@ X!Isound/sound_firmware.c 


  <chapter id="uart16x50">

     <title>16x50 UART Driver</title>

!Iinclude/linux/serial_core.h

!Edrivers/tty/serial/serial_core.c

!Edrivers/tty/serial/8250.c

!Edrivers/tty/serial/8250/8250.c

  </chapter>



  <chapter id="fbdev">

Documentation/DocBook/deviceiobook.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ CPU B: spin_unlock_irqrestore(&amp;dev_lock, flags) 
  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Iarch/x86/include/asm/io.h

!Elib/iomap.c

!Elib/pci_iomap.c

  </chapter>



</book>

Documentation/DocBook/media/dvb/dvbproperty.xml

+5 −7
Original line number Diff line number Diff line
@@ -163,14 +163,16 @@ get/set up to 64 properties. The actual meaning of each property is described on 
	<section id="DTV-FREQUENCY">

		<title><constant>DTV_FREQUENCY</constant></title>



		<para>Central frequency of the channel, in HZ.</para>

		<para>Central frequency of the channel.</para>



		<para>Notes:</para>

		<para>1)For ISDB-T, the channels are usually transmitted with an offset of 143kHz.

		<para>1)For satellital delivery systems, it is measured in kHz.

			For the other ones, it is measured in Hz.</para>

		<para>2)For ISDB-T, the channels are usually transmitted with an offset of 143kHz.

			E.g. a valid frequncy could be 474143 kHz. The stepping is bound to the bandwidth of

			the channel which is 6MHz.</para>



		<para>2)As in ISDB-Tsb the channel consists of only one or three segments the

		<para>3)As in ISDB-Tsb the channel consists of only one or three segments the

			frequency step is 429kHz, 3*429 respectively. As for ISDB-T the

			central frequency of the channel is expected.</para>

	</section>
@@ -735,14 +737,10 @@ typedef enum fe_hierarchy { 
			<listitem><para><link linkend="DTV-TUNE"><constant>DTV_TUNE</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-CLEAR"><constant>DTV_CLEAR</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-FREQUENCY"><constant>DTV_FREQUENCY</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-MODULATION"><constant>DTV_MODULATION</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-BANDWIDTH-HZ"><constant>DTV_BANDWIDTH_HZ</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-INVERSION"><constant>DTV_INVERSION</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-CODE-RATE-HP"><constant>DTV_CODE_RATE_HP</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-CODE-RATE-LP"><constant>DTV_CODE_RATE_LP</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-GUARD-INTERVAL"><constant>DTV_GUARD_INTERVAL</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-TRANSMISSION-MODE"><constant>DTV_TRANSMISSION_MODE</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-HIERARCHY"><constant>DTV_HIERARCHY</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-ISDBT-LAYER-ENABLED"><constant>DTV_ISDBT_LAYER_ENABLED</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-ISDBT-PARTIAL-RECEPTION"><constant>DTV_ISDBT_PARTIAL_RECEPTION</constant></link></para></listitem>

			<listitem><para><link linkend="DTV-ISDBT-SOUND-BROADCASTING"><constant>DTV_ISDBT_SOUND_BROADCASTING</constant></link></para></listitem>

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

+13 −5
Original line number Diff line number Diff line
@@ -183,7 +183,12 @@ applications must set the array to zero.</entry> 
	    <entry>__u32</entry>

	    <entry><structfield>ctrl_class</structfield></entry>

	    <entry>The control class to which all controls belong, see

<xref linkend="ctrl-class" />.</entry>

<xref linkend="ctrl-class" />. Drivers that use a kernel framework for handling

controls will also accept a value of 0 here, meaning that the controls can

belong to any control class. Whether drivers support this can be tested by setting

<structfield>ctrl_class</structfield> to 0 and calling <constant>VIDIOC_TRY_EXT_CTRLS</constant>

with a <structfield>count</structfield> of 0. If that succeeds, then the driver

supports this feature.</entry>

	  </row>

	  <row>

	    <entry>__u32</entry>
@@ -194,10 +199,13 @@ also be zero.</entry> 
	  <row>

	    <entry>__u32</entry>

	    <entry><structfield>error_idx</structfield></entry>

	    <entry>Set by the driver in case of an error. It is the

index of the control causing the error or equal to 'count' when the

error is not associated with a particular control. Undefined when the

ioctl returns 0 (success).</entry>

	    <entry>Set by the driver in case of an error. If it is equal

to <structfield>count</structfield>, then no actual changes were made to

controls. In other words, the error was not associated with setting a particular

control. If it is another value, then only the controls up to <structfield>error_idx-1</structfield>

were modified and control <structfield>error_idx</structfield> is the one that

caused the error. The <structfield>error_idx</structfield> value is undefined

if the ioctl returned 0 (success).</entry>

	  </row>

	  <row>

	    <entry>__u32</entry>

Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml

+14 −9
Original line number Diff line number Diff line
@@ -364,15 +364,20 @@ capability and it is cleared otherwise.</entry> 
	  <row>

	    <entry><constant>V4L2_FBUF_FLAG_OVERLAY</constant></entry>

	    <entry>0x0002</entry>

	    <entry>The frame buffer is an overlay surface the same

size as the capture. [?]</entry>

	  </row>

	  <row>

	    <entry spanname="hspan">The purpose of

<constant>V4L2_FBUF_FLAG_OVERLAY</constant> was never quite clear.

Most drivers seem to ignore this flag. For compatibility with the

<wordasword>bttv</wordasword> driver applications should set the

<constant>V4L2_FBUF_FLAG_OVERLAY</constant> flag.</entry>

	    <entry>If this flag is set for a video capture device, then the

driver will set the initial overlay size to cover the full framebuffer size,

otherwise the existing overlay size (as set by &VIDIOC-S-FMT;) will be used.



Only one video capture driver (bttv) supports this flag. The use of this flag

for capture devices is deprecated. There is no way to detect which drivers

support this flag, so the only reliable method of setting the overlay size is

through &VIDIOC-S-FMT;.



If this flag is set for a video output device, then the video output overlay

window is relative to the top-left corner of the framebuffer and restricted

to the size of the framebuffer. If it is cleared, then the video output

overlay window is relative to the video output display.

            </entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_FBUF_FLAG_CHROMAKEY</constant></entry>