diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 12:12:14 -0400 |
| commit | fac56c2df51bc29b07b3c2dcfabf32a015a0522c (patch) | |
| tree | 1ff5d84ecf4ea0bcbd42e2ef9624b5ade3810890 /arch/powerpc/boot/dts/p2020rdb.dts | |
| parent | 6caa15d0b84d2ea688fd31f4f172c8353463e109 (diff) | |
| parent | a6360dd37e1a144ed11e6548371bade559a1e4df (diff) | |
Merge commit 'v2.6.39-rc3' into for-2.6.39
Diffstat (limited to 'arch/powerpc/boot/dts/p2020rdb.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/p2020rdb.dts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/powerpc/boot/dts/p2020rdb.dts b/arch/powerpc/boot/dts/p2020rdb.dts index da4cb0d8d215..e2d48fd4416e 100644 --- a/arch/powerpc/boot/dts/p2020rdb.dts +++ b/arch/powerpc/boot/dts/p2020rdb.dts | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * P2020 RDB Device Tree Source | 2 | * P2020 RDB Device Tree Source |
| 3 | * | 3 | * |
| 4 | * Copyright 2009 Freescale Semiconductor Inc. | 4 | * Copyright 2009-2011 Freescale Semiconductor Inc. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
| 7 | * under the terms of the GNU General Public License as published by the | 7 | * under the terms of the GNU General Public License as published by the |
| @@ -537,7 +537,7 @@ | |||
| 537 | reg = <0 0xffe09000 0 0x1000>; | 537 | reg = <0 0xffe09000 0 0x1000>; |
| 538 | bus-range = <0 255>; | 538 | bus-range = <0 255>; |
| 539 | ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000 | 539 | ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000 |
| 540 | 0x1000000 0x0 0x00000000 0 0xffc30000 0x0 0x10000>; | 540 | 0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>; |
| 541 | clock-frequency = <33333333>; | 541 | clock-frequency = <33333333>; |
| 542 | interrupt-parent = <&mpic>; | 542 | interrupt-parent = <&mpic>; |
| 543 | interrupts = <25 2>; | 543 | interrupts = <25 2>; |
| @@ -564,8 +564,8 @@ | |||
| 564 | #address-cells = <3>; | 564 | #address-cells = <3>; |
| 565 | reg = <0 0xffe0a000 0 0x1000>; | 565 | reg = <0 0xffe0a000 0 0x1000>; |
| 566 | bus-range = <0 255>; | 566 | bus-range = <0 255>; |
| 567 | ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000 | 567 | ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000 |
| 568 | 0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>; | 568 | 0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>; |
| 569 | clock-frequency = <33333333>; | 569 | clock-frequency = <33333333>; |
| 570 | interrupt-parent = <&mpic>; | 570 | interrupt-parent = <&mpic>; |
| 571 | interrupts = <26 2>; | 571 | interrupts = <26 2>; |
| @@ -574,8 +574,8 @@ | |||
| 574 | #size-cells = <2>; | 574 | #size-cells = <2>; |
| 575 | #address-cells = <3>; | 575 | #address-cells = <3>; |
| 576 | device_type = "pci"; | 576 | device_type = "pci"; |
| 577 | ranges = <0x2000000 0x0 0xc0000000 | 577 | ranges = <0x2000000 0x0 0x80000000 |
| 578 | 0x2000000 0x0 0xc0000000 | 578 | 0x2000000 0x0 0x80000000 |
| 579 | 0x0 0x20000000 | 579 | 0x0 0x20000000 |
| 580 | 580 | ||
| 581 | 0x1000000 0x0 0x0 | 581 | 0x1000000 0x0 0x0 |