Merge tag 'aspeed-5.5-devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Wed, 8 Jan 2020 18:24:48 +0000 (10:24 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 8 Jan 2020 18:24:50 +0000 (10:24 -0800)
commit9f1c2cb3296a252bd84d56f80346369bd0d95387
treed9ade2b9a964d7c4b8769d72bf75537096a2fc95
parentfe013e2121c63bb2a3d0741d9245679e3f4028d2
parentffcdc5df08bfc4f418693b22cf2a1182de3375b4
Merge tag 'aspeed-5.5-devicetree-fixes' of git://git./linux/kernel/git/joel/aspeed into arm/fixes

ASPEED device tree fixes for 5.5

Fixes for some badly applied patches that went in to 5.5. There is also
a fix for an incorrect i2c address.

* tag 'aspeed-5.5-devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: rainier: Fix fan fault and presence
  ARM: dts: aspeed: rainier: Remove duplicate i2c busses
  ARM: dts: aspeed: tacoma: Remove duplicate flash nodes
  ARM: dts: aspeed: tacoma: Remove duplicate i2c busses
  ARM: dts: aspeed: tacoma: Fix fsi master node
  ARM: dts: aspeed-g6: Fix FSI master location

Link: https://lore.kernel.org/r/CACPK8XcjazgORXNZBU1ECMukXG4HA8D9VeDxiSPifDk_iB7_dw@mail.gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>