Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8a2a453 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-dt-3.17-3' of git://git.infradead.org/linux-mvebu into next/dt 

Merge "mvebu DT changes for v3.17 (round 3)" from Jason Cooper:

 - Armada 375
    - Fix ethernet aliases for new node added for v3.17
    - Add missing MDIO clock for new node added for v3.17

* tag 'mvebu-dt-3.17-3' of git://git.infradead.org/linux-mvebu

:
  ARM: mvebu: Add missing MDIO clock in Armada 375
  ARM: mvebu: Add ethernet aliases required by U-Boot

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 185829ef 112dc53d

arch/arm/boot/dts/armada-375.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ 
		gpio0 = &gpio0;

		gpio1 = &gpio1;

		gpio2 = &gpio2;

		ethernet0 = &eth0;

		ethernet1 = &eth1;

	};



	clocks {
@@ -156,6 +158,7 @@ 
				#size-cells = <0>;

				compatible = "marvell,orion-mdio";

				reg = <0xc0054 0x4>;

				clocks = <&gateclk 19>;

			};



			/* Network controller */