diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 12:59:11 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-09-03 10:20:06 -0700 |
| commit | 56e9e0f3a3c558b42db2dd5120d3a839e4beb282 (patch) | |
| tree | f639ac890abbbf990aa7d3ddee0830eae8f8d7a0 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | 103c6a71207f80e6ecfeba2c21d6246687bb0ee4 (diff) | |
| parent | 620f5e1cbfc16aa1bd39c2c5386aee4d00850641 (diff) | |
Merge branch 'socfpga/dt' into next/dt
SoCFPGA DT changes from Dinh Nguyen.
* socfpga/dt:
dts: Rename DW APB timer compatible strings
dts: Deprecate ALTR as a vendor prefix
of: add vendor prefix for Altera Corp.
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 366ce9b8724..ea95767cfed 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -7,6 +7,7 @@ ad Avionic Design GmbH adi Analog Devices, Inc. aeroflexgaisler Aeroflex Gaisler AB ak Asahi Kasei Corp. +altr Altera Corp. amcc Applied Micro Circuits Corporation (APM, formally AMCC) apm Applied Micro Circuits Corporation (APM) arm ARM Ltd. |