diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 14:47:50 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-11 14:47:50 +0400 |
| commit | e98d6e7f7625ed60c7bc1d39aeb2375ed3918fd5 (patch) | |
| tree | bc6e9a6428229d2fca73e1447b5cbfe59866c4b4 /Documentation/devicetree/bindings | |
| parent | 4e0b7fe38345b81930363b9f1b4b324181ddcc9e (diff) | |
| parent | 2118f4b8dfc666c3e4a9e262beca79636a0852fe (diff) | |
| download | linux-e98d6e7f7625ed60c7bc1d39aeb2375ed3918fd5.tar.xz | |
Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux
Pull devicetree changes from Grant Likely:
"This branch contains bug fixes and new features for the devicetree
code.
Most of the changes are either new testcases for the selftest code or
documentation changes. The most notable change is the addition of a
phandle resolver for use when grafting in a second device tree blob
into the core tree. The resolver isn't currently used by anything
other than the selftest module, but it will be used to support device
tree overlays; probably in the v3.19 timeframe.
Also note that I've moved my normal tree from git.secretlab.ca to
git.kernel.org"
* tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux:
of/selftest: Move hash table off stack to fix large frame size
To remove non-ascii characters in of_selftest.txt
of/selftest: Use the resolver to fixup phandles
of: Introduce Device Tree resolve support.
of/selftest: Add a test for duplicate phandles
of: Don't try to search when phandle == 0
of/selftest: Test structure of device tree
of: Fix NULL dereference in selftest removal code
of: add vendor prefix for Chipidea
of: Add vendor prefix for Innolux Corporation
of: Add vendor prefix for Sitronix
devicetree: bindings: Document Gateworks vendor prefix
of: Add vendor prefix for Energy Micro
dt/documentation: add specification of dma bus information
Diffstat (limited to 'Documentation/devicetree/bindings')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 71259df60e96..f67e3f84e8bc 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -46,6 +46,7 @@ dmo Data Modul AG ebv EBV Elektronik edt Emerging Display Technologies emmicro EM Microelectronic +energymicro Silicon Laboratories (formerly Energy Micro AS) epcos EPCOS AG epfl Ecole Polytechnique Fédérale de Lausanne epson Seiko Epson Corp. @@ -62,6 +63,7 @@ globalscale Globalscale Technologies, Inc. gmt Global Mixed-mode Technology, Inc. google Google, Inc. gumstix Gumstix, Inc. +gw Gateworks Corporation haoyu Haoyu Microelectronic Co. Ltd. hisilicon Hisilicon Limited. honeywell Honeywell @@ -71,6 +73,7 @@ ibm International Business Machines (IBM) idt Integrated Device Technologies, Inc. iom Iomega Corporation img Imagination Technologies Ltd. +innolux Innolux Corporation intel Intel Corporation intercontrol Inter Control Group isee ISEE 2007 S.L. @@ -132,6 +135,7 @@ simtek sii Seiko Instruments, Inc. silergy Silergy Corp. sirf SiRF Technology, Inc. +sitronix Sitronix Technology Corporation smsc Standard Microsystems Corporation snps Synopsys, Inc. solidrun SolidRun |