Merge tag 'mvebu-fixes-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclem...
authorArnd Bergmann <arnd@arndb.de>
Mon, 2 Aug 2021 12:38:24 +0000 (14:38 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 2 Aug 2021 12:38:25 +0000 (14:38 +0200)
commit6ebeca342f96a7c371ed5fe53189dd56fe0c0330
tree58693481446083ab14b01f9625d96149b760ff89
parentb07bf042e678f5eac856052d332869423e365af0
parentee7ab3f263f8131722cff3871b9618b1e7478f07
Merge tag 'mvebu-fixes-5.14-1' of git://git./linux/kernel/git/gclement/mvebu into arm/fixes

mvebu fixes for 5.14 (part 1)

- Fix i2c property for armada-3720-turris-mox in order to use SFP

- Add mmc alias on armada-3720-turris-mox to allow rootfs using the
  right mmc

* tag 'mvebu-fixes-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu:
  arm64: dts: armada-3720-turris-mox: remove mrvl,i2c-fast-mode
  arm64: dts: armada-3720-turris-mox: fixed indices for the SDHC controllers

Link: https://lore.kernel.org/r/87k0l7zx4v.fsf@BL-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>