diff mbox

POWERPC 4xx: Fix PCI in AMCC 440EP Yosemite DTS

Message ID 13F6A75BE29CE44F801B912901C3EF27022A3993@wgv4.watchguardvideo.local (mailing list archive)
State Superseded
Delegated to: Josh Boyer
Headers show

Commit Message

Curtis Wald Nov. 16, 2009, 5:36 p.m. UTC 
Yosemite.dts stanza for PCI was copied from Bamboo which has four PCI
slots; Yosemite only has one PCI slot which is mapped to
IDSEL 12, ADDR 22, IRQ2 Vector 25, INTA.

Signed-off-by: Curtis Wald <cwald@watchguardvideo.com>
---
 arch/powerpc/boot/dts/yosemite.dts |   17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

-                               0x1800 0x0 0x0 0x0 &UIC0 0x1a 0x8
-
-                               /* IDSEL 4 */
-                               0x2000 0x0 0x0 0x0 &UIC0 0x19 0x8
+                               /* IDSEL 12, ADDR 22, INTA, IRQ2 =
Vector 25, 0x19 */
+                               0x6000 0x0 0x0 0x0 &UIC0 0x19 0x8
                        >;
                };
        };

Comments

Josh Boyer Nov. 30, 2009, 1:41 p.m. UTC | #1 
On Mon, Nov 16, 2009 at 11:36:40AM -0600, Curtis Wald wrote:
>Yosemite.dts stanza for PCI was copied from Bamboo which has four PCI
>slots; Yosemite only has one PCI slot which is mapped to
>IDSEL 12, ADDR 22, IRQ2 Vector 25, INTA.
>
>Signed-off-by: Curtis Wald <cwald@watchguardvideo.com>

Your patch looks correct (I think), but is very badly word wrapped and
whitespace damaged.  Could you resend?

josh
diff mbox

Patch

diff --git a/arch/powerpc/boot/dts/yosemite.dts
b/arch/powerpc/boot/dts/yosemite.dts
index 1fa3cb4..8328be5 100644
--- a/arch/powerpc/boot/dts/yosemite.dts
+++ b/arch/powerpc/boot/dts/yosemite.dts
@@ -276,26 +276,19 @@ 
                         * later cannot be changed. Chip supports a
second
                         * IO range but we don't use it for now
                         */
+
+                        /*       u32              u64
u64                     u64  */
+                        /*       pci_space        pci_addr
cpu_addr                size */
                        ranges = <0x02000000 0x00000000 0xa0000000
0x00000000 0xa0000000 0x00000000 0x20000000
                                  0x01000000 0x00000000 0x00000000
0x00000000 0xe8000000 0x00000000 0x00010000>;
 
                        /* 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 */