Merge branch 'next/soc2' into HEAD

[can-eth-gw-linux.git] / arch / arm / boot / dts / imx28.dtsi

diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 724147eab84b2940ab7d743185999221ddace594..59fbfba23df8b237c6e775ef109106227a802903 100644 (file)
--- 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 {