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

Commit c170093d authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'devicetree/merge' into spi/merge

parents 557218e2 78bba987

Documentation/DocBook/dvb/dvbapi.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
	<holder>Convergence GmbH</holder>

</copyright>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

Documentation/DocBook/media.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
<title>LINUX MEDIA INFRASTRUCTURE API</title>



<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>LinuxTV Developers</holder>

</copyright>
@@ -86,7 +86,7 @@ Foundation. A copy of the license is included in the chapter entitled 
</author>

</authorgroup>

<copyright>

	<year>2009-2010</year>

	<year>2009-2011</year>

	<holder>Mauro Carvalho Chehab</holder>

</copyright>

Documentation/DocBook/v4l/dev-rds.xml

+4 −2
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ as follows:</para> 
  </section>



  <section>

    <title>RDS datastructures</title>

    <table frame="none" pgwide="1" id="v4l2-rds-data">

      <title>struct

<structname>v4l2_rds_data</structname></title>
@@ -129,10 +130,11 @@ as follows:</para> 


    <table frame="none" pgwide="1" id="v4l2-rds-block-codes">

      <title>Block defines</title>

      <tgroup cols="3">

      <tgroup cols="4">

	<colspec colname="c1" colwidth="1*" />

	<colspec colname="c2" colwidth="1*" />

	<colspec colname="c3" colwidth="5*" />

	<colspec colname="c3" colwidth="1*" />

	<colspec colname="c4" colwidth="5*" />

	<tbody valign="top">

	  <row>

	    <entry>V4L2_RDS_BLOCK_MSK</entry>

Documentation/DocBook/v4l/v4l2.xml

+2 −1
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ Remote Controller chapter.</contrib> 
      <year>2008</year>

      <year>2009</year>

      <year>2010</year>

      <year>2011</year>

      <holder>Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin

Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab</holder>

    </copyright>
@@ -381,7 +382,7 @@ and discussions on the V4L mailing list.</revremark> 
</partinfo>



<title>Video for Linux Two API Specification</title>

 <subtitle>Revision 2.6.33</subtitle>

 <subtitle>Revision 2.6.38</subtitle>



  <chapter id="common">

    &sub-common;

Documentation/arm/Booting

+29 −4
Original line number Diff line number Diff line
@@ -65,13 +65,19 @@ looks at the connected hardware is beyond the scope of this document. 
The boot loader must ultimately be able to provide a MACH_TYPE_xxx

value to the kernel. (see linux/arch/arm/tools/mach-types).





4. Setup the kernel tagged list

-------------------------------

4. Setup boot data

------------------



Existing boot loaders:		OPTIONAL, HIGHLY RECOMMENDED

New boot loaders:		MANDATORY



The boot loader must provide either a tagged list or a dtb image for

passing configuration data to the kernel.  The physical address of the

boot data is passed to the kernel in register r2.



4a. Setup the kernel tagged list

--------------------------------



The boot loader must create and initialise the kernel tagged list.

A valid tagged list starts with ATAG_CORE and ends with ATAG_NONE.

The ATAG_CORE tag may or may not be empty.  An empty ATAG_CORE tag
@@ -101,6 +107,24 @@ The tagged list must be placed in a region of memory where neither 
the kernel decompressor nor initrd 'bootp' program will overwrite

it.  The recommended placement is in the first 16KiB of RAM.



4b. Setup the device tree

-------------------------



The boot loader must load a device tree image (dtb) into system ram

at a 64bit aligned address and initialize it with the boot data.  The

dtb format is documented in Documentation/devicetree/booting-without-of.txt.

The kernel will look for the dtb magic value of 0xd00dfeed at the dtb

physical address to determine if a dtb has been passed instead of a

tagged list.



The boot loader must pass at a minimum the size and location of the

system memory, and the root filesystem location.  The dtb must be

placed in a region of memory where the kernel decompressor will not

overwrite it.  The recommended placement is in the first 16KiB of RAM

with the caveat that it may not be located at physical address 0 since

the kernel interprets a value of 0 in r2 to mean neither a tagged list

nor a dtb were passed.



5. Calling the kernel image

---------------------------
@@ -125,7 +149,8 @@ In either case, the following conditions must be met: 
- CPU register settings

  r0 = 0,

  r1 = machine type number discovered in (3) above.

  r2 = physical address of tagged list in system RAM.

  r2 = physical address of tagged list in system RAM, or

       physical address of device tree block (dtb) in system RAM



- CPU mode

  All forms of interrupts must be disabled (IRQs and FIQs)