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

Commit 9c7466b2 authored by Olof Johansson's avatar Olof Johansson
Browse files

ARM: arm-soc: Merge branch 'next/pm2' into next/pm 



Another smaller branch merged into next/pm before pull request.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4a76411e 48d224d1

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -1823,6 +1823,11 @@ S: Kattreinstr 38 
S: D-64295

S: Germany



N: Avi Kivity

E: avi.kivity@gmail.com

D: Kernel-based Virtual Machine (KVM)

S: Ra'annana, Israel



N: Andi Kleen

E: andi@firstfloor.org

U: http://www.halobates.de

Documentation/devicetree/bindings/arm/arm-boards

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ Required properties (in root node): 


FPGA type interrupt controllers, see the versatile-fpga-irq binding doc.



In the root node the Integrator/CP must have a /cpcon node pointing

to the CP control registers, and the Integrator/AP must have a

/syscon node pointing to the Integrator/AP system controller.





ARM Versatile Application and Platform Baseboards

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

Documentation/devicetree/bindings/arm/davinci.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Texas Instruments DaVinci Platforms Device Tree Bindings

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



DA850/OMAP-L138/AM18x Evaluation Module (EVM) board

Required root node properties:

    - compatible = "ti,da850-evm", "ti,da850";



EnBW AM1808 based CMC board

Required root node properties:

    - compatible = "enbw,cmc", "ti,da850;



Generic DaVinci Boards

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



DA850/OMAP-L138/AM18x generic board

Required root node properties:

    - compatible = "ti,da850";

Documentation/devicetree/bindings/arm/exynos/power_domain.txt

+11 −4
Original line number Diff line number Diff line
@@ -4,14 +4,13 @@ Exynos processors include support for multiple power domains which are used 
to gate power to one or more peripherals on the processor.



Required Properties:

- compatiable: should be one of the following.

- compatible: should be one of the following.

    * samsung,exynos4210-pd - for exynos4210 type power domain.

- reg: physical base address of the controller and length of memory mapped

    region.



Optional Properties:

- samsung,exynos4210-pd-off: Specifies that the power domain is in turned-off

    state during boot and remains to be turned-off until explicitly turned-on.

Node of a device using power domains must have a samsung,power-domain property

defined with a phandle to respective power domain.



Example:
@@ -19,3 +18,11 @@ Example: 
		compatible = "samsung,exynos4210-pd";

		reg = <0x10023C00 0x10>;

	};



Example of the node using power domain:



	node {

		/* ... */

		samsung,power-domain = <&lcd0>;

		/* ... */

	};

Documentation/devicetree/bindings/arm/fsl.txt

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ i.MX6 Quad SABRE Smart Device Board 
Required root node properties:

    - compatible = "fsl,imx6q-sabresd", "fsl,imx6q";



i.MX6 Quad SABRE Automotive Board

Required root node properties:

    - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";



Generic i.MX boards

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