diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-08 10:24:48 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-08 10:24:50 -0800 |
| commit | 9f1c2cb3296a252bd84d56f80346369bd0d95387 (patch) | |
| tree | d9ade2b9a964d7c4b8769d72bf75537096a2fc95 /include | |
| parent | fe013e2121c63bb2a3d0741d9245679e3f4028d2 (diff) | |
| parent | ffcdc5df08bfc4f418693b22cf2a1182de3375b4 (diff) | |
| download | linux-9f1c2cb3296a252bd84d56f80346369bd0d95387.tar.bz2 | |
Merge tag 'aspeed-5.5-devicetree-fixes' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions