From patchwork Mon Mar 31 15:15:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27424 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f198.google.com (mail-ie0-f198.google.com [209.85.223.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 75C7C202E0 for ; Mon, 31 Mar 2014 15:17:21 +0000 (UTC) Received: by mail-ie0-f198.google.com with SMTP id to1sf29552508ieb.5 for ; Mon, 31 Mar 2014 08:17:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=JQMYvybKJzOqBcAblMoliShdjS9Ny2KHWTonQldNb2k=; b=Rp/+Qd3p4pgS6bL7EKhrvUhXBqpFjRFT6OjxviG8V5lEN4vMjjO6B/XRM6n6unQZDw DPTXkJoeBVxrIR5jWUwLz//lcwTT8/bAJ/P/U4L0kH8AmECv6n1YrhqoXEl+Y9GdlYDN vqIoHqbGCx+/n1+aDn/+5DetSpksKMYFbeketA23qIBjMqHm8zmAfKgiS/H/788tO+Lr 5qm84nYxq/WyCKrGnGCinSIQA4qDm+ErY8lEo1VUKw4tflpHcYhnEMvYuEHqtpe0XhMU xNv8tVRV3SqXpGFfq4Q9W41A4IyIRh843j7AgZwUCKWDoM0nyPYlJ+dGCAHlgYes4odD fb1g== X-Gm-Message-State: ALoCoQmMaXYtW6jN3/BNEWm1OPw2v7ic4DetheIqqpI9f3sC47RdymcLEsXm7eVPCaZi2fBh3vz6 X-Received: by 10.43.103.136 with SMTP id di8mr8849190icc.14.1396279040828; Mon, 31 Mar 2014 08:17:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.81 with SMTP id r75ls2579378qga.71.gmail; Mon, 31 Mar 2014 08:17:20 -0700 (PDT) X-Received: by 10.58.230.103 with SMTP id sx7mr918089vec.28.1396279040720; Mon, 31 Mar 2014 08:17:20 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id wy9si3016714vdc.91.2014.03.31.08.17.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:20 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id ij19so8233146vcb.24 for ; Mon, 31 Mar 2014 08:17:20 -0700 (PDT) X-Received: by 10.221.22.71 with SMTP id qv7mr173119vcb.34.1396279040614; Mon, 31 Mar 2014 08:17:20 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.12.8 with SMTP id v8csp150621vcv; Mon, 31 Mar 2014 08:17:20 -0700 (PDT) X-Received: by 10.66.26.81 with SMTP id j17mr25691997pag.87.1396279040107; Mon, 31 Mar 2014 08:17:20 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cb4si4132536pbc.495.2014.03.31.08.17.19; Mon, 31 Mar 2014 08:17:19 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752779AbaCaPRS (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:18 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49771 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752627AbaCaPRS (ORCPT ); Mon, 31 Mar 2014 11:17:18 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFGqhI015092; Mon, 31 Mar 2014 10:16:52 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFGq1i013378; Mon, 31 Mar 2014 10:16:52 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:16:52 -0500 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFGm3m013169; Mon, 31 Mar 2014 10:16:50 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 01/55] ARM: OMAP4: CM: use cm_base* in register address calculations Date: Mon, 31 Mar 2014 18:15:40 +0300 Message-ID: <1396278994-12624-2-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1396278994-12624-1-git-send-email-t-kristo@ti.com> References: <1396278994-12624-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , OMAP44XX_CM*_REGADDR macros should be avoided, instead use the cm_base* iomaps. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm44xx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/cm44xx.c b/arch/arm/mach-omap2/cm44xx.c index 535d66e..5627072 100644 --- a/arch/arm/mach-omap2/cm44xx.c +++ b/arch/arm/mach-omap2/cm44xx.c @@ -30,23 +30,23 @@ /* Read a register in CM1 */ u32 omap4_cm1_read_inst_reg(s16 inst, u16 reg) { - return __raw_readl(OMAP44XX_CM1_REGADDR(inst, reg)); + return __raw_readl(cm_base + inst + reg); } /* Write into a register in CM1 */ void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 reg) { - __raw_writel(val, OMAP44XX_CM1_REGADDR(inst, reg)); + __raw_writel(val, cm_base + inst + reg); } /* Read a register in CM2 */ u32 omap4_cm2_read_inst_reg(s16 inst, u16 reg) { - return __raw_readl(OMAP44XX_CM2_REGADDR(inst, reg)); + return __raw_readl(cm2_base + inst + reg); } /* Write into a register in CM2 */ void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 reg) { - __raw_writel(val, OMAP44XX_CM2_REGADDR(inst, reg)); + __raw_writel(val, cm2_base + inst + reg); }