Commit cd15c51d authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'omap-for-v3.13/display-fix' of... 

Merge tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

I accidentally removed some mux code for omap4 that I thought was
dead code as omap4 has been booting with device tree only since
v3.10. Turns out I also removed some display related mux code,
so let's revert that except for the dead code parts.

* tag 'omap-for-v3.13/display-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (439 commits)
  Revert "ARM: OMAP2+: Remove legacy mux code for display.c"
  +Linux 3.13-rc4
parents 5b8314a9 130f769e

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -655,6 +655,11 @@ S: Stanford University 
S: Stanford, California 94305

S: USA



N: Carlos Chinea

E: carlos.chinea@nokia.com

E: cch.devel@gmail.com

D: Author of HSI Subsystem



N: Randolph Chung

E: tausq@debian.org

D: Linux/PA-RISC hacker

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

+5 −3
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ range from zero to the maximal number of valid planes for the currently active 
format. For the single-planar API, applications must set <structfield> plane

</structfield> to zero.  Additional flags may be posted in the <structfield>

flags </structfield> field.  Refer to a manual for open() for details.

Currently only O_CLOEXEC is supported.  All other fields must be set to zero.

Currently only O_CLOEXEC, O_RDONLY, O_WRONLY, and O_RDWR are supported.  All

other fields must be set to zero.

In the case of multi-planar API, every plane is exported separately using

multiple <constant> VIDIOC_EXPBUF </constant> calls. </para>
@@ -170,8 +171,9 @@ multi-planar API. Otherwise this value must be set to zero. </entry> 
	    <entry>__u32</entry>

	    <entry><structfield>flags</structfield></entry>

	    <entry>Flags for the newly created file, currently only <constant>

O_CLOEXEC </constant> is supported, refer to the manual of open() for more

details.</entry>

O_CLOEXEC </constant>, <constant>O_RDONLY</constant>, <constant>O_WRONLY

</constant>, and <constant>O_RDWR</constant> are supported, refer to the manual

of open() for more details.</entry>

	  </row>

	  <row>

	    <entry>__s32</entry>

Documentation/assoc_array.txt

+3 −3
Original line number Diff line number Diff line
@@ -164,10 +164,10 @@ This points to a number of methods, all of which need to be provided: 


 (4) Diff the index keys of two objects.



	int (*diff_objects)(const void *a, const void *b);

	int (*diff_objects)(const void *object, const void *index_key);



     Return the bit position at which the index keys of two objects differ or

     -1 if they are the same.

     Return the bit position at which the index key of the specified object

     differs from the given index key or -1 if they are the same.





 (5) Free an object.

Documentation/device-mapper/cache.txt

+6 −4
Original line number Diff line number Diff line
@@ -266,10 +266,12 @@ E.g. 
Invalidation is removing an entry from the cache without writing it

back.  Cache blocks can be invalidated via the invalidate_cblocks

message, which takes an arbitrary number of cblock ranges.  Each cblock

must be expressed as a decimal value, in the future a variant message

that takes cblock ranges expressed in hexidecimal may be needed to

better support efficient invalidation of larger caches.  The cache must

be in passthrough mode when invalidate_cblocks is used.

range's end value is "one past the end", meaning 5-10 expresses a range

of values from 5 to 9.  Each cblock must be expressed as a decimal

value, in the future a variant message that takes cblock ranges

expressed in hexidecimal may be needed to better support efficient

invalidation of larger caches.  The cache must be in passthrough mode

when invalidate_cblocks is used.



   invalidate_cblocks [<cblock>|<cblock begin>-<cblock end>]*

Documentation/devicetree/bindings/net/davinci_emac.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ This file provides information, what the device node 
for the davinci_emac interface contains.



Required properties:

- compatible: "ti,davinci-dm6467-emac";

- compatible: "ti,davinci-dm6467-emac" or "ti,am3517-emac"

- reg: Offset and length of the register set for the device

- ti,davinci-ctrl-reg-offset: offset to control register

- ti,davinci-ctrl-mod-reg-offset: offset to control module register

CRA Git | Maintained and supported by SUSTech CRA and CCSE