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

Commit f8f466c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC i.MX DT changes from Olof Johansson:
 "This branch contains of devicetree changes for the Freescale i.MX
  platform.

  The base patch of the branch changes the format of the dts files to a
  slightly different format that makes it easier to do derivative board
  definitions, but it also introduces a lot of churn in the process
  since every line of the file is touched.

  On top of that are a handful of the regular changes; enabling more
  boards as DT-based instead of legacy board files (mx25pdk), enabling
  another driver for devicetree and thus adding bindings (onewire), etc.

  I'm not happy about the churn, and will likely not take it for other
  platforms in the future."

* tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
  ARM: dts: add dtsi for imx6q and imx6dl
  ARM: dts: rename imx6q.dtsi to imx6qdl.dtsi
  ARM: dts: i.MX6: Add regulator delay support
  ARM: dts: Add device tree entry for onewire master on i.MX53
  ARM: i.MX53: Add clocks for i.mx53 onewire master.
  W1: Add device tree support to MXC onewire master.
  ARM: imx: enable imx6q-cpufreq support
  ARM: dts: Add apf51 basic support
  ARM i.MX6: change mxs usbphy clock usage
  ARM: dts: imx6q: Remove silicon version from SDMA firmware
  ARM i.MX53: dts: add oftree for MBa53 baseboard
  ARM i.MX53: add dts for the TQ tqma53 module
  ARM: dts: imx53: pinctrl update
  ARM i.MX51 babbage: Add keypad support
  ARM: dts: imx: Add imx51 KPP entry
  ARM: dts: imx25-karo-tx25: Put status entry in the end
  ARM: mx25pdk: Add device tree support
  ARM: dts: imx: use nodes label in board dts
  ARM: dts: add missing imx dtb targets
  ARM: boot: dts: Add an entry for imx27-pdk.dtb
  ...
parents 2af78448 4a9226a3

Documentation/devicetree/bindings/arm/armadeus.txt

0 → 100644
+6 −0
Original line number Diff line number Diff line 
Armadeus i.MX Platforms Device Tree Bindings

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



APF51: i.MX51 based module.

Required root node properties:

    - compatible = "armadeus,imx51-apf51", "fsl,imx51";

Documentation/devicetree/bindings/arm/fsl.txt

+8 −0
Original line number Diff line number Diff line
@@ -5,6 +5,14 @@ i.MX23 Evaluation Kit 
Required root node properties:

    - compatible = "fsl,imx23-evk", "fsl,imx23";



i.MX25 Product Development Kit

Required root node properties:

    - compatible = "fsl,imx25-pdk", "fsl,imx25";



i.MX27 Product Development Kit

Required root node properties:

    - compatible = "fsl,imx27-pdk", "fsl,imx27";



i.MX28 Evaluation Kit

Required root node properties:

    - compatible = "fsl,imx28-evk", "fsl,imx28";

Documentation/devicetree/bindings/clock/imx5-clock.txt

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ clocks and IDs. 
	can_sel			156

	can1_serial_gate	157

	can1_ipg_gate		158

	owire_gate		159



Examples (for mx53):

Documentation/devicetree/bindings/clock/imx6q-clock.txt

+2 −0
Original line number Diff line number Diff line
@@ -203,6 +203,8 @@ clocks and IDs. 
	pcie_ref		188

	pcie_ref_125m		189

	enet_ref		190

	usbphy1_gate		191

	usbphy2_gate		192



Examples:

Documentation/devicetree/bindings/w1/fsl-imx-owire.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* Freescale i.MX One wire bus master controller



Required properties:

- compatible : should be "fsl,imx21-owire"

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



Optional properties:

- clocks : phandle of clock that supplies the module (required if platform

		clock bindings use device tree)



Example:



- From imx53.dtsi:

owire: owire@63fa4000 {

	compatible = "fsl,imx53-owire", "fsl,imx21-owire";

	reg = <0x63fa4000 0x4000>;

	clocks = <&clks 159>;

	status = "disabled";

};