diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 17:10:29 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 17:10:29 +1100 |
| commit | 0285ae37d4366b2d614df0c83cb413cf59ad8944 (patch) | |
| tree | b7d27eccdeefcf16f63f122c59df95fb1db5c447 /arch/powerpc/boot/dts/yosemite.dts | |
| parent | 8c82da5e2495589b7b70a43789e7cbd61a486ed0 (diff) | |
| parent | 06a5bad898b332b8c6525fc8c4d1c1c9a8df65de (diff) | |
Merge commit 'jwb/next' into next
Diffstat (limited to 'arch/powerpc/boot/dts/yosemite.dts')
| -rw-r--r-- | arch/powerpc/boot/dts/yosemite.dts | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/arch/powerpc/boot/dts/yosemite.dts b/arch/powerpc/boot/dts/yosemite.dts index 1fa3cb4c4eb..64923245f0e 100644 --- a/arch/powerpc/boot/dts/yosemite.dts +++ b/arch/powerpc/boot/dts/yosemite.dts @@ -282,20 +282,10 @@ /* Inbound 2GB range starting at 0 */ dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 0x80000000>; - /* Bamboo has all 4 IRQ pins tied together per slot */ interrupt-map-mask = <0xf800 0x0 0x0 0x0>; interrupt-map = < - /* IDSEL 1 */ - 0x800 0x0 0x0 0x0 &UIC0 0x1c 0x8 - - /* IDSEL 2 */ - 0x1000 0x0 0x0 0x0 &UIC0 0x1b 0x8 - - /* IDSEL 3 */ - 0x1800 0x0 0x0 0x0 &UIC0 0x1a 0x8 - - /* IDSEL 4 */ - 0x2000 0x0 0x0 0x0 &UIC0 0x19 0x8 + /* IDSEL 12 */ + 0x6000 0x0 0x0 0x0 &UIC0 0x19 0x8 >; }; }; |