diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:52:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:52:55 +0200 |
| commit | 306df04e330bfa0f96bc49fc16db32084fa960f5 (patch) | |
| tree | d312d0a0852f8c5c47084b3c4e1e74c99812ffd0 /Documentation | |
| parent | 7fbabb52554c6916ce02599f73915576b9329559 (diff) | |
| parent | 6c59c115b0f295434cc4f917d180fecd84d39f81 (diff) | |
Merge branch 'next/soc' into for-next
Conflicts:
arch/arm/mach-omap2/cm-regbits-44xx.h
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/sirf.txt | 3 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/arm/xilinx.txt | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/sirf.txt b/Documentation/devicetree/bindings/arm/sirf.txt new file mode 100644 index 00000000000..6b07f65b32d --- /dev/null +++ b/Documentation/devicetree/bindings/arm/sirf.txt @@ -0,0 +1,3 @@ +prima2 "cb" evalutation board +Required root node properties: + - compatible = "sirf,prima2-cb", "sirf,prima2"; diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt new file mode 100644 index 00000000000..6f1ed830b4f --- /dev/null +++ b/Documentation/devicetree/bindings/arm/xilinx.txt @@ -0,0 +1,7 @@ +Xilinx Zynq EP107 Emulation Platform board + +This board is an emulation platform for the Zynq product which is +based on an ARM Cortex A9 processor. + +Required root node properties: + - compatible = "xlnx,zynq-ep107"; |