diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 17:26:04 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 17:26:04 -0400 |
| commit | 5c008d7029fcd12a9a54fa618781b71353f6c4bd (patch) | |
| tree | 666c42d0a97664131b9f62b886c51cd671066f9d /arch/arm/boot | |
| parent | 5d3a0a95868a9669816da193bb284121df9031c8 (diff) | |
| parent | 36246a820075b65907112891b77ff7915fdb06a5 (diff) | |
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 3f3b6fc229b3..9ca4ca70c1bc 100644 --- a/arch/arm/boot/dts/imx23.dtsi +++ b/arch/arm/boot/dts/imx23.dtsi | |||
| @@ -43,7 +43,7 @@ | |||
| 43 | ranges; | 43 | ranges; |
| 44 | 44 | ||
| 45 | icoll: interrupt-controller@80000000 { | 45 | icoll: interrupt-controller@80000000 { |
| 46 | compatible = "fsl,imx23-icoll", "fsl,mxs-icoll"; | 46 | compatible = "fsl,imx23-icoll", "fsl,icoll"; |
| 47 | interrupt-controller; | 47 | interrupt-controller; |
| 48 | #interrupt-cells = <1>; | 48 | #interrupt-cells = <1>; |
| 49 | reg = <0x80000000 0x2000>; | 49 | reg = <0x80000000 0x2000>; |
| @@ -407,8 +407,9 @@ | |||
| 407 | }; | 407 | }; |
| 408 | 408 | ||
| 409 | timrot@80068000 { | 409 | timrot@80068000 { |
| 410 | compatible = "fsl,imx23-timrot", "fsl,timrot"; | ||
| 410 | reg = <0x80068000 0x2000>; | 411 | reg = <0x80068000 0x2000>; |
| 411 | status = "disabled"; | 412 | interrupts = <28 29 30 31>; |
| 412 | }; | 413 | }; |
| 413 | 414 | ||
| 414 | auart0: serial@8006c000 { | 415 | auart0: serial@8006c000 { |
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 @@ | |||
| 52 | ranges; | 52 | ranges; |
| 53 | 53 | ||
| 54 | icoll: interrupt-controller@80000000 { | 54 | icoll: interrupt-controller@80000000 { |
| 55 | compatible = "fsl,imx28-icoll", "fsl,mxs-icoll"; | 55 | compatible = "fsl,imx28-icoll", "fsl,icoll"; |
| 56 | interrupt-controller; | 56 | interrupt-controller; |
| 57 | #interrupt-cells = <1>; | 57 | #interrupt-cells = <1>; |
| 58 | reg = <0x80000000 0x2000>; | 58 | reg = <0x80000000 0x2000>; |
| @@ -787,8 +787,9 @@ | |||
| 787 | }; | 787 | }; |
| 788 | 788 | ||
| 789 | timrot@80068000 { | 789 | timrot@80068000 { |
| 790 | compatible = "fsl,imx28-timrot", "fsl,timrot"; | ||
| 790 | reg = <0x80068000 0x2000>; | 791 | reg = <0x80068000 0x2000>; |
| 791 | status = "disabled"; | 792 | interrupts = <48 49 50 51>; |
| 792 | }; | 793 | }; |
| 793 | 794 | ||
| 794 | auart0: serial@8006a000 { | 795 | auart0: serial@8006a000 { |