From patchwork Sun Jul 17 02:50:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Crystal Wood X-Patchwork-Id: 9233509 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E297D607D0 for ; Sun, 17 Jul 2016 02:51:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D359222230 for ; Sun, 17 Jul 2016 02:51:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4557212F2; Sun, 17 Jul 2016 02:51:15 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45513212F2 for ; Sun, 17 Jul 2016 02:51:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752051AbcGQCuv (ORCPT ); Sat, 16 Jul 2016 22:50:51 -0400 Received: from host.buserror.net ([209.198.135.123]:56216 "EHLO host.buserror.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751973AbcGQCuf (ORCPT ); Sat, 16 Jul 2016 22:50:35 -0400 Received: from c-75-72-173-242.hsd1.mn.comcast.net ([75.72.173.242] helo=snotra.am.freescale.net) by host.buserror.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1bOcA3-0007Lj-7e; Sat, 16 Jul 2016 21:50:31 -0500 From: Scott Wood To: linuxppc-dev@lists.ozlabs.org Cc: Yangbo Lu , linux-mmc@vger.kernel.org, Arnd Bergmann , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Scott Wood Date: Sat, 16 Jul 2016 21:50:22 -0500 Message-Id: <1468723822-30457-6-git-send-email-oss@buserror.net> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1468723822-30457-1-git-send-email-oss@buserror.net> References: <1468723822-30457-1-git-send-email-oss@buserror.net> X-SA-Exim-Connect-IP: 75.72.173.242 X-SA-Exim-Mail-From: oss@buserror.net Subject: [PATCH v11 5/5] powerpc/fsl-pci: Use fsl_guts_get_svr() X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:57:07 +0000) X-SA-Exim-Scanned: Yes (on host.buserror.net) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Establish an initial user of fsl_guts_get_svr(), so that the code gets some test coverage until users outside arch/powerpc can get converted. Signed-off-by: Scott Wood --- arch/powerpc/Kconfig | 1 + arch/powerpc/sysdev/fsl_pci.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index fcfe533..765df81 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -777,6 +777,7 @@ config FSL_PCI bool select PPC_INDIRECT_PCI select PCI_QUIRKS + select FSL_GUTS config FSL_PMC bool diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 0fd1895..9ba570cf 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -529,7 +530,10 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary) struct device_node *dev; struct ccsr_pci __iomem *pci; u16 temp; - u32 svr = mfspr(SPRN_SVR); + u32 svr; + + fsl_guts_init(); + svr = fsl_guts_get_svr(); dev = pdev->dev.of_node;