From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTP id 3D2DFDDEBD for ; Tue, 24 Jul 2007 06:51:20 +1000 (EST) From: Kumar Gala To: Benjamin Herrenschmidt , linuxppc-dev@ozlabs.org Subject: [PATCH 22/25] [POWERPC] 85xxCDS: Misc 8548 PCI Corrections. Date: Mon, 23 Jul 2007 15:50:09 -0500 Message-Id: <11852238452609-git-send-email-galak@kernel.crashing.org> In-Reply-To: <11852238432011-git-send-email-galak@kernel.crashing.org> References: <11852238122538-git-send-email-galak@kernel.crashing.org> <1185223813693-git-send-email-galak@kernel.crashing.org> <11852238151983-git-send-email-galak@kernel.crashing.org> <11852238161546-git-send-email-galak@kernel.crashing.org> <1185223818821-git-send-email-galak@kernel.crashing.org> <11852238193371-git-send-email-galak@kernel.crashing.org> <1185223821183-git-send-email-galak@kernel.crashing.org> <11852238233066-git-send-email-galak@kernel.crashing.org> <11852238241475-git-send-email-galak@kernel.crashing.org> <11852238253550-git-send-email-galak@kernel.crashing.org> <11852238271141-git-send-email-galak@kernel.crashing.org> <11852238283648-git-send-email-galak@kernel.crashing.org> <1185223830411-git-send-email-galak@kernel.crashing.org> <11852238322319-git-send-email-galak@kernel.crashing.org> <11852238333649-git-send-email-galak@kernel.crashing.org> <11852238353292-git-send-email-galak@kernel.crashing.org> <11852238362041-git-send-email-galak@kernel.crashing.org> <11852238383453-git-send-email-galak@kernel.crashing.org> <11852238392809-git-send-email-galak@kernel.crashing.org> <11852238411823-git-send-email-galak@kernel.crashing.org> <11852238421611-git-send-email-galak@kernel.crashing.org> <11852238432011-git-send-email-galak@kernel.crashing.org> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Randy Vinson Setting the host bridge @8000 as primary. Also fixing a bug in setting the USB interrupt numbers. Signed-off-by: Randy Vinson Signed-off-by: Kumar Gala --- arch/powerpc/platforms/85xx/mpc85xx_cds.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/85xx/mpc85xx_cds.c b/arch/powerpc/platforms/85xx/mpc85xx_cds.c index 902a61a..3421d60 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_cds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_cds.c @@ -129,7 +129,7 @@ static void __init mpc85xx_cds_pci_irq_fixup(struct pci_dev *dev) /* There are two USB controllers. * Identify them by functon number */ - if (PCI_FUNC(dev->devfn)) + if (PCI_FUNC(dev->devfn) == 3) dev->irq = 11; else dev->irq = 10; @@ -297,10 +297,10 @@ static void __init mpc85xx_cds_setup_arch(void) for (np = NULL; (np = of_find_node_by_type(np, "pci")) != NULL;) { struct resource rsrc; of_address_to_resource(np, 0, &rsrc); - if ((rsrc.start & 0xfffff) == 0x9000) - fsl_add_bridge(np, 0); - else + if ((rsrc.start & 0xfffff) == 0x8000) fsl_add_bridge(np, 1); + else + fsl_add_bridge(np, 0); } ppc_md.pci_irq_fixup = mpc85xx_cds_pci_irq_fixup; ppc_md.pci_exclude_device = mpc85xx_exclude_device; -- 1.5.2.2