diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:08:58 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-11-07 16:08:58 +0100 |
| commit | 2d2cf5283f01c854ed403dec76d098f1b1a74767 (patch) | |
| tree | 5f3acb7c864fbd7dcaeacd52b51f02ba141c12eb /Documentation/devicetree/bindings | |
| parent | 3ab6dd0416a9ca5b3d32d0dca1b2e85bfbb9f9a0 (diff) | |
| parent | a9ce6f854581aa7c39fd94f965658aa4e7ff7892 (diff) | |
Merge tag 'realtek-arm64-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek into next/dt
Pull "Realtek ARM64 based SoC DT for v4.15" from Andreas Färber:
This refactors the RTD1295 DT, preparing for (but not yet adding)
RTD1293 and RTD1296. Superfluous reg property entries are dropped.
DTs for PROBOX2 AVA and MeLE V9 TV boxes are added.
* tag 'realtek-arm64-dt-for-4.15' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek:
arm64: dts: realtek: Add MeLE V9
dt-bindings: arm: realtek: Document MeLE V9
dt-bindings: Add vendor prefix for MeLE
arm64: dts: realtek: Factor out common RTD129x parts
arm64: dts: realtek: Add ProBox2 Ava
dt-bindings: arm: realtek: Add ProBox2 AVA
dt-bindings: Add vendor prefix for ProBox2
arm64: dts: realtek: Clean up RTD1295 UART reg property
Diffstat (limited to 'Documentation/devicetree/bindings')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/realtek.txt | 2 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/realtek.txt b/Documentation/devicetree/bindings/arm/realtek.txt index 13d755787b4f..95839e19ae92 100644 --- a/Documentation/devicetree/bindings/arm/realtek.txt +++ b/Documentation/devicetree/bindings/arm/realtek.txt @@ -12,6 +12,8 @@ Required root node properties: Root node property compatible must contain, depending on board: + - MeLE V9: "mele,v9" + - ProBox2 AVA: "probox2,ava" - Zidoo X9S: "zidoo,x9s" diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index edc3b26a445c..3d674d4ac46e 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -199,6 +199,7 @@ mcube mCube meas Measurement Specialties mediatek MediaTek Inc. megachips MegaChips +mele Shenzhen MeLE Digital Technology Ltd. melexis Melexis N.V. melfas MELFAS Inc. mellanox Mellanox Technologies @@ -265,6 +266,7 @@ plathome Plat'Home Co., Ltd. plda PLDA poslab Poslab Technology Co., Ltd. powervr PowerVR (deprecated, use img) +probox2 PROBOX2 (by W2COMP Co., Ltd.) pulsedlight PulsedLight, Inc qca Qualcomm Atheros, Inc. qcom Qualcomm Technologies, Inc |