Commit 0fb28811 authored Apr 22, 2014 by Thomas Petazzoni Committed by Jason Cooper Apr 26, 2014

ARM: orion5x: move interrupt controller node into ocp

The interrupt controller node was located outside of the ocp@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@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 <thomas.petazzoni@free-electrons.com>
Link: https://lkml.kernel.org/r/1398202002-28530-11-git-send-email-thomas.petazzoni@free-electrons.com

Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Jason Cooper <jason@lakedaemon.net>

parent c9eaa447

arch/arm/boot/dts/orion5x.dtsi

+7 −7

Original line number	Original line	Diff line number	Diff line
	@@ -17,13 +17,6 @@
	gpio0 = &gpio0;		gpio0 = &gpio0;
	};		};

	intc: interrupt-controller {
	compatible = "marvell,orion-intc";
	interrupt-controller;
	#interrupt-cells = <1>;
	reg = <0xf1020200 0x08>;
	};

	ocp@f1000000 {		ocp@f1000000 {
	compatible = "simple-bus";		compatible = "simple-bus";
	ranges = <0x00000000 0xf1000000 0x4000000		ranges = <0x00000000 0xf1000000 0x4000000
	@@ -79,6 +72,13 @@
	status = "disabled";		status = "disabled";
	};		};

			intc: interrupt-controller@20200 {
			compatible = "marvell,orion-intc";
			interrupt-controller;
			#interrupt-cells = <1>;
			reg = <0x20200 0x08>;
			};

	wdt@20300 {		wdt@20300 {
	compatible = "marvell,orion-wdt";		compatible = "marvell,orion-wdt";
	reg = <0x20300 0x28>;		reg = <0x20300 0x28>;