diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-20 12:22:56 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-20 12:22:56 -0700 |
| commit | 87adf92b95715ece8c8102e465d0682d57037d22 (patch) | |
| tree | 15fab7157c9337d927bc487ee45f17f782f5d106 /Documentation/devicetree | |
| parent | aaaa10b0961f1fca534dea100ace0fc2991a07dd (diff) | |
| parent | d854fa8a1500bec982ed9cb26b82d96bd5ae8dab (diff) | |
| download | linux-87adf92b95715ece8c8102e465d0682d57037d22.tar.gz linux-87adf92b95715ece8c8102e465d0682d57037d22.tar.bz2 linux-87adf92b95715ece8c8102e465d0682d57037d22.zip | |
Merge tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu into next/dt
Merge "ARM: mvebu: DT changes for v3.17" from Jason Cooper:
mvebu DT changes for v3.17
- kirkwood
* add boards net2big and net5big
- dove
* add vendor prefix for SolidRun
* split CuBox into it's variants
* tag 'mvebu-dt-3.17' of git://git.infradead.org/linux-mvebu:
ARM: kirkwood: fix net5big regulator gpio assignments
ARM: dts: mvebu: split SolidRun CuBox into variants
dt-binding: add vendor prefix for SolidRun
ARM: Kirkwood: Add DT descriptions for net2big and net5big.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree')
| -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 46a311e728a8..4c4883e05df7 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -122,6 +122,7 @@ sii Seiko Instruments, Inc. sirf SiRF Technology, Inc. smsc Standard Microsystems Corporation snps Synopsys, Inc. +solidrun SolidRun spansion Spansion Inc. st STMicroelectronics ste ST-Ericsson |