diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:55 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 21:46:55 -0400 |
| commit | abc3f126ac736280c68db6472eb0040ddf6e1b1f (patch) | |
| tree | 4e3333cde6da6c49dcd81920410bf5a33055f03a /Documentation/devicetree/bindings | |
| parent | b8df0ea26ac17c9a073f235c7fdfbdd1851b59ea (diff) | |
| parent | 8bcb97659656042f3132b2814b19709856aa1335 (diff) | |
Merge branch 'imx/imx6q' into next/soc
Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/plat-mxc/include/mach/common.h
Diffstat (limited to 'Documentation/devicetree/bindings')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/fsl.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt index e2401cd632ab..c9848ad0e2e3 100644 --- a/Documentation/devicetree/bindings/arm/fsl.txt +++ b/Documentation/devicetree/bindings/arm/fsl.txt | |||
| @@ -1,3 +1,6 @@ | |||
| 1 | Freescale i.MX Platforms Device Tree Bindings | ||
| 2 | ----------------------------------------------- | ||
| 3 | |||
| 1 | i.MX51 Babbage Board | 4 | i.MX51 Babbage Board |
| 2 | Required root node properties: | 5 | Required root node properties: |
| 3 | - compatible = "fsl,imx51-babbage", "fsl,imx51"; | 6 | - compatible = "fsl,imx51-babbage", "fsl,imx51"; |
| @@ -17,3 +20,7 @@ Required root node properties: | |||
| 17 | i.MX53 Smart Mobile Reference Design Board | 20 | i.MX53 Smart Mobile Reference Design Board |
| 18 | Required root node properties: | 21 | Required root node properties: |
| 19 | - compatible = "fsl,imx53-smd", "fsl,imx53"; | 22 | - compatible = "fsl,imx53-smd", "fsl,imx53"; |
| 23 | |||
| 24 | i.MX6 Quad SABRE Automotive Board | ||
| 25 | Required root node properties: | ||
| 26 | - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; | ||