From patchwork Wed Nov 30 05:23:55 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Breeds X-Patchwork-Id: 128406 X-Patchwork-Delegate: jwboyer@gmail.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 38EFD1007FC for ; Wed, 30 Nov 2011 16:24:30 +1100 (EST) Received: from localhost.localdomain (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id AC37C1007D1; Wed, 30 Nov 2011 16:24:05 +1100 (EST) From: Tony Breeds To: Benjamin Herrenschmidt , Josh Boyer Subject: [PATCH 1/6] 44x/pci: Continue pci setup even if there is no sdr-base in the device-tree Date: Wed, 30 Nov 2011 16:23:55 +1100 Message-Id: <1322630640-13708-2-git-send-email-tony@bakeyournoodle.com> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1322630640-13708-1-git-send-email-tony@bakeyournoodle.com> References: <1322630640-13708-1-git-send-email-tony@bakeyournoodle.com> Cc: LinuxPPC-dev X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Signed-off-by: Tony Breeds --- arch/powerpc/sysdev/ppc4xx_pci.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/sysdev/ppc4xx_pci.c b/arch/powerpc/sysdev/ppc4xx_pci.c index 16f5eba..d3fa380 100644 --- a/arch/powerpc/sysdev/ppc4xx_pci.c +++ b/arch/powerpc/sysdev/ppc4xx_pci.c @@ -1974,11 +1974,11 @@ static void __init ppc4xx_probe_pciex_bridge(struct device_node *np) port->node = of_node_get(np); pval = of_get_property(np, "sdr-base", NULL); if (pval == NULL) { - printk(KERN_ERR "PCIE: missing sdr-base for %s\n", + printk(KERN_INFO "PCIE: missing sdr-base for %s\n", np->full_name); - return; + } else { + port->sdr_base = *pval; } - port->sdr_base = *pval; /* Check if device_type property is set to "pci" or "pci-endpoint". * Resulting from this setup this PCIe port will be configured