Merge tag 'aspeed-5.11-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git...

ASPEED device tree updates for 5.11

 - New machines

   * Bytedance G220A, an AST2500 BMC for an x86 server
   * Facebook Galaxy100, an AST2400 BMC for a network switch
   * IBM Rainier 4U, an AST2600 BMC for a PowerPC server

 - Reworking of Facebook device trees to use common dtsi

 - A 64MB flash layout used by the G220A

 - Misc updates to tiogapass, ethanolx, s2600wf, tacoma and rainier

* tag 'aspeed-5.11-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: (25 commits)
  ARM: dts: aspeed: ast2600evb: Add MAC0
  ARM: dts: aspeed: rainier: Don't shout addresses
  ARM: dts: aspeed: rainier: Mark FSI SPI controllers as restricted
  ARM: dts: tacoma: Add reserved memory for ramoops
  ARM: dts: rainier: Add reserved memory for ramoops
  ARM: dts: tacoma: Fix node vs reg mismatch for flash memory
  ARM: dts: aspeed: rainier: Add 4U device-tree
  arm: dts: aspeed: tiogapass: Enable second MAC
  ARM: dts: aspeed: minipack: Fixup I2C tree
  ARM: dts: aspeed: wedge400: Fix FMC flash0 layout
  ARM: dts: aspeed: Add Facebook Galaxy100 (AST2400) BMC
  ARM: dts: aspeed: wedge100: Use common dtsi
  ARM: dts: aspeed: wedge40: Use common dtsi
  ARM: dts: aspeed: Common dtsi for Facebook AST2400 Network BMCs
  ARM: dts: aspeed: amd-ethanolx: Add GPIO line names
  ARM: dts: aspeed: amd-ethanolx: Enable devices for the iKVM functionality
  ARM: dts: aspeed: amd-ethanolx: Enable KCS channel 3
  ARM: dts: aspeed: tiogapass: Remove vuart
  ARM: dts: Fix label address for 64MiB OpenBMC flash layout
  ARM: dts: aspeed: g220a: Add some gpios
  ...

Link: https://lore.kernel.org/r/CACPK8Xfd7AmuEaUdFfYLu4ktcrpTnYUgwQSxUbC-McB02hvo_g@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/boot/dts/Makefile
Simple merge