projects / platform / kernel / linux-stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 704dbec)
ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 14 May 2014 14:41:12 +0000 (16:41 +0200)
committerStephane Desneux <stephane.desneux@open.eurogiciel.org>
Wed, 4 Feb 2015 10:15:16 +0000 (11:15 +0100)
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>
arch/arm/boot/dts/r8a7740.dtsi patch | blob | history

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index ce7a0b29ae7c56dd165fa4d6ac2fc3f9d0abe786..55d29f4d2ed6829b2c1de815dd11a2125945c29c 100644 (file)
--- 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";
Domain: System / Kernel;