diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-12 22:54:16 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-12 22:54:16 -0700 |
| commit | 36246a820075b65907112891b77ff7915fdb06a5 (patch) | |
| tree | 1c716d9d11158582d6d986821fee5a9b61430286 /arch/arm/boot/dts/imx28.dtsi | |
| parent | d9875690d9b89a866022ff49e3fcea892345ad92 (diff) | |
| parent | 6608f13fabdb1f9ecbd502763ba33ca2646834c8 (diff) | |
Merge tag 'mxs-sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc2
The series adds irqdomain support for mach-mxs and then enables
sparse-irq. It dependes on pull request mxs-dt-3.7.
* tag 'mxs-sparse-irq' of git://git.linaro.org/people/shawnguo/linux-2.6:
ARM: mxs: remove mach/irqs.h
ARM: mxs: select SPARSE_IRQ
ARM: mxs: adopt irq_domain support for icoll driver
ARM: mxs: select MULTI_IRQ_HANDLER
ARM: mxs: retrieve timer irq from device tree
gpio/mxs: adopt irq_domain support for mxs gpio driver
Diffstat (limited to 'arch/arm/boot/dts/imx28.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 3fa6d190fab4..99f7d7a8ba28 100644 --- a/arch/arm/boot/dts/imx28.dtsi +++ b/arch/arm/boot/dts/imx28.dtsi @@ -50,7 +50,7 @@ ranges; icoll: interrupt-controller@80000000 { - compatible = "fsl,imx28-icoll", "fsl,mxs-icoll"; + compatible = "fsl,imx28-icoll", "fsl,icoll"; interrupt-controller; #interrupt-cells = <1>; reg = <0x80000000 0x2000>; @@ -683,8 +683,9 @@ }; timrot@80068000 { + compatible = "fsl,imx28-timrot", "fsl,timrot"; reg = <0x80068000 0x2000>; - status = "disabled"; + interrupts = <48 49 50 51>; }; auart0: serial@8006a000 { |