diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-04-23 01:26:27 +0400 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-04-26 23:45:07 +0400 |
| commit | ab5ab9dbe6bd480d17f23b3a33510ae33e6ab280 (patch) | |
| tree | 875a6ac95218ff54015970f7222b5da81f8f06cc /arch/arm/boot/dts/orion5x.dtsi | |
| parent | deac3d874ea1e1ef50604cec33ddfb01edb0c976 (diff) | |
| download | linux-ab5ab9dbe6bd480d17f23b3a33510ae33e6ab280.tar.xz | |
ARM: orion5x: switch to DT interrupts and timer
This commit switches the Orion5x platforms described through DT to use
a DT-defined interrupt controller and timer.
This involves:
* Describing in the DT the bridge interrupt controller, which is a
child interrupt controller to the main one, which is used for timer
and watchdog interrupts.
* Describing in the DT the timer.
* Adding in the DT the interrupt specifications for the watchdog.
* Selecting the ORION_IRQCHIP and ORION_TIMER drivers to be compiled.
* Change board-dt.c to no longer have an ->init_time() callback,
since the default callback will work fine: it calls
clocksource_of_init() and of_clk_init(), as needed.
* Implement a multi-IRQ handler for non-DT platforms in
mach-orion5x/irq.c.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Link: https://lkml.kernel.org/r/1398202002-28530-24-git-send-email-thomas.petazzoni@free-electrons.com
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/orion5x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/orion5x.dtsi | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi index 88df8a811ad3..b4c2234fda1e 100644 --- a/arch/arm/boot/dts/orion5x.dtsi +++ b/arch/arm/boot/dts/orion5x.dtsi @@ -78,6 +78,15 @@ status = "disabled"; }; + bridge_intc: bridge-interrupt-ctrl@20110 { + compatible = "marvell,orion-bridge-intc"; + interrupt-controller; + #interrupt-cells = <1>; + reg = <0x20110 0x8>; + interrupts = <0>; + marvell,#interrupts = <4>; + }; + intc: interrupt-controller@20200 { compatible = "marvell,orion-intc"; interrupt-controller; @@ -85,9 +94,19 @@ reg = <0x20200 0x08>; }; + timer: timer@20300 { + compatible = "marvell,orion-timer"; + reg = <0x20300 0x20>; + interrupt-parent = <&bridge_intc>; + interrupts = <1>, <2>; + clocks = <&core_clk 0>; + }; + wdt: wdt@20300 { compatible = "marvell,orion-wdt"; reg = <0x20300 0x28>; + interrupt-parent = <&bridge_intc>; + interrupts = <3>; status = "okay"; }; |