From 4d55e6e12ea4db48c486e2d98b68b2feb99aab9b Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Sun, 19 May 2013 00:47:39 +0200
Subject: [PATCH] --- yaml --- r: 376234 b: refs/heads/master c:
 b98da4db297bad34a5577df36ff4cb2a8fc90923 h: refs/heads/master v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/arm/boot/dts/ste-nomadik-s8815.dts | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 704d0aed145a..f599573907c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d595f0a0c553434ff2875f2e6d68ca641d3d9f1f
+refs/heads/master: b98da4db297bad34a5577df36ff4cb2a8fc90923
diff --git a/trunk/arch/arm/boot/dts/ste-nomadik-s8815.dts b/trunk/arch/arm/boot/dts/ste-nomadik-s8815.dts
index b28fbf3408e3..6f82d9368948 100644
--- a/trunk/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/trunk/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -14,13 +14,19 @@
 		bootargs = "root=/dev/ram0 console=ttyAMA1,115200n8 earlyprintk";
 	};
 
+	/* This is where the interrupt is routed on the S8815 board */
+	external-bus@34000000 {
+		ethernet@300 {
+			interrupt-parent = <&gpio3>;
+			interrupts = <8 0x1>;
+		};
+	};
+
 	/* Custom board node with GPIO pins to active etc */
 	usb-s8815 {
 		/* The S8815 is using this very GPIO pin for the SMSC91x IRQs */
 		ethernet-gpio {
-			gpios = <&gpio3 19 0x1>;
-			interrupts = <19 0x1>;
-			interrupt-parent = <&gpio3>;
+			gpios = <&gpio3 8 0x1>;
 		};
 		/* This will bias the MMC/SD card detect line */
 		mmcsd-gpio {