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

Commit 20f8e032 authored by Dave Airlie's avatar Dave Airlie
Browse files

Backmerge drm-fixes merge into Linus's tree into drm-next. 



This merges '5b726e06' into drm-next

Just to resolve some merges to make Daniel's life easier.

Signed-off-by: default avatarDAve Airlie <airlied@redhat.com>
parents ade1ba73 5b726e06

Documentation/devicetree/bindings/dma/ti-edma.txt

+4 −6
Original line number Diff line number Diff line
@@ -22,8 +22,7 @@ Required properties: 
Optional properties:

- ti,hwmods:	Name of the hwmods associated to the eDMA CC

- ti,edma-memcpy-channels: List of channels allocated to be used for memcpy, iow

		these channels will be SW triggered channels. The list must

		contain 16 bits numbers, see example.

		these channels will be SW triggered channels. See example.

- ti,edma-reserved-slot-ranges: PaRAM slot ranges which should not be used by

		the driver, they are allocated to be used by for example the

		DSP. See example.
@@ -56,10 +55,9 @@ edma: edma@49000000 { 
	ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 7>, <&edma_tptc2 0>;



	/* Channel 20 and 21 is allocated for memcpy */

	ti,edma-memcpy-channels = /bits/ 16 <20 21>;

	/* The following PaRAM slots are reserved: 35-45 and 100-110 */

	ti,edma-reserved-slot-ranges = /bits/ 16 <35 10>,

				       /bits/ 16 <100 10>;

	ti,edma-memcpy-channels = <20 21>;

	/* The following PaRAM slots are reserved: 35-44 and 100-109 */

	ti,edma-reserved-slot-ranges = <35 10>, <100 10>;

};



edma_tptc0: tptc@49800000 {

Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt

+4 −0
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ Required properties: 
      0 = active high

      1 = active low



Optional properties:

- little-endian : GPIO registers are used as little endian. If not

                  present registers are used as big endian by default.



Example:



gpio0: gpio@1100 {

Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ Each key is represented as a sub-node of "allwinner,sun4i-a10-lradc-keys": 
Required subnode-properties:

	- label: Descriptive name of the key.

	- linux,code: Keycode to emit.

	- channel: Channel this key is attached to, mut be 0 or 1.

	- channel: Channel this key is attached to, must be 0 or 1.

	- voltage: Voltage in µV at lradc input when this key is pressed.



Example:

Documentation/devicetree/bindings/mtd/partition.txt

+6 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ used for what purposes, but which don't use an on-flash partition table such 
as RedBoot.



The partition table should be a subnode of the mtd node and should be named

'partitions'. Partitions are defined in subnodes of the partitions node.

'partitions'. This node should have the following property:

- compatible : (required) must be "fixed-partitions"

Partitions are then defined in subnodes of the partitions node.



For backwards compatibility partitions as direct subnodes of the mtd device are

supported. This use is discouraged.
@@ -36,6 +38,7 @@ Examples: 


flash@0 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;
@@ -53,6 +56,7 @@ flash@0 { 


flash@1 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <2>;
@@ -66,6 +70,7 @@ flash@1 { 


flash@2 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <2>;

		#size-cells = <2>;

Documentation/networking/e100.txt

+0 −14
Original line number Diff line number Diff line
@@ -181,17 +181,3 @@ For general information, go to the Intel support website at: 
If an issue is identified with the released source code on the supported

kernel with a supported adapter, email the specific information related to the

issue to e1000-devel@lists.sourceforge.net.
 




License

=======



This software program is released under the terms of a license agreement

between you ('Licensee') and Intel. Do not use or load this software or any

associated materials (collectively, the 'Software') until you have carefully

read the full terms and conditions of the file COPYING located in this software

package. By loading or using the Software, you agree to the terms of this

Agreement. If you do not agree with the terms of this Agreement, do not install

or use the Software.



* Other names and brands may be claimed as the property of others.