diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 21:26:04 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 21:26:04 (GMT) |
| commit | 5c008d7029fcd12a9a54fa618781b71353f6c4bd (patch) | |
| tree | 666c42d0a97664131b9f62b886c51cd671066f9d /arch/arm/boot | |
| parent | 5d3a0a95868a9669816da193bb284121df9031c8 (diff) | |
| parent | 36246a820075b65907112891b77ff7915fdb06a5 (diff) | |
| download | linux-fsl-qoriq-5c008d7029fcd12a9a54fa618781b71353f6c4bd.tar.xz | |
Merge branch 'next/soc2' into HEAD
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx23.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx28.dtsi | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi index 3f3b6fc..9ca4ca7 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi @@ -43,7 +43,7 @@ ranges; icoll: interrupt-controller@80000000 { - compatible = "fsl,imx23-icoll", "fsl,mxs-icoll"; + compatible = "fsl,imx23-icoll", "fsl,icoll"; interrupt-controller; #interrupt-cells = <1>; reg = <0x80000000 0x2000>; @@ -407,8 +407,9 @@ }; timrot@80068000 { + compatible = "fsl,imx23-timrot", "fsl,timrot"; reg = <0x80068000 0x2000>; - status = "disabled"; + interrupts = <28 29 30 31>; }; auart0: serial@8006c000 { diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi index 724147e..59fbfba 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 { |