openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[POWERPC] Allow MPC8641 HPCN to build with CONFIG_PCI disabled too. 

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Jon Loeliger 2006-08-15 16:19:02 -05:00 committed by Paul Mackerras
parent 054389f114
commit 5dc599c206
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
View File

@ -52,6 +52,7 @@ unsigned long pci_dram_offset = 0;
#endif #endif
#ifdef CONFIG_PCI
static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc, static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
struct pt_regs *regs) struct pt_regs *regs)
{ {
@ -60,14 +61,18 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
generic_handle_irq(cascade_irq, regs); generic_handle_irq(cascade_irq, regs);
desc->chip->eoi(irq); desc->chip->eoi(irq);
} }
#endif /* CONFIG_PCI */
void __init void __init
mpc86xx_hpcn_init_irq(void) mpc86xx_hpcn_init_irq(void)
{ {
struct mpic *mpic1; struct mpic *mpic1;
struct device_node *np, *cascade_node = NULL; struct device_node *np;
int cascade_irq;
phys_addr_t openpic_paddr; phys_addr_t openpic_paddr;
#ifdef CONFIG_PCI
struct device_node *cascade_node = NULL;
int cascade_irq;
#endif
np = of_find_node_by_type(NULL, "open-pic"); np = of_find_node_by_type(NULL, "open-pic");
if (np == NULL) if (np == NULL)

3
arch/powerpc/platforms/86xx/pci.c
View File

@ -188,7 +188,8 @@ int __init add_bridge(struct device_node *dev)
printk(KERN_INFO "Found MPC86xx PCIE host bridge at 0x%08lx. " printk(KERN_INFO "Found MPC86xx PCIE host bridge at 0x%08lx. "
"Firmware bus number: %d->%d\n", "Firmware bus number: %d->%d\n",
rsrc.start, hose->first_busno, hose->last_busno); (unsigned long) rsrc.start,
hose->first_busno, hose->last_busno);
DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n", DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
hose, hose->cfg_addr, hose->cfg_data); hose, hose->cfg_addr, hose->cfg_data);

2
include/asm-powerpc/mpc86xx.h
View File

@ -23,8 +23,6 @@
#define _ISA_MEM_BASE isa_mem_base #define _ISA_MEM_BASE isa_mem_base
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define PCI_DRAM_OFFSET pci_dram_offset #define PCI_DRAM_OFFSET pci_dram_offset
#else
#define PCI_DRAM_OFFSET 0
#endif #endif
#define CPU0_BOOT_RELEASE 0x01000000 #define CPU0_BOOT_RELEASE 0x01000000