diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 14:58:41 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-29 14:58:41 +0300 |
| commit | 047d378a0075cc1559614270a1c9a5ce56b2a882 (patch) | |
| tree | 47e0e3349150e1c51c895e334a1e6f920208703a /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | db695b5ecfc76c917d48fe443988806c3de7e584 (diff) | |
| parent | 4481b18b7cf023c57085b3c7db762dc4d7f1873b (diff) | |
| download | linux-047d378a0075cc1559614270a1c9a5ce56b2a882.tar.xz | |
Merge tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx into next/dt
Merge "arm: Xilinx Zynq dt patches for v4.2" from Michal Simek:
- Fix aliases and stdout properties
- Document current TTC binding
- Add Ceva to prefixes
- Use new compatible string for MACB
* tag 'zynq-dt-for-4.2' of https://github.com/Xilinx/linux-xlnx:
ARM: zynq: DT: Use the zynq binding with macb
of: Add vendor prefix for Ceva
PCI: xilinx: Trivial fix in DT example
devicetree: cadence_ttc: Document binding for timer width
ARM: dts: zynq: Fix stdout-path and bootargs
ARM: dts: zynq: Add missing alias node for zybo and parallella
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 826f573a4009..d55b4e9a9dce 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -40,6 +40,7 @@ calxeda Calxeda capella Capella Microsystems, Inc cavium Cavium, Inc. cdns Cadence Design Systems Inc. +ceva Ceva, Inc. chipidea Chipidea, Inc chipone ChipOne chipspark ChipSPARK |