From patchwork Wed Jun 29 16:46:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 929682 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5TGojM7012605 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 29 Jun 2011 16:51:06 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qbxx6-0008Hv-JT; Wed, 29 Jun 2011 16:49:26 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Qbxx5-0001rD-SS; Wed, 29 Jun 2011 16:49:23 +0000 Received: from mail-gy0-f177.google.com ([209.85.160.177]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Qbxvf-0001VW-22 for linux-arm-kernel@lists.infradead.org; Wed, 29 Jun 2011 16:47:58 +0000 Received: by mail-gy0-f177.google.com with SMTP id 4so651322gyh.36 for ; Wed, 29 Jun 2011 09:47:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=9PPU4iVD7HIRwCs1aV6uvIljzSSyALEIY6D+hCExgP8=; b=SNDvt29RZL/6Xc1VdBsPCTVpf3yd3HstxZWY0onHv0hWtNAWG18xN9whei+Z2vMiI8 nOZQVSAuQhESYDOYQ1dztqNhGbPrPj0xcjfdTc1pIqZPvBszGVzazgG4WXa3VVzamkHL N788w4c/Se1YhgtSEHnex9BFHmHmOiJPk5Ekk= Received: by 10.101.213.31 with SMTP id p31mr832273anq.139.1309366074618; Wed, 29 Jun 2011 09:47:54 -0700 (PDT) Received: from rob-laptop.i.smooth-stone.com ([173.226.190.126]) by mx.google.com with ESMTPS id g36sm1209509anq.36.2011.06.29.09.47.53 (version=SSLv3 cipher=OTHER); Wed, 29 Jun 2011 09:47:53 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] ARM: set vga memory base at run-time Date: Wed, 29 Jun 2011 11:46:59 -0500 Message-Id: <1309366019-24379-7-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309366019-24379-1-git-send-email-robherring2@gmail.com> References: <1309366019-24379-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110629_124755_509915_AF6B6058 X-CRM114-Status: GOOD ( 16.41 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) 0.1 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL Cc: Michal Simek , Rob Herring , nico@fluxnic.net X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Wed, 29 Jun 2011 16:51:06 +0000 (UTC) From: Rob Herring Convert the incorrectly named PCIMEM_BASE to a variable called vga_base. This removes the dependency on mach/hardware.h. Signed-off-by: Rob Herring Acked-by: Nicolas Pitre --- arch/arm/include/asm/vga.h | 5 +++-- arch/arm/mach-dove/include/mach/hardware.h | 3 --- arch/arm/mach-dove/pcie.c | 3 +++ arch/arm/mach-footbridge/dc21285.c | 1 + arch/arm/mach-integrator/include/mach/hardware.h | 2 -- arch/arm/mach-integrator/pci_v3.c | 2 ++ arch/arm/mach-kirkwood/include/mach/hardware.h | 3 --- arch/arm/mach-kirkwood/pcie.c | 2 ++ arch/arm/mach-mv78xx0/include/mach/hardware.h | 3 --- arch/arm/mach-mv78xx0/pcie.c | 2 ++ arch/arm/mach-orion5x/include/mach/hardware.h | 3 --- arch/arm/mach-orion5x/pci.c | 1 + arch/arm/mach-shark/include/mach/hardware.h | 2 -- arch/arm/mach-shark/pci.c | 2 ++ arch/arm/mm/iomap.c | 3 +++ 15 files changed, 19 insertions(+), 18 deletions(-) diff --git a/arch/arm/include/asm/vga.h b/arch/arm/include/asm/vga.h index 250a4dd..91f4021 100644 --- a/arch/arm/include/asm/vga.h +++ b/arch/arm/include/asm/vga.h @@ -2,9 +2,10 @@ #define ASMARM_VGA_H #include -#include -#define VGA_MAP_MEM(x,s) (PCIMEM_BASE + (x)) +extern unsigned long vga_base; + +#define VGA_MAP_MEM(x,s) (vga_base + (x)) #define vga_readb(x) (*((volatile unsigned char *)x)) #define vga_writeb(x,y) (*((volatile unsigned char *)y) = (x)) diff --git a/arch/arm/mach-dove/include/mach/hardware.h b/arch/arm/mach-dove/include/mach/hardware.h index 94c5a2c..f1368b9 100644 --- a/arch/arm/mach-dove/include/mach/hardware.h +++ b/arch/arm/mach-dove/include/mach/hardware.h @@ -11,9 +11,6 @@ #include "dove.h" -#define PCIMEM_BASE DOVE_PCIE0_MEM_PHYS_BASE - - /* Macros below are required for compatibility with PXA AC'97 driver. */ #define __REG(x) (*((volatile u32 *)((x) - DOVE_SB_REGS_PHYS_BASE + \ DOVE_SB_REGS_VIRT_BASE))) diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c index 4810426..021579a 100644 --- a/arch/arm/mach-dove/pcie.c +++ b/arch/arm/mach-dove/pcie.c @@ -11,6 +11,7 @@ #include #include #include +#include