diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-24 00:36:45 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-08-24 00:36:45 -0400 |
| commit | b1515af2911c4339ed34865a0594f4ad3392921a (patch) | |
| tree | cae6a1367452d4dcef76e5e7711511c2fc4087c3 /arch/powerpc/boot | |
| parent | d1b113bb028999e82a8528e1484be8c23fb5a7d9 (diff) | |
| parent | 32412aa214e05308833a89e6090406294833f989 (diff) | |
Merge remote branch 'jwb/merge' into merge
Diffstat (limited to 'arch/powerpc/boot')
| -rw-r--r-- | arch/powerpc/boot/dts/canyonlands.dts | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/powerpc/boot/dts/canyonlands.dts b/arch/powerpc/boot/dts/canyonlands.dts index 5806ef0b860b..a30370396250 100644 --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts | |||
| @@ -163,6 +163,14 @@ | |||
| 163 | interrupts = <0x1e 4>; | 163 | interrupts = <0x1e 4>; |
| 164 | }; | 164 | }; |
| 165 | 165 | ||
| 166 | SATA0: sata@bffd1000 { | ||
| 167 | compatible = "amcc,sata-460ex"; | ||
| 168 | reg = <4 0xbffd1000 0x800 4 0xbffd0800 0x400>; | ||
| 169 | interrupt-parent = <&UIC3>; | ||
| 170 | interrupts = <0x0 0x4 /* SATA */ | ||
| 171 | 0x5 0x4>; /* AHBDMA */ | ||
| 172 | }; | ||
| 173 | |||
| 166 | POB0: opb { | 174 | POB0: opb { |
| 167 | compatible = "ibm,opb-460ex", "ibm,opb"; | 175 | compatible = "ibm,opb-460ex", "ibm,opb"; |
| 168 | #address-cells = <1>; | 176 | #address-cells = <1>; |