diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-13 15:01:23 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-13 15:01:23 -0800 |
| commit | 00e929808a1cb410f45a620c0fc79d8d0a2506b1 (patch) | |
| tree | 6be9498bb401f5c44c9c64ca1516ef4a725b2f8c /arch/arm | |
| parent | 1dc9fff73be3103fb1049bc2d66086f980e005b8 (diff) | |
| parent | b8a960c22724d40651f156c23210782229d9d5ed (diff) | |
| download | op-kernel-dev-00e929808a1cb410f45a620c0fc79d8d0a2506b1.zip op-kernel-dev-00e929808a1cb410f45a620c0fc79d8d0a2506b1.tar.gz | |
Merge branch 'highbank/devel' into next/devel
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/highbank.dts | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts index aeb1a75..305635b 100644 --- a/arch/arm/boot/dts/highbank.dts +++ b/arch/arm/boot/dts/highbank.dts @@ -194,5 +194,17 @@ reg = <0xfff3d000 0x1000>; interrupts = <0 92 4>; }; + + ethernet@fff50000 { + compatible = "calxeda,hb-xgmac"; + reg = <0xfff50000 0x1000>; + interrupts = <0 77 4 0 78 4 0 79 4>; + }; + + ethernet@fff51000 { + compatible = "calxeda,hb-xgmac"; + reg = <0xfff51000 0x1000>; + interrupts = <0 80 4 0 81 4 0 82 4>; + }; }; }; |
