Merge tag 'v5.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

New boards NanoPi R2S, A95X-Z2 and more Rock-Pi4 variants.
Khadas-edge additions and a some fixes.

* tag 'v5.10-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: add ir-receiver node to rk3399-khadas-edge
  arm64: dts: rockchip: add spiflash node to rk3399-khadas-edge
  arm64: dts: rockchip: Add support for FriendlyARM NanoPi R2S
  dt-bindings: Add doc for FriendlyARM NanoPi R2S
  arm64: dts: rockchip: replace status value "ok" by "okay"
  arm64: dts: rockchip: fix cpu-supply for rk3328-evb
  arm64: dts: rockchip: add rk3318 A95X Z2 board
  dt-bindings: arm: rockchip: add Zkmagic A95X Z2 description
  dt-bindings: Add vendor prefix for Shenzhen Zkmagic Technology Co., Ltd.
  arm64: dts: rockchip: Add Radxa ROCK Pi 4C support
  arm64: dts: rockchip: Add Radxa ROCK Pi 4B support
  arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts
  dt-bindings: arm: rockchip: Update ROCKPi 4 binding
  arm64: dts: rockchip: change spdif fallback compatible on rk3308
  arm64: dts: rockchip: Fix power routing to support POE on rk3399-roc-pc

Link: https://lore.kernel.org/r/16010805.MhVyP8KKtY@diego
Signed-off-by: Olof Johansson <olof@lixom.net>

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