diff options
| author | Arnd Bergmann <[email protected]> | 2014-07-23 22:32:32 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2014-07-23 22:32:49 +0200 |
| commit | f8a2a45320da54cbcb45ab8d1764a30059338eaf (patch) | |
| tree | 661ae0ff4739d66ab35ce17c396699dc902a1613 | |
| parent | 185829efb867120683b7245c60baf06f831aabf6 (diff) | |
| parent | 112dc53db1c27594e3b1504189c2004115fb1914 (diff) | |
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 <[email protected]>
| -rw-r--r-- | arch/arm/boot/dts/armada-375.dtsi | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index d4619ad6e35c..c1e49e7bf0fa 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi @@ -25,6 +25,8 @@ gpio0 = &gpio0; gpio1 = &gpio1; gpio2 = &gpio2; + ethernet0 = ð0; + ethernet1 = ð1; }; clocks { @@ -156,6 +158,7 @@ #size-cells = <0>; compatible = "marvell,orion-mdio"; reg = <0xc0054 0x4>; + clocks = <&gateclk 19>; }; /* Network controller */ |