Commit 77f9db89 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/dt' into next/pm2 

By Lee Jones (42) and others
via Olof Johansson (13) and others
* next/dt: (249 commits)
  ARM: ux500: Rename dbx500 cpufreq code to be more generic
  ARM: dts: add missing ux500 device trees
  ARM: ux500: Stop registering the PCM driver from platform code
  ARM: ux500: Move board specific GPIO info out to subordinate DTS files
  ARM: ux500: Disable the MMCI gpio-regulator by default
  ARM: Kirkwood: remove kirkwood_ehci_init() from new boards
  ARM: Kirkwood: Add support LED of OpenBlocks A6
  ARM: Kirkwood: Convert to EHCI via DT for OpenBlocks A6
  ARM: kirkwood: Add NAND partiton map for OpenBlocks A6
  ARM: kirkwood: Add support second I2C bus and RTC on OpenBlocks A6
  ARM: kirkwood: Add support DT of second I2C bus
  ARM: kirkwood: Convert mplcec4 board to pinctrl
  ARM: Kirkwood: Convert km_kirkwood to pinctrl
  ARM: Kirkwood: support 98DX412x kirkwoods with pinctrl
  ARM: Kirkwood: Convert IX2-200 to pinctrl.
  ARM: Kirkwood: Convert lsxl boards to pinctrl.
  ARM: Kirkwood: Convert ib62x0 to pinctrl.
  ARM: Kirkwood: Convert GoFlex Net to pinctrl.
  ARM: Kirkwood: Convert dreamplug to pinctrl.
  ARM: Kirkwood: Convert dockstar to pinctrl.
  ...
parents 68fb3170 64507dd7

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

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

Documentation/devicetree/bindings/ata/exynos-sata-phy.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
* Samsung SATA PHY Controller



SATA PHY nodes are defined to describe on-chip SATA Physical layer controllers.

Each SATA PHY controller should have its own node.



Required properties:

- compatible        : compatible list, contains "samsung,exynos5-sata-phy"

- reg               : <registers mapping>



Example:

        sata@ffe07000 {

                compatible = "samsung,exynos5-sata-phy";

                reg = <0xffe07000 0x1000>;

        };

Documentation/devicetree/bindings/ata/exynos-sata.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Samsung AHCI SATA Controller



SATA nodes are defined to describe on-chip Serial ATA controllers.

Each SATA controller should have its own node.



Required properties:

- compatible        : compatible list, contains "samsung,exynos5-sata"

- interrupts        : <interrupt mapping for SATA IRQ>

- reg               : <registers mapping>

- samsung,sata-freq : <frequency in MHz>



Example:

        sata@ffe08000 {

                compatible = "samsung,exynos5-sata";

                reg = <0xffe08000 0x1000>;

                interrupts = <115>;

        };

CRA Git | Maintained and supported by SUSTech CRA and CCSE