From mboxrd@z Thu Jan 1 00:00:00 1970 From: thomas.petazzoni@free-electrons.com (Thomas Petazzoni) Date: Tue, 22 Apr 2014 23:26:14 +0200 Subject: [PATCH v2 10/38] ARM: orion5x: move interrupt controller node into ocp In-Reply-To: <1398202002-28530-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1398202002-28530-1-git-send-email-thomas.petazzoni@free-electrons.com> Message-ID: <1398202002-28530-11-git-send-email-thomas.petazzoni@free-electrons.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org The interrupt controller node was located outside of the ocp at f1000000 node, which doesn't make much sense: like any other device, the interrupt controller has registers located in the "Internal Registers Window", so it is much more logical to have it under the ocp at f1000000 node. It is even more important as we are going to move Orion5x to use the Device Tree binding of the mvebu-mbus driver. Signed-off-by: Thomas Petazzoni Acked-by: Sebastian Hesselbarth --- arch/arm/boot/dts/orion5x.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi index 174d892..da57fb9 100644 --- a/arch/arm/boot/dts/orion5x.dtsi +++ b/arch/arm/boot/dts/orion5x.dtsi @@ -17,13 +17,6 @@ gpio0 = &gpio0; }; - intc: interrupt-controller { - compatible = "marvell,orion-intc"; - interrupt-controller; - #interrupt-cells = <1>; - reg = <0xf1020200 0x08>; - }; - ocp at f1000000 { compatible = "simple-bus"; ranges = <0x00000000 0xf1000000 0x4000000 @@ -79,6 +72,13 @@ status = "disabled"; }; + intc: interrupt-controller@20200 { + compatible = "marvell,orion-intc"; + interrupt-controller; + #interrupt-cells = <1>; + reg = <0x20200 0x08>; + }; + wdt at 20300 { compatible = "marvell,orion-wdt"; reg = <0x20300 0x28>; -- 1.9.2