projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c9af542)
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)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 14 May 2014 23:09:59 +0000 (08:09 +0900)
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>
arch/arm/boot/dts/r8a7740.dtsi patch | blob | blame | history

diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index fbf47fbae3a09468856c67b64aa25c0d0f6e0543..5d2edd83b5725e5524aced15593490759428a405 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";