summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/imx28.dtsi
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 18:35:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-01 18:35:58 -0700
commit84be4ae2c038e2b03d650cbf2a7cfd9e8d6e9e51 (patch)
tree06f806cdc8bded9ae81c963287beb73a6e961d4b /arch/arm/boot/dts/imx28.dtsi
parentac9e7ab32fe42489808c8d9fc89ad413d2805766 (diff)
parent36246a820075b65907112891b77ff7915fdb06a5 (diff)
downloadblackbird-op-linux-84be4ae2c038e2b03d650cbf2a7cfd9e8d6e9e51.tar.gz
blackbird-op-linux-84be4ae2c038e2b03d650cbf2a7cfd9e8d6e9e51.zip
Merge tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM soc-specific updates, take 2 from Olof Johansson: "This branch converts the MXS Freescale platform to use irqdomains and sparse IRQ, in preparation for DT probing and multiplatform kernels." * tag 'soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: 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.dtsi5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 724147eab84b..59fbfba23df8 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -52,7 +52,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>;
@@ -787,8 +787,9 @@
};
timrot@80068000 {
+ compatible = "fsl,imx28-timrot", "fsl,timrot";
reg = <0x80068000 0x2000>;
- status = "disabled";
+ interrupts = <48 49 50 51>;
};
auart0: serial@8006a000 {
OpenPOWER on IntegriCloud