diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-17 00:46:38 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-17 00:46:40 +0100 |
| commit | 5a74e85ae4baa4aac5b43b4ced0a322d9d400430 (patch) | |
| tree | ba80f85ed85d52054990ef8bb002cfdc83ba7b95 /Documentation | |
| parent | Merge tag 'qcom-dts-for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | arm64: dts: meson: add audio fifo depths (diff) | |
| download | linux-5a74e85ae4baa4aac5b43b4ced0a322d9d400430.tar.xz linux-5a74e85ae4baa4aac5b43b4ced0a322d9d400430.zip | |
Merge tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.6
- new boards: libretech-pc (S912 and S905D versions)
- new board: Videostrong KII Pro
- A1: add reset controller
* tag 'amlogic-dt64' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson: add audio fifo depths
arm64: dts: meson: add libretech-pc boards support
dt-bindings: arm: amlogic: add libretech-pc bindings
arm64: dts: meson: gxl: add i2c C pins
arm64: dts: meson-sm1: add video decoder compatible
arm64: dts: meson-g12-common: add video decoder node
arm64: dts: meson-gxbb: add support for Videostrong KII Pro
dt-bindings: arm: amlogic: add Videostrong KII Pro bindings
dt-bindings: Add vendor prefix for Videostrong
arm64: dts: meson: a1: add pinctrl controller support
arm64: dts: meson: add reset controller for Meson-A1 SoC
Link: https://lore.kernel.org/r/7hsgkidi3k.fsf@baylibre.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.yaml | 3 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml index c6a443352ef8..f74aba48cec1 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -59,6 +59,7 @@ properties: - friendlyarm,nanopi-k2 - hardkernel,odroid-c2 - nexbox,a95x + - videostrong,kii-pro - wetek,hub - wetek,play2 - const: amlogic,meson-gxbb @@ -104,6 +105,7 @@ properties: - enum: - amlogic,p230 - amlogic,p231 + - libretech,aml-s905d-pc - phicomm,n1 - const: amlogic,s905d - const: amlogic,meson-gxl @@ -115,6 +117,7 @@ properties: - amlogic,q201 - khadas,vim2 - kingnovel,r-box-pro + - libretech,aml-s912-pc - nexbox,a1 - tronsmart,vega-s96 - const: amlogic,s912 diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 6046f4555852..5c0577625ba9 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -1012,6 +1012,8 @@ patternProperties: description: Variscite Ltd. "^via,.*": description: VIA Technologies, Inc. + "^videostrong,.*": + description: Videostrong Technology Co., Ltd. "^virtio,.*": description: Virtual I/O Device Specification, developed by the OASIS consortium "^vishay,.*": |