From patchwork Thu May 10 00:24:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob X-Patchwork-Id: 8506 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 42EB623E20 for ; Thu, 10 May 2012 00:24:24 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0E3F5A18591 for ; Thu, 10 May 2012 00:24:23 +0000 (UTC) Received: by yenq6 with SMTP id q6so1173546yen.11 for ; Wed, 09 May 2012 17:24:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=ZJu5zLNr2v3G3WKNRimuiHwBdIadvI73gN1uZExaJLI=; b=Y5H6OYA17UsJLeAaic3CXw6h8vNx7zNHdrs/KhbI8M9fJAfoAqlAZOv5yTPMbzprbD KwNULECVpsi9Xb3BM7zQDnxQaU8NKsCekPzuZpAkbKwJgAFV0cZcer03/EbRVrm925WC FU0MYfrVCUbVotZCDx18OEGA3xhtZlHNEr0k7McE4ahzmAsTHMhF26rTzt5f1pV43L1N kIMGK5MK4zHRVks5WlMibYL3Z8cGWGjq6GVa8h2J0O4r8qUVq+1kMpqaaVPKBOAhbgFg H7y6sTDiai1WNdszAvaWG1ITW2u/A3FeosjOJg0JEElPWTozctTixVUlaprMPms5Gi8E Z9eg== Received: by 10.50.57.129 with SMTP id i1mr1188153igq.33.1336609463191; Wed, 09 May 2012 17:24:23 -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.231.73.147 with SMTP id q19csp56151ibj; Wed, 9 May 2012 17:24:21 -0700 (PDT) Received: by 10.236.154.193 with SMTP id h41mr2550834yhk.58.1336609461597; Wed, 09 May 2012 17:24:21 -0700 (PDT) Received: from mail-yx0-f178.google.com (mail-yx0-f178.google.com [209.85.213.178]) by mx.google.com with ESMTPS id v69si4138380yhl.86.2012.05.09.17.24.21 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 09 May 2012 17:24:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) client-ip=209.85.213.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.213.178 is neither permitted nor denied by best guess record for domain of rob.lee@linaro.org) smtp.mail=rob.lee@linaro.org Received: by yenl6 with SMTP id l6so1130378yen.37 for ; Wed, 09 May 2012 17:24:21 -0700 (PDT) Received: by 10.50.216.232 with SMTP id ot8mr2976570igc.22.1336609460652; Wed, 09 May 2012 17:24:20 -0700 (PDT) Received: from localhost.localdomain ([216.59.27.34]) by mx.google.com with ESMTPS id nh8sm25202131igc.1.2012.05.09.17.24.18 (version=SSLv3 cipher=OTHER); Wed, 09 May 2012 17:24:19 -0700 (PDT) From: Robert Lee To: kernel@pengutronix.de Cc: shawn.guo@linaro.org, u.kleine-koenig@pengutronix.de, amit.kucheria@linaro.org, richard.zhao@freescale.com, linux-arm-kernel@lists.infradead.org, linaro-dev@lists.linaro.org, patches@linaro.org Subject: [PATCH] ARM: imx: Modify IMX_IO_P2V macro Date: Wed, 9 May 2012 19:24:17 -0500 Message-Id: <1336609457-25502-1-git-send-email-rob.lee@linaro.org> X-Mailer: git-send-email 1.7.10 X-Gm-Message-State: ALoCoQmT7XCgXpGci4zqGmFJwaE1WnCpyCql6GWVPLrJC+glzJzdGcrgn887C+D92j99+1y/c1Iz A change is needed in the IMX_IO_P2V macro to allow all imx5 platforms to use common definitions when accessing registers of peripherals on the AIPS2 bus. This change was tested for mapping conflicts using the iop2v script found at git://git.pengutronix.de/git/ukl/imx-iop2v.git and by performing a bootup of a default build using imx_v6_v7_defconfig on a imx51 babbage board and imx53 loco board. Signed-off-by: Robert Lee --- arch/arm/plat-mxc/include/mach/hardware.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h index 0630513..065cc04 100644 --- a/arch/arm/plat-mxc/include/mach/hardware.h +++ b/arch/arm/plat-mxc/include/mach/hardware.h @@ -96,6 +96,7 @@ */ #define IMX_IO_P2V(x) ( \ 0xf4000000 + \ + (((x) & 0x80000000) >> 7) + \ (((x) & 0x50000000) >> 6) + \ (((x) & 0x0b000000) >> 4) + \ (((x) & 0x000fffff)))