diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 14:51:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 14:51:24 -0800 |
| commit | 578bd83d7e2bbf533c6968291abb36850c6eaff8 (patch) | |
| tree | ed9643d02f34d28036f4fc07d2211ad0b91219cb /Documentation/devicetree | |
| parent | 58c017750dc00793cf9ee292a5ce4df1748e852f (diff) | |
| parent | 1bccc8077f4ddbd64d7d085501baa2543182f29e (diff) | |
| download | talos-obmc-linux-578bd83d7e2bbf533c6968291abb36850c6eaff8.tar.gz talos-obmc-linux-578bd83d7e2bbf533c6968291abb36850c6eaff8.zip | |
Merge branch 'imx6/boards' into next/boards
* imx6/boards:
ARM: imx6q: generate imx6q dtb files
arm/imx6q: Rename Sabreauto to Armadillo2
arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
arm/imx6: add imx6q sabrelite board support
dts/imx: rename uart labels to consistent with hw spec
dts/imx: rename gpio labels to consistent with hw spec
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/fsl.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/fsl.txt b/Documentation/devicetree/bindings/arm/fsl.txt index c9848ad0e2e3..54bdddadf1cf 100644 --- a/Documentation/devicetree/bindings/arm/fsl.txt +++ b/Documentation/devicetree/bindings/arm/fsl.txt @@ -21,6 +21,10 @@ i.MX53 Smart Mobile Reference Design Board Required root node properties: - compatible = "fsl,imx53-smd", "fsl,imx53"; -i.MX6 Quad SABRE Automotive Board +i.MX6 Quad Armadillo2 Board Required root node properties: - - compatible = "fsl,imx6q-sabreauto", "fsl,imx6q"; + - compatible = "fsl,imx6q-arm2", "fsl,imx6q"; + +i.MX6 Quad SABRE Lite Board +Required root node properties: + - compatible = "fsl,imx6q-sabrelite", "fsl,imx6q"; |
