Unverified Commit 6ebeca34 authored Aug 02, 2021 by Arnd Bergmann

Merge tag 'mvebu-fixes-5.14-1' of...

Merge tag 'mvebu-fixes-5.14-1' of git://git.kernel.org/pub/scm/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>

parents b07bf042 ee7ab3f2

arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts

+3 −0

Original line number	Diff line number	Diff line
		@@ -19,6 +19,8 @@ / {
		aliases {
		spi0 = &spi0;
		ethernet1 = &eth1;
		mmc0 = &sdhci0;
		mmc1 = &sdhci1;
		};

		chosen {
		@@ -119,6 +121,7 @@ &i2c0 {
		pinctrl-names = "default";
		pinctrl-0 = <&i2c1_pins>;
		clock-frequency = <100000>;
		/delete-property/ mrvl,i2c-fast-mode;
		status = "okay";

		rtc@6f {