From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Wed, 14 May 2014 14:41:12 +0000 (+0200)
Subject: ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property
X-Git-Tag: upstream/snapshot3+hdmi~378
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=259f3b2348138af704ba4bea2f3cb79431f21bcf;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property

Caused by interaction between commit
08ec67b50db7ca8c9077e67ca23850cdc5bfc716 ("ARM: shmobile: r8a7740 dtsi:
Add Ethernet support") and commit 9ff254adc1e32db46000a33b8ecbc4d7047672be
("ARM: shmobile: dts: Move interrupt-parent property to root node").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 3fa3985e624aea24334abc9a33b484c3d316e64e)
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index ce7a0b2..55d29f4 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -124,7 +124,6 @@
 		compatible = "renesas,gether-r8a7740";
 		reg = <0xe9a00000 0x800>,
 		      <0xe9a01800 0x800>;
-		interrupt-parent = <&gic>;
 		interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH>;
 		/* clocks = <&mstp3_clks R8A7740_CLK_GETHER>; */
 		phy-mode = "mii";