From mboxrd@z Thu Jan 1 00:00:00 1970 From: stefan@agner.ch (Stefan Agner) Date: Sun, 14 Dec 2014 23:09:58 +0100 Subject: [PATCH v2 3/3] ARM: dts: vf610: add Miscellaneous System Control Module (MSCM) In-Reply-To: <1418594998-2361-1-git-send-email-stefan@agner.ch> References: <1418594998-2361-1-git-send-email-stefan@agner.ch> Message-ID: <1418594998-2361-4-git-send-email-stefan@agner.ch> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Add the Miscellaneous System Control Module (MSCM) to the base device tree for Vybrid SoCs. This module contains the peripheral interrupt router, which is handling the routing of the interrupts between the two cores. Signed-off-by: Stefan Agner --- arch/arm/boot/dts/vf500.dtsi | 9 +++++++-- arch/arm/boot/dts/vfxxx.dtsi | 7 +++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/vf500.dtsi b/arch/arm/boot/dts/vf500.dtsi index de67005..090b67e 100644 --- a/arch/arm/boot/dts/vf500.dtsi +++ b/arch/arm/boot/dts/vf500.dtsi @@ -24,14 +24,13 @@ }; soc { - interrupt-parent = <&intc>; - aips-bus at 40000000 { intc: interrupt-controller at 40002000 { compatible = "arm,cortex-a9-gic"; #interrupt-cells = <3>; interrupt-controller; + interrupt-parent = <&intc>; reg = <0x40003000 0x1000>, <0x40002100 0x100>; }; @@ -40,6 +39,7 @@ compatible = "arm,cortex-a9-global-timer"; reg = <0x40002200 0x20>; interrupts = ; + interrupt-parent = <&intc>; clocks = <&clks VF610_CLK_PLATFORM_BUS>; }; }; @@ -118,6 +118,11 @@ interrupts = ; }; +&mscm { + interrupt-parent = <&intc>; + #interrupt-cells = <3>; +}; + &pit { interrupts = ; }; diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index 505969a..42ed1e9 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi @@ -47,6 +47,7 @@ #address-cells = <1>; #size-cells = <1>; compatible = "simple-bus"; + interrupt-parent = <&mscm>; ranges; aips0: aips-bus at 40000000 { @@ -55,6 +56,12 @@ #size-cells = <1>; ranges; + mscm: mscm at 40001000 { + compatible = "fsl,vf610-mscm"; + interrupt-controller; + reg = <0x40001000 0x1000>; + }; + edma0: dma-controller at 40018000 { #dma-cells = <2>; compatible = "fsl,vf610-edma"; -- 2.1.3