diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 17:43:48 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-09-13 17:43:48 +0200 |
| commit | 327c2c1562c9bfe001e4e773c05d9cd731a4883e (patch) | |
| tree | ccf5265d1344e0f9bf090c87426e49062b8ed8e4 /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | 4dbacf2cdea7f372fddd576ff582634c8c2dc1f0 (diff) | |
| parent | 17470b7da11c137267c74ff0d2d4cca56f595c60 (diff) | |
Merge tag 'clcd-nomadik' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt
Pull "CLCD graphics on the Nomadik NHK15" from Linus Walleij:
* tag 'clcd-nomadik' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
ARM: dts: add the CLCD LCD display to the NHK15
ARM: dts: add PMU to the NHK15 device tree
ARM: nomadik: select MFD_SYSCON
dt-bindings: Add TPO TPG110 binding
dt-bindings: add vendor TPO
ARM: dts: add STMPE PWM to the NHK15 device tree
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 cc15e9911dc8..97730d3fef6c 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -272,6 +272,7 @@ toshiba Toshiba Corporation toumaz Toumaz tplink TP-LINK Technologies Co., Ltd. tpk TPK U.S.A. LLC +tpo TPO tronfy Tronfy tronsmart Tronsmart truly Truly Semiconductors Limited |