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

ASPEED device tree updates for 4.20

 - New machine: Facebook Backpack-CMM BMC and flash layout

 - OpenPower reference systems (Palmetto P8, Romulus P9) move to the
   ColdFire based FSI driver

 - Misc device tree updates from the OpenBMC project

* tag 'aspeed-4.21-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: Add Facebook Backpack-CMM BMC
  ARM: dts: Add Facebook BMC flash layout
  ARM: dts: aspeed: wspoon: Enable iio-hwmon battery
  ARM: dts: aspeed: romulus: Enable iio-hwmon-battery
  ARM: dts: aspeed: Enable VHUB on Romulus
  ARM: dts: aspeed-palmetto: Add LPC control node
  ARM: dts: aspeed: Palmetto system can use coprocessor for FSI
  ARM: dts: aspeed: Romulus system can use coprocessor for FSI

Signed-off-by: Olof Johansson <olof@lixom.net>

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