Merge tag 'amlogic-arm64-dt-for-v5.18' of git://git.kernel.org/pub/scm/linux/kernel...

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>

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
Simple merge