summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings/vendor-prefixes.txt
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-08-06 10:12:13 +0200
committerOlof Johansson <olof@lixom.net>2015-08-06 10:12:13 +0200
commitda5df6440834c64943e09c254dcfb8336ffbac15 (patch)
tree1d344a9b19dd1353fc5c33cebd08b33e47472b67 /Documentation/devicetree/bindings/vendor-prefixes.txt
parent027b4a6d6affec15626e3e985852cf67a6a89842 (diff)
parent60018d027d792bdfe9d98c83a470fa2cdd6a0e1a (diff)
downloadop-kernel-dev-da5df6440834c64943e09c254dcfb8336ffbac15.zip
op-kernel-dev-da5df6440834c64943e09c254dcfb8336ffbac15.tar.gz
Merge tag 'sunxi-dt-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/dt
Allwinner Device Tree changes for 4.3 A bunch of device tree patches that: - Enable the OTG controller on some boards - Various additions to the existing boards - New boards: A33 Ippo Q8H, Iteaduino Plus, * tag 'sunxi-dt-for-4.3' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux: (35 commits) ARM: dts: sun7i: Change cubietruck wifi enable pin to use mmc-pwrseq ARM: dts: sun5i: hsg-h702: Enable USB OTG controller ARM: dts: sun5i: hsg-h702: Enable side volume buttons with LRADC ARM: dts: sun8i: Enable USB DRC on Ippo Q8H-A33 tablet ARM: dts: sun5i: Enable USB DRC on A13 OLinuxIno ARM: dts: sun5i: Enable USB DRC on A10s OLinuxIno Micro ARM: dts: sun4i: Enable USB DRC on A10 OLinuxIno Lime ARM: sunxi: dt: Convert users to the PIO interrupts binding ARM: dts: sun4i: Add Iteaduino Plus A10 ARM: dts: A10s-OLinuxIno: Add a node for axp152 pmic ARM: dts: axp152: Add a dtsi file for the axp152 pmic ARM: dts: sun6i: Enable otg controller on the cs908 ARM: dts: sun4i: Enable otg controller on the mini-x ARM: dts: sun4i: Enable otg controller on the ba10-tvbox ARM: dts: sunxi: Add regulator-boot-on to usb host port regulator nodes devicetree: Add msi to the vendor-prefix list ARM: sun8i: dts: Add Ippo-q8h v1.2 with A33 ARM: dts: sun8i: sina33: Enable USB hosts ARM: dts: sun8i: Enable USB host on GA10H-A33 tablets ARM: dts: sun8i: Enable USB DRC on GA10H-A33 tablets ... 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.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt
index c918bf2..d3fbd1f 100644
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@ -136,6 +136,7 @@ mitsubishi Mitsubishi Electric Corporation
mosaixtech Mosaix Technologies, Inc.
moxa Moxa
mpl MPL AG
+msi Micro-Star International Co. Ltd.
mti Imagination Technologies Ltd. (formerly MIPS Technologies Inc.)
mundoreader Mundo Reader S.L.
murata Murata Manufacturing Co., Ltd.
OpenPOWER on IntegriCloud