diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-30 12:54:57 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-30 12:54:57 -0700 |
| commit | 8b510129bad3974dda864466b5d811c6527dab3d (patch) | |
| tree | 3e8e4d2870bc3b5c407acff4535339080231e7f0 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | ae171be4e08b86bb24b3591be49d6e29940abff8 (diff) | |
| parent | 6a3246c02e7bcb16a58f3fcee4662a9b36ea80e9 (diff) | |
| download | linux-8b510129bad3974dda864466b5d811c6527dab3d.tar.bz2 | |
Merge tag 'zynq-dt-for-3.17-3' of git://git.xilinx.com/linux-xlnx into next/dt
Merge "Xilinx Zynq dt changes for v3.17 - third pull request" from Michal
Simek:
arm: Xilinx Zynq dt patches for v3.17 third pull request
- Add Adapteva Parallella board/DT
- Add SPI nodes
- Add CAN nodes
- Clean Zynq description
* tag 'zynq-dt-for-3.17-3' of git://git.xilinx.com/linux-xlnx:
ARM: zynq: DT: Clarify Xilinx Zynq platform
ARM: zynq: DT: Remove DMA from board DTs
ARM: zynq: DT: Add CAN node
ARM: dts: zynq: Add SPI
ARM: dts: zynq: Add DMAC for Parallella
ARM: dts: zynq: Add Parallella device tree
Documentation: devicetree: Adapteva boards
Documentation: devicetree: Adapteva vendor prefix
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 8ad36468234b..4257f3f98c3d 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -6,6 +6,7 @@ using them to avoid name-space collisions. abilis Abilis Systems active-semi Active-Semi International Inc ad Avionic Design GmbH +adapteva Adapteva, Inc. adi Analog Devices, Inc. aeroflexgaisler Aeroflex Gaisler AB ak Asahi Kasei Corp. |