diff options
author | Arnd Bergmann | 2017-06-29 17:16:12 +0200 |
---|---|---|
committer | Arnd Bergmann | 2017-06-29 17:16:12 +0200 |
commit | 30c2a6582869055132fb59fb28624d6703d202fe (patch) | |
tree | 7e7bb4da29503bf75d218e5531dafe2d77f401a1 /Documentation/devicetree | |
parent | Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/k... (diff) | |
parent | arm64: dts: Add Actions Semi S900 and Bubblegum-96 (diff) | |
download | kernel-qcow2-linux-30c2a6582869055132fb59fb28624d6703d202fe.tar.gz kernel-qcow2-linux-30c2a6582869055132fb59fb28624d6703d202fe.tar.xz kernel-qcow2-linux-30c2a6582869055132fb59fb28624d6703d202fe.zip |
Merge tag 'actions-arm64-dt-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions into next/dt64
Pull "Actions Semi ARM64 based SoC DT for 4.13" from Andreas Färber:
This adds an initial DT for the S900 SoC and a devboard based on it.
* tag 'actions-arm64-dt-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions:
arm64: dts: Add Actions Semi S900 and Bubblegum-96
dt-bindings: Add vendor prefix for uCRobotics
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 6856b369c01c..8e5e87869a85 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -333,6 +333,7 @@ tronfy Tronfy tronsmart Tronsmart truly Truly Semiconductors Limited tyan Tyan Computer Corporation +ucrobotics uCRobotics udoo Udoo uniwest United Western Technologies Corp (UniWest) upisemi uPI Semiconductor Corp. |