diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-02-25 16:02:02 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-02-25 16:02:03 +0100 |
| commit | 3b364358cb9e46ec4a3c9d75f1b4ec8ec863f6e7 (patch) | |
| tree | 68297c56859f2fc938062675ce5399cc692298ff /Documentation | |
| parent | fee1601dc26eb1d70c46f30ba6cff591fbdb6161 (diff) | |
| parent | d926a4fe25338e120ab49547de9707dc6e5e5824 (diff) | |
Merge tag 'amlogic-arm64-dt-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/dt
Amlogic ARM64 DT changes for v5.18:
- New Boards:
- Amediatek X96-AIR (Amlogic S905X3)
- CYX A95XF3-AIR (Amlogic S905X3)
- Haochuangy H96-Max (Amlogic S905X3)
- Amlogic AQ222 (Amlogic S4)
- OSMC Vero 4K+ (Amlogic S905D)
- Initial support for Amlogic S4
- Support for uart_ao_b & pwm_f on G12 SoCs
* tag 'amlogic-arm64-dt-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux:
arm64: dts: meson: add support for OSMC Vero 4K+
dt-bindings: arm: amlogic: add Vero 4K+ bindings
dt-bindings: vendor-prefixes: add osmc prefix
arm64: dts: meson-g12-common: add uart_ao_b pins muxing
arm64: dts: meson-g12-common: add more pwm_f options
arm64: dts: add support for S4 based Amlogic AQ222
arm64: dts: meson: add initial device-tree for H96-Max
dt-bindings: arm: amlogic: add H96-Max bindings
dt-bindings: vendor-prefixes: add haochuangyi prefix
arm64: dts: meson: add initial device-trees for A95XF3-AIR
dt-bindings: arm: amlogic: add A95XF3-AIR bindings
dt-bindings: vendor-prefixes: add cyx prefix
arm64: dts: meson: add initial device-trees for X96-AIR
dt-bindings: arm: amlogic: add X96-AIR bindings
arm64: dts: meson: add common SM1 ac2xx dtsi
arm64: dts: meson-sm1: add spdifin and pdifout nodes
dt-bindings: arm: amlogic: add S4 based AQ222 bindings
Link: https://lore.kernel.org/r/a7cd9937-d441-3e1f-9709-8e80cc8814f1@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.yaml | 12 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.yaml | 6 |
2 files changed, 18 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml index 36081734f720..61a6cabb375b 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -108,6 +108,7 @@ properties: - amlogic,p230 - amlogic,p231 - libretech,aml-s905d-pc + - osmc,vero4k-plus - phicomm,n1 - smartlabs,sml5442tw - videostrong,gxl-kii-pro @@ -170,9 +171,14 @@ properties: - description: Boards with the Amlogic Meson SM1 S905X3/D3/Y3 SoC items: - enum: + - amediatech,x96-air + - amediatech,x96-air-gbit - bananapi,bpi-m5 + - cyx,a95xf3-air + - cyx,a95xf3-air-gbit - hardkernel,odroid-c4 - hardkernel,odroid-hc4 + - haochuangyi,h96-max - khadas,vim3l - seirobotics,sei610 - const: amlogic,sm1 @@ -183,6 +189,12 @@ properties: - amlogic,ad401 - const: amlogic,a1 + - description: Boards with the Amlogic Meson S4 S805X2 SoC + items: + - enum: + - amlogic,aq222 + - const: amlogic,s4 + additionalProperties: true ... diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml index 2c5b31fe0e36..6d1e7c98cdda 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@ -285,6 +285,8 @@ patternProperties: description: CUI Devices "^cypress,.*": description: Cypress Semiconductor Corporation + "^cyx,.*": + description: Shenzhen CYX Industrial Co., Ltd "^cznic,.*": description: CZ.NIC, z.s.p.o. "^dallas,.*": @@ -491,6 +493,8 @@ patternProperties: deprecated: true "^hannstar,.*": description: HannStar Display Corporation + "^haochuangyi,.*": + description: Shenzhen Haochuangyi Technology Co.,Ltd "^haoyu,.*": description: Haoyu Microelectronic Co. Ltd. "^hardkernel,.*": @@ -896,6 +900,8 @@ patternProperties: description: Ortus Technology Co., Ltd. "^osddisplays,.*": description: OSD Displays + "^osmc,.*": + description: Sam Nazarko Trading Ltd. (Open Source Media Centre) "^ouya,.*": description: Ouya Inc. "^overkiz,.*": |