diff options
author | Arnd Bergmann <arnd@arndb.de> | 2020-05-26 00:20:16 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2020-05-26 00:20:16 +0200 |
commit | 34a07a8da3a0cafe3799f74a76597081fd184842 (patch) | |
tree | 6d0b450cbc321f26ddfe956d70c734677feec895 /Documentation/devicetree/bindings | |
parent | Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilm... (diff) | |
parent | arm64: dts: meson-g12b-gtking-pro: add initial device-tree (diff) | |
download | linux-34a07a8da3a0cafe3799f74a76597081fd184842.tar.xz linux-34a07a8da3a0cafe3799f74a76597081fd184842.zip |
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.8
Highlights:
- new boards :Beelink GT-King Pro (G12B SoC), Smartlabs SML-5442TW
(S905D), Hardkernel ODROID-C4 (SM1)
- audio: support for GX-family SoCs
- audio: internal DAC support
- use the new USB control driver for GXL and GXM
* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: (33 commits)
arm64: dts: meson-g12b-gtking-pro: add initial device-tree
dt-bindings: arm: amlogic: add support for the Beelink GT-King Pro
arm64: dts: meson-g12b-gtking: add initial device-tree
dt-bindings: arm: amlogic: add support for the Beelink GT-King
arm64: dts: meson: convert ugoos-am6 to common w400 dtsi
arm64: dts: meson: add ethernet interrupt to wetek dtsi
arm64: dts: meson: add support for the Smartlabs SML-5442TW
dt-bindings: arm: amlogic: add support for the Smartlabs SML-5442TW
dt-bindings: add vendor prefix for Smartlabs LLC
arm64: dts: meson: g12: add internal DAC glue
arm64: dts: meson: g12: add internal DAC
arm64: dts: meson: libretech-pc: add internal DAC support
arm64: dts: meson: libretech-ac: add internal DAC support
arm64: dts: meson: libretech-cc: add internal DAC support
arm64: dts: meson: p230-q200: add internal DAC support
arm64: dts: meson: gxl: add acodec support
arm64: dts: meson-sm1: add support for Hardkernel ODROID-C4
dt-bindings: arm: amlogic: add odroid-c4 bindings
arm64: dts: meson-sm1: add cpu thermal nodes
arm64: dts: meson-g12b: move G12B thermal nodes to meson-g12b.dtsi
...
Link: https://lore.kernel.org/r/5ec6f56a.1c69fb81.fc5d5.9ca6@mx.google.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.yaml | 4 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.yaml | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml index f74aba48cec1..db35e0d0134c 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -107,6 +107,7 @@ properties: - amlogic,p231 - libretech,aml-s905d-pc - phicomm,n1 + - smartlabs,sml5442tw - const: amlogic,s905d - const: amlogic,meson-gxl @@ -148,6 +149,8 @@ properties: - description: Boards with the Amlogic Meson G12B S922X SoC items: - enum: + - azw,gtking + - azw,gtking-pro - hardkernel,odroid-n2 - khadas,vim3 - ugoos,am6 @@ -159,6 +162,7 @@ properties: - enum: - seirobotics,sei610 - khadas,vim3l + - hardkernel,odroid-c4 - const: amlogic,sm1 - description: Boards with the Amlogic Meson A1 A113L SoC diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index a751c7b4d0af..b9e72722627c 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -940,6 +940,8 @@ patternProperties: description: Sitronix Technology Corporation "^skyworks,.*": description: Skyworks Solutions, Inc. + "^smartlabs,.*": + description: SmartLabs LLC "^smsc,.*": description: Standard Microsystems Corporation "^snps,.*": |