diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 01:28:13 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 01:38:58 +0300 |
| commit | 282e1cd16373d9b01dc64ff9f99c74d69df1812c (patch) | |
| tree | f7f49050a8f236420e967b4c95f44a5e119c1b7d /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | 2507514680f63f790b1567cf36704228b83dc3e6 (diff) | |
| parent | e8c4c6eeaacd0fbc18fe8954b262cfd97836a76f (diff) | |
| download | linux-282e1cd16373d9b01dc64ff9f99c74d69df1812c.tar.xz | |
Merge tag 'qcom-dts-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/soc
Pull "Qualcomm Device Tree Changes for v4.15" from Andy Gross:
* Add Support for MSM8974 based Fairphone 2 phone
* Add support for MSM8974 based Sony Xperia Z2 Tablet
* Add MSM8660 GSBI6/7 nodes
* Disable GSBI6 at APQ8064 platform level
* Fix phy cells on APQ8064
* tag 'qcom-dts-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
ARM: dts: msm8974-FP2: Add USB node
ARM: dts: msm8974-FP2: Add sdhci1 node
ARM: dts: msm8974-FP2: Add regulator nodes for FP2
ARM: dts: msm8974-FP2: Introduce gpio-keys nodes
ARM: dts: qcom: Add initial DTS file for Fairphone 2 phone
ARM: dts: qcom: add MSM8660 GSBI6 and GSBI7
ARM: dts: qcom: msm8974: Add Sony Xperia Z2 Tablet
ARM: dts: qcom-apq8064: disable gsbi6 i2c by default at soc dtsi
ARM: dts: qcom-apq8064: Fix dsi and hdmi phy cells
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 1afd298eddd7..f0a8b265f6ab 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -113,6 +113,7 @@ everspin Everspin Technologies, Inc. exar Exar Corporation excito Excito ezchip EZchip Semiconductor +fairphone Fairphone B.V. faraday Faraday Technology Corporation fcs Fairchild Semiconductor firefly Firefly |