From bad284bc671d6e74d4864925d6eaa2173ffa1aea Mon Sep 17 00:00:00 2001 From: Sylvain Munaut Date: Fri, 6 Jan 2006 00:11:38 -0800 Subject: [PATCH] --- yaml --- r: 16355 b: refs/heads/master c: f80257a25d9f73a0e6e377c7d6bf29b8938c042d h: refs/heads/master i: 16353: 59d85a1260b1c5b5940b3be11f39be77e1a79981 16351: eb75807eeac19a8f8c38f54ae02cc347008e4928 v: v3 --- [refs] | 2 +- trunk/arch/ppc/platforms/lite5200.c | 2 ++ trunk/include/asm-ppc/io.h | 2 ++ trunk/include/asm-ppc/mpc52xx.h | 11 +++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1da5105e59ec..d3941ebe0727 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 041cb6241fa97c4881dd19d79f783b2e077acd28 +refs/heads/master: f80257a25d9f73a0e6e377c7d6bf29b8938c042d diff --git a/trunk/arch/ppc/platforms/lite5200.c b/trunk/arch/ppc/platforms/lite5200.c index d44cc991179f..7ed52dc340c9 100644 --- a/trunk/arch/ppc/platforms/lite5200.c +++ b/trunk/arch/ppc/platforms/lite5200.c @@ -196,8 +196,10 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5, mpc52xx_set_bat(); /* No ISA bus by default */ +#ifdef CONFIG_PCI isa_io_base = 0; isa_mem_base = 0; +#endif /* Powersave */ /* This is provided as an example on how to do it. But you diff --git a/trunk/include/asm-ppc/io.h b/trunk/include/asm-ppc/io.h index 84ac6e258eef..df9cf6ed189d 100644 --- a/trunk/include/asm-ppc/io.h +++ b/trunk/include/asm-ppc/io.h @@ -27,6 +27,8 @@ #if defined(CONFIG_4xx) #include +#elif defined(CONFIG_PPC_MPC52xx) +#include #elif defined(CONFIG_8xx) #include #elif defined(CONFIG_8260) diff --git a/trunk/include/asm-ppc/mpc52xx.h b/trunk/include/asm-ppc/mpc52xx.h index 04d56301345b..a055e0756b9d 100644 --- a/trunk/include/asm-ppc/mpc52xx.h +++ b/trunk/include/asm-ppc/mpc52xx.h @@ -29,6 +29,17 @@ struct pt_regs; #endif /* __ASSEMBLY__ */ +#ifdef CONFIG_PCI +#define _IO_BASE isa_io_base +#define _ISA_MEM_BASE isa_mem_base +#define PCI_DRAM_OFFSET pci_dram_offset +#else +#define _IO_BASE 0 +#define _ISA_MEM_BASE 0 +#define PCI_DRAM_OFFSET 0 +#endif + + /* ======================================================================== */ /* PPC Sys devices definition */ /* ======================================================================== */