diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-17 21:43:26 +0200 |
| commit | 3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4 (patch) | |
| tree | 7d729e347d8860c9ef5631cb8cdfa96e892f86d5 /Documentation/devicetree | |
| parent | a990cbd887585a1056b927b3b20de325f14fdf96 (diff) | |
| parent | 3d64b4496f5fd90618106555344205a522178c0c (diff) | |
| download | linux-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.tar.gz linux-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.tar.bz2 linux-3a6cb8ce07d994f6e4a3679c5478d0f18b6b86c4.zip | |
Merge branch 'zynq/master' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into next/soc
Conflicts:
arch/arm/Kconfig
arch/arm/mm/Kconfig
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/xilinx.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/xilinx.txt b/Documentation/devicetree/bindings/arm/xilinx.txt new file mode 100644 index 000000000000..6f1ed830b4f7 --- /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"; |