aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson2013-02-12 17:11:40 -0600
committerOlof Johansson2013-02-12 17:11:40 -0600
commit7839c281edd9f4744be58ff0b29aabc64aabde31 (patch)
tree1c122b11e3dd437ece0a09133acba0c54ac5fe38 /Documentation
parent836dc9e3fbbab0c30aa6e664417225f5c1fb1c39 (diff)
parent7c1da5854f3a4af7e44c059fdde750119c05f1a4 (diff)
downloadam43-linux-kernel-7839c281edd9f4744be58ff0b29aabc64aabde31.tar.gz
am43-linux-kernel-7839c281edd9f4744be58ff0b29aabc64aabde31.tar.xz
am43-linux-kernel-7839c281edd9f4744be58ff0b29aabc64aabde31.zip
Merge tag 'imx-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into late/dt
From Shawn Guo: imx device tree changes for 3.9 - Some tweaking and updates on device tree sources - Enable imx6q-cpufreq support for device tree boot - IMX/MXC onewire driver device tree conversion. Onewire maintainer Evgeniy Polyakov gives his ACK to bless it go via arm-soc tree. * tag 'imx-dt-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6: (22 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 ...
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/arm/armadeus.txt6
-rw-r--r--Documentation/devicetree/bindings/arm/fsl.txt8
-rw-r--r--Documentation/devicetree/bindings/clock/imx5-clock.txt1
-rw-r--r--Documentation/devicetree/bindings/clock/imx6q-clock.txt2
-rw-r--r--Documentation/devicetree/bindings/w1/fsl-imx-owire.txt19
5 files changed, 36 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/armadeus.txt b/Documentation/devicetree/bindings/arm/armadeus.txt
new file mode 100644
index 00000000000..9821283ff51
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/armadeus.txt
@@ -0,0 +1,6 @@
1Armadeus i.MX Platforms Device Tree Bindings
2-----------------------------------------------
3
4APF51: i.MX51 based module.
5Required root node properties:
6 - compatible = "armadeus,imx51-apf51", "fsl,imx51";
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt
index f79818711e8..e935d7d4ac4 100644
--- a/Documentation/devicetree/bindings/arm/fsl.txt
+++ b/Documentation/devicetree/bindings/arm/fsl.txt
@@ -5,6 +5,14 @@ i.MX23 Evaluation Kit
5Required root node properties: 5Required root node properties:
6 - compatible = "fsl,imx23-evk", "fsl,imx23"; 6 - compatible = "fsl,imx23-evk", "fsl,imx23";
7 7
8i.MX25 Product Development Kit
9Required root node properties:
10 - compatible = "fsl,imx25-pdk", "fsl,imx25";
11
12i.MX27 Product Development Kit
13Required root node properties:
14 - compatible = "fsl,imx27-pdk", "fsl,imx27";
15
8i.MX28 Evaluation Kit 16i.MX28 Evaluation Kit
9Required root node properties: 17Required root node properties:
10 - compatible = "fsl,imx28-evk", "fsl,imx28"; 18 - compatible = "fsl,imx28-evk", "fsl,imx28";
diff --git a/Documentation/devicetree/bindings/clock/imx5-clock.txt b/Documentation/devicetree/bindings/clock/imx5-clock.txt
index 04ad47876be..2a0c904c46a 100644
--- a/Documentation/devicetree/bindings/clock/imx5-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx5-clock.txt
@@ -171,6 +171,7 @@ clocks and IDs.
171 can_sel 156 171 can_sel 156
172 can1_serial_gate 157 172 can1_serial_gate 157
173 can1_ipg_gate 158 173 can1_ipg_gate 158
174 owire_gate 159
174 175
175Examples (for mx53): 176Examples (for mx53):
176 177
diff --git a/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
index f73fdf59556..969b38e06ad 100644
--- a/Documentation/devicetree/bindings/clock/imx6q-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx6q-clock.txt
@@ -203,6 +203,8 @@ clocks and IDs.
203 pcie_ref 188 203 pcie_ref 188
204 pcie_ref_125m 189 204 pcie_ref_125m 189
205 enet_ref 190 205 enet_ref 190
206 usbphy1_gate 191
207 usbphy2_gate 192
206 208
207Examples: 209Examples:
208 210
diff --git a/Documentation/devicetree/bindings/w1/fsl-imx-owire.txt b/Documentation/devicetree/bindings/w1/fsl-imx-owire.txt
new file mode 100644
index 00000000000..ecf42c07684
--- /dev/null
+++ b/Documentation/devicetree/bindings/w1/fsl-imx-owire.txt
@@ -0,0 +1,19 @@
1* Freescale i.MX One wire bus master controller
2
3Required properties:
4- compatible : should be "fsl,imx21-owire"
5- reg : Address and length of the register set for the device
6
7Optional properties:
8- clocks : phandle of clock that supplies the module (required if platform
9 clock bindings use device tree)
10
11Example:
12
13- From imx53.dtsi:
14owire: owire@63fa4000 {
15 compatible = "fsl,imx53-owire", "fsl,imx21-owire";
16 reg = <0x63fa4000 0x4000>;
17 clocks = <&clks 159>;
18 status = "disabled";
19};