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: Robert Lee X-Patchwork-Id: 158084 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 19985B6FB4 for ; Thu, 10 May 2012 10:26:33 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SSHBC-0007pO-C4; Thu, 10 May 2012 00:24:26 +0000 Received: from mail-yx0-f177.google.com ([209.85.213.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SSHB8-0007nF-2J for linux-arm-kernel@lists.infradead.org; Thu, 10 May 2012 00:24:22 +0000 Received: by yenr9 with SMTP id r9so1085876yen.36 for ; Wed, 09 May 2012 17:24:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=ZJu5zLNr2v3G3WKNRimuiHwBdIadvI73gN1uZExaJLI=; b=HLs5RuVRD5QaayedghTqMGghstv7wSrtdfTSFZHKyiTAlStrxZNxWenQAU7G7cDZON A3wxkDovO7glv2o9CQ6Q2eTdpUD/vtKhDl9888149hS5vxAFSRTL7Met8Q0afol4XYX7 UkkJe7+9XihAh0e9/1kLqwD9jphxBgfxlI7fW8LVwhcmp5Die9oUFz9+GTiBvB6LBg+/ gsKsB3p7ZC6LM+DeWeeB7Lkpw5ySCaAA3pIBnLY27xfh9lCUcgpbdq2BWzkBIT+Pmo/8 lRWbaSiNMJNxR1ea+5630b0xjW+q7b3cGXsbQ+9lxQLWtpLmOd+oDIEsIJ2UK8kwNGpc 00qw== 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 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: ALoCoQl0tVsFlXplLW7WOmRf1pwyIx873hC6VUY8+H88b/OvehjYAAgmpPysloYqITN8UZlUstmg X-Spam-Note: CRM114 invocation failed 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.213.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linaro-dev@lists.linaro.org, patches@linaro.org, amit.kucheria@linaro.org, richard.zhao@freescale.com, u.kleine-koenig@pengutronix.de, shawn.guo@linaro.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list 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+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org 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)))