From patchwork Sat Apr 20 13:56:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 2468011 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id AD6B13FD8C for ; Sat, 20 Apr 2013 13:59:09 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYIE-0006Uu-No; Sat, 20 Apr 2013 13:57:32 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYHV-0006Vk-EG; Sat, 20 Apr 2013 13:56:45 +0000 Received: from mail-lb0-f172.google.com ([209.85.217.172]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UTYH2-0006SW-68 for linux-arm-kernel@lists.infradead.org; Sat, 20 Apr 2013 13:56:17 +0000 Received: by mail-lb0-f172.google.com with SMTP id u10so4518571lbi.31 for ; Sat, 20 Apr 2013 06:56:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=fR1r5jND0KxEIMUucuLMTQitZ6tCyhDBVKwKdzDNQos=; b=Iu7RlT480ReLj9pCzOmnr6e6abbOD3oM18TS92uQ4KNXvGu3VGv0qaoZOZzEG6yHk4 93nBra5o/AxS+xaxjzRJvBdXa9j0aS0J1OH8BaSV5y5Q1+c7NG/xUljMUcMEj0AyObOM 4bOsGF3/FlKjhGyx+cbFiQ5AhVNCHmEKqbBNRNiF8HNywtL5wsvdEeZ9I8FjPapWZnBH vDDga+D+Aaw2nD0br8oTDwLqHJK5sZJ2K0N6RT6F44bUYa7sb1SqGLBv4WT4RLAacWEi K7sgCQQYlRLzEjw1sX+PtOk+r7RJxG/OMqHB3kkC6oHZw35AsGo8SX4MIo+vbCGGvZdZ FT9w== X-Received: by 10.112.201.138 with SMTP id ka10mr9844123lbc.134.1366466173929; Sat, 20 Apr 2013 06:56:13 -0700 (PDT) Received: from localhost.localdomain (c83-249-208-67.bredband.comhem.se. [83.249.208.67]) by mx.google.com with ESMTPS id t6sm7725564lae.3.2013.04.20.06.56.12 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 20 Apr 2013 06:56:13 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Subject: [RESEND PATCH 06/12] ARM: integrator: move PCI base address grab to probe Date: Sat, 20 Apr 2013 15:56:11 +0200 Message-Id: <1366466171-15521-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.1.4 X-Gm-Message-State: ALoCoQkix2fwWbJGOk63ESSr33Qh1edEUuG+bzrUDXL+ZTMxktINKyFDFt8Qp/wh1JrZ37Z/Sw5K X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130420_095616_417600_59322F38 X-CRM114-Status: GOOD ( 11.11 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.217.172 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Linus Walleij X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org This moves the point where the PCIv3 driver grabs the SC base address to the probe function. Acked-by: Arnd Bergmann Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/pci_v3.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index f027596..756a5f2 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -496,13 +496,6 @@ static void __init pci_v3_preinit(void) unsigned long flags; unsigned int temp; - /* Remap the Integrator system controller */ - ap_syscon_base = ioremap(INTEGRATOR_SC_BASE, 0x100); - if (!ap_syscon_base) { - pr_err("unable to remap the AP syscon for PCIv3\n"); - return; - } - pcibios_min_mem = 0x00100000; /* @@ -677,6 +670,13 @@ static int __init pci_v3_probe(struct platform_device *pdev) { int ret; + /* Remap the Integrator system controller */ + ap_syscon_base = ioremap(INTEGRATOR_SC_BASE, 0x100); + if (!ap_syscon_base) { + dev_err(&pdev->dev, "unable to remap the AP syscon for PCIv3\n"); + return -ENODEV; + } + ret = devm_request_irq(&pdev->dev, IRQ_AP_V3INT, v3_irq, 0, "V3", NULL); if (ret) { dev_err(&pdev->dev, "unable to grab PCI error interrupt: %d\n",