Merge branch 'highbank/devel' into next/devel

00e92980 · Olof Johansson · 1dc9fff7 · b8a960c2 · 00e92980
Commit 00e92980 authored Dec 13, 2011 by Olof Johansson
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 0 deletions

arch/arm/boot/dts/highbank.dts arch/arm/boot/dts/highbank.dts +12 -0

No files found.
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@ -194,5 +194,17 @@ dma@fff3d000 {
 			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>;
+		};
 	};
 };