Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Arnd Bergmann <arnd@arndb.de>

+3
+3
arch/arm/boot/dts/armada-375.dtsi
··· 25 25 gpio0 = &gpio0; 26 26 gpio1 = &gpio1; 27 27 gpio2 = &gpio2; 28 + ethernet0 = &eth0; 29 + ethernet1 = &eth1; 28 30 }; 29 31 30 32 clocks { ··· 158 156 #size-cells = <0>; 159 157 compatible = "marvell,orion-mdio"; 160 158 reg = <0xc0054 0x4>; 159 + clocks = <&gateclk 19>; 161 160 }; 162 161 163 162 /* Network controller */