diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2015-07-14 08:47:41 +0200 |
---|---|---|
committer | Stefan Agner <stefan.agner@toradex.com> | 2015-07-14 08:47:41 +0200 |
commit | 796aee8b8dac3a051ffa116bb9379c879882ffa5 (patch) | |
tree | 8977de445ef4fd806eece2dde5c817e40b95c331 /arch/arm/boot/dts/vfxxx.dtsi | |
parent | 9415b93b35944bd01b80e7ab5ce64987e64c4666 (diff) | |
parent | 0356220c4d03a2dacb1862a207c6bff1ba94623f (diff) |
Merge branch 'vf610-mcc-sema4-v4.1' into toradex_vf_4.1-next
Diffstat (limited to 'arch/arm/boot/dts/vfxxx.dtsi')
-rw-r--r-- | arch/arm/boot/dts/vfxxx.dtsi | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi index a4ba4c284088..aff902f9ab2b 100644 --- a/arch/arm/boot/dts/vfxxx.dtsi +++ b/arch/arm/boot/dts/vfxxx.dtsi @@ -70,10 +70,22 @@ mscm_ir: interrupt-controller@40001800 { compatible = "fsl,vf610-mscm-ir"; + #address-cells = <1>; + #size-cells = <1>; reg = <0x40001800 0x400>; fsl,cpucfg = <&mscm_cpucfg>; interrupt-controller; #interrupt-cells = <2>; + + cpu2cpu@40001800 { + reg = <0x40001800 0x40>; + interrupt-parent = <&mscm_ir>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>, + <1 IRQ_TYPE_LEVEL_HIGH>, + <2 IRQ_TYPE_LEVEL_HIGH>, + <3 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "int0", "int1", "int2", "int3"; + }; }; edma0: dma-controller@40018000 { @@ -92,6 +104,12 @@ status = "disabled"; }; + sema4: semaphore-controller@4001d000 { + compatible = "fsl,vf610-sema4"; + reg = <0x4001d000 0x1000>; + interrupts = <4 IRQ_TYPE_LEVEL_HIGH>; + }; + can0: flexcan@40020000 { compatible = "fsl,vf610-flexcan"; reg = <0x40020000 0x4000>; |