diff options
author | Geert Uytterhoeven <geert+renesas@glider.be> | 2014-05-14 16:41:12 +0200 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2014-05-15 08:09:59 +0900 |
commit | 3fa3985e624aea24334abc9a33b484c3d316e64e (patch) | |
tree | bc1c48c38a2a6cd0fea6ac49eb0df7d1c36dbe00 /arch/arm/boot/dts/r8a7740.dtsi | |
parent | c9af5428be0cea61a34fa8d5dda83d4c57a03b06 (diff) | |
download | talos-op-linux-3fa3985e624aea24334abc9a33b484c3d316e64e.tar.gz talos-op-linux-3fa3985e624aea24334abc9a33b484c3d316e64e.zip |
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>
Diffstat (limited to 'arch/arm/boot/dts/r8a7740.dtsi')
-rw-r--r-- | arch/arm/boot/dts/r8a7740.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index fbf47fbae3a0..5d2edd83b572 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"; |