From patchwork Sun Sep 4 21:40:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3859 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8F2EE23EF9 for ; Sun, 4 Sep 2011 21:40:28 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 7F8C3A1845B for ; Sun, 4 Sep 2011 21:40:28 +0000 (UTC) Received: by fxd18 with SMTP id 18so4499572fxd.11 for ; Sun, 04 Sep 2011 14:40:28 -0700 (PDT) Received: by 10.223.22.14 with SMTP id l14mr1453669fab.100.1315172428250; Sun, 04 Sep 2011 14:40:28 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs40805lab; Sun, 4 Sep 2011 14:40:27 -0700 (PDT) Received: by 10.204.155.87 with SMTP id r23mr1757154bkw.307.1315172426462; Sun, 04 Sep 2011 14:40:26 -0700 (PDT) Received: from mail.df.lth.se (mail.df.lth.se [194.47.250.12]) by mx.google.com with ESMTPS id zy13si2115099bkb.32.2011.09.04.14.40.24 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 04 Sep 2011 14:40:25 -0700 (PDT) Received-SPF: pass (google.com: domain of triad@df.lth.se designates 194.47.250.12 as permitted sender) client-ip=194.47.250.12; Authentication-Results: mx.google.com; spf=pass (google.com: domain of triad@df.lth.se designates 194.47.250.12 as permitted sender) smtp.mail=triad@df.lth.se Received: from mer.df.lth.se (mer.df.lth.se [194.47.250.37]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.df.lth.se (Postfix) with ESMTPS id 2B85465D8F; Sun, 4 Sep 2011 23:40:24 +0200 (CEST) Received: from mer.df.lth.se (triad@localhost.localdomain [127.0.0.1]) by mer.df.lth.se (8.14.3/8.14.3/Debian-9.4) with ESMTP id p84LeNMu018985; Sun, 4 Sep 2011 23:40:23 +0200 Received: (from triad@localhost) by mer.df.lth.se (8.14.3/8.14.3/Submit) id p84LeMoF018984; Sun, 4 Sep 2011 23:40:22 +0200 From: Linus Walleij To: Arnd Bergmann , linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Rob Herring , Nicolas Pitre , Arnd Bergmann , Linus Walleij Subject: [PATCH] mach-integrator: fix VGA base regression Date: Sun, 4 Sep 2011 23:40:08 +0200 Message-Id: <1315172408-18957-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.7.2.5 The changes introduced in commit cc22b4c18540e5e8bf55c7d124044f9317527d3c "ARM: set vga memory base at run-time" Makes the Integrator/AP freeze completely. I appears that this is due to the VGA base address being assigned at PCI init time, while this base is needed earlier than that. Moving the initialization of the base address to the .map_io function solves this problem. Cc: Rob Herring Cc: Nicolas Pitre Cc: Arnd Bergmann Signed-off-by: Linus Walleij --- arch/arm/mach-integrator/integrator_ap.c | 2 ++ arch/arm/mach-integrator/pci_v3.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 2fbbdd5..4d88fc4 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -32,6 +32,7 @@ #include #include #include +#include