diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-27 16:24:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-27 16:24:08 -0800 |
| commit | f0ac4f3e067dc9b233de9300214a98cc4ccb46d3 (patch) | |
| tree | ba31ce894823db61a8dc29fb399a2daa8d4cadab /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | a5565a217520d12ef8d6349456a63592875999b3 (diff) | |
| parent | 11ff8c86d74002cb493407742fd1c128055e1abe (diff) | |
| download | lwn-f0ac4f3e067dc9b233de9300214a98cc4ccb46d3.tar.gz lwn-f0ac4f3e067dc9b233de9300214a98cc4ccb46d3.zip | |
Merge tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "ARM: rockchip: second batch of dts updates for 3.20" from Heiko Stübner:
Basic display nodes for crtcs and hdmi encoder, timer node
for the broadcast timer going through the clocksource tree
and two new boards, the rk3288-based Firefly and the
PX2-based Rayeager board (the PX2 is identical to the rk3066
but made for industrial users).
* tag 'v3.20-rockchip-dts2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: add dts for ChipSPARK Rayeager PX2 board
ARM: dts: rockchip: add dts for Firefly Firefly-RK3288 boards
dt-bindings: add vendor prefix and root compatible property for Rockchip boards
ARM: dts: rockchip: Add rockchip timer node for rk3288
ARM: dts: rockchip: add rk3288 hdmi nodes
ARM: dts: rockchip: Add rk3288 vop and display-subsystem
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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 74187660619b..e02e14d95e0f 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -32,6 +32,7 @@ capella Capella Microsystems, Inc cavium Cavium, Inc. cdns Cadence Design Systems Inc. chipidea Chipidea, Inc +chipspark ChipSPARK chrp Common Hardware Reference Platform chunghwa Chunghwa Picture Tubes Ltd. cirrus Cirrus Logic, Inc. @@ -60,6 +61,7 @@ eukrea Eukréa Electromatique everest Everest Semiconductor Co. Ltd. excito Excito fcs Fairchild Semiconductor +firefly Firefly fsl Freescale Semiconductor GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc. gef GE Fanuc Intelligent Platforms Embedded Systems, Inc. |