diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:09:20 +0100 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:09:20 +0100 |
commit | 05e121af947aa59647762aaf3773b6f53f498f67 (patch) | |
tree | d9697c5b3d78396ecb98d251a35e856bbf24118c /arch/arm/boot/dts/armada-370-db.dts | |
parent | bb4f6ce2f3683e11e79d923eac945e49ddb6df4a (diff) | |
parent | 9f32cccc67590ccda30529bcbcea5c22d95c00a6 (diff) | |
download | blackbird-op-linux-05e121af947aa59647762aaf3773b6f53f498f67.tar.gz blackbird-op-linux-05e121af947aa59647762aaf3773b6f53f498f67.zip |
Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge
Marvell boards changes related to Ethernet, for 3.8
Conflicts:
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-xp-db.dts
Diffstat (limited to 'arch/arm/boot/dts/armada-370-db.dts')
-rw-r--r-- | arch/arm/boot/dts/armada-370-db.dts | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts index cfc080777da1..63120569878a 100644 --- a/arch/arm/boot/dts/armada-370-db.dts +++ b/arch/arm/boot/dts/armada-370-db.dts @@ -38,5 +38,28 @@ nr-ports = <2>; status = "okay"; }; + + mdio { + phy0: ethernet-phy@0 { + reg = <0>; + }; + + phy1: ethernet-phy@1 { + reg = <1>; + }; + }; + + ethernet@d0070000 { + clock-frequency = <200000000>; + status = "okay"; + phy = <&phy0>; + phy-mode = "rgmii-id"; + }; + ethernet@d0074000 { + clock-frequency = <200000000>; + status = "okay"; + phy = <&phy1>; + phy-mode = "rgmii-id"; + }; }; }; |