From patchwork Tue Mar 4 16:19:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 25700 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CAF602066C for ; Tue, 4 Mar 2014 16:20:30 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id i8sf14111303qcq.4 for ; Tue, 04 Mar 2014 08:20:30 -0800 (PST) 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=QwhDJEHYYGU/AyIRUe0swC7dzS67i6YMBED3neWuBXk=; b=F8Yh+jJC69+4L9fQIyKJNVZJgOF2KDNCKE7OeafUp6qOQ7HXUsYuzYIbAihAjBaqjP BtYUm68yDPcYpMBeoXW2KDUasrA8/6iaq7tQCNQogECCugMkAhzNIx2P4U+M13VSuudW sdPb6EQM0N/hF8B+q9lfUt5J+WekTbe1osLRLrrS8uK/Yee723ymAnqDBr46Ji/yc6iw XVMSL3XSX3I20QLfwUv5ouQupajd27Nsrpt1UZ9/QrnYqK9tvnKKOSlgx6QJVqHt5+Vj MMWNH6rSybF0eFlRdy+fSvi+6xuS49M6cUyuzINOD/71Xj6vwXaBahzGSd/vXbWXblo9 IfVQ== X-Gm-Message-State: ALoCoQmqVEMOGyL5bsgImARN83lp99zVGrI06vc6nglhGEmx1jEDgYZX1ovrd36zvYaxXBzD4dwQ X-Received: by 10.236.83.112 with SMTP id p76mr99912yhe.51.1393950030199; Tue, 04 Mar 2014 08:20:30 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.42.14 with SMTP id b14ls2628513qga.47.gmail; Tue, 04 Mar 2014 08:20:30 -0800 (PST) X-Received: by 10.52.189.33 with SMTP id gf1mr216065vdc.26.1393950030082; Tue, 04 Mar 2014 08:20:30 -0800 (PST) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id tx7si5923945vcb.83.2014.03.04.08.20.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Mar 2014 08:20:29 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id sa20so5946272veb.36 for ; Tue, 04 Mar 2014 08:20:29 -0800 (PST) X-Received: by 10.58.100.211 with SMTP id fa19mr262139veb.14.1393950029751; Tue, 04 Mar 2014 08:20:29 -0800 (PST) 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.130.193 with SMTP id u1csp138066vcs; Tue, 4 Mar 2014 08:20:29 -0800 (PST) X-Received: by 10.68.134.198 with SMTP id pm6mr419982pbb.9.1393950028848; Tue, 04 Mar 2014 08:20:28 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wq4si14758274pbc.137.2014.03.04.08.20.28; Tue, 04 Mar 2014 08:20:28 -0800 (PST) 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 S1754470AbaCDQUY (ORCPT + 5 others); Tue, 4 Mar 2014 11:20:24 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:48473 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754422AbaCDQUW (ORCPT ); Tue, 4 Mar 2014 11:20:22 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s24GJtF8003111; Tue, 4 Mar 2014 10:19:55 -0600 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s24GJtAP032411; Tue, 4 Mar 2014 10:19:55 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Tue, 4 Mar 2014 10:19:55 -0600 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 s24GJdR6017797; Tue, 4 Mar 2014 10:19:53 -0600 From: Tero Kristo To: , , , CC: Subject: [PATCH 07/18] ARM: OMAP2/3: CM: remove direct register access macros from common header Date: Tue, 4 Mar 2014 18:19:07 +0200 Message-ID: <1393949958-816-8-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1393949958-816-1-git-send-email-t-kristo@ti.com> References: <1393949958-816-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.128.177 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: , Done in preparation to move CM to be a driver of its own. This patch causes currently a build breakage which will be addressed in next patches. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm2xxx.c | 1 + arch/arm/mach-omap2/cm2xxx_3xxx.h | 48 ------------------- arch/arm/mach-omap2/cm2xxx_3xxx_private.h | 74 +++++++++++++++++++++++++++++ arch/arm/mach-omap2/cm3xxx.c | 1 + arch/arm/mach-omap2/prm3xxx.c | 2 +- 5 files changed, 77 insertions(+), 49 deletions(-) create mode 100644 arch/arm/mach-omap2/cm2xxx_3xxx_private.h diff --git a/arch/arm/mach-omap2/cm2xxx.c b/arch/arm/mach-omap2/cm2xxx.c index 8be6ea5..4c29f63 100644 --- a/arch/arm/mach-omap2/cm2xxx.c +++ b/arch/arm/mach-omap2/cm2xxx.c @@ -20,6 +20,7 @@ #include "prm2xxx.h" #include "cm.h" +#include "cm2xxx_3xxx_private.h" #include "cm2xxx.h" #include "cm-regbits-24xx.h" #include "clockdomain.h" diff --git a/arch/arm/mach-omap2/cm2xxx_3xxx.h b/arch/arm/mach-omap2/cm2xxx_3xxx.h index bfbd16f..b40b5bd 100644 --- a/arch/arm/mach-omap2/cm2xxx_3xxx.h +++ b/arch/arm/mach-omap2/cm2xxx_3xxx.h @@ -48,54 +48,6 @@ #ifndef __ASSEMBLER__ -#include - -static inline u32 omap2_cm_read_mod_reg(s16 module, u16 idx) -{ - return __raw_readl(cm_base + module + idx); -} - -static inline void omap2_cm_write_mod_reg(u32 val, s16 module, u16 idx) -{ - __raw_writel(val, cm_base + module + idx); -} - -/* Read-modify-write a register in a CM module. Caller must lock */ -static inline u32 omap2_cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, - s16 idx) -{ - u32 v; - - v = omap2_cm_read_mod_reg(module, idx); - v &= ~mask; - v |= bits; - omap2_cm_write_mod_reg(v, module, idx); - - return v; -} - -/* Read a CM register, AND it, and shift the result down to bit 0 */ -static inline u32 omap2_cm_read_mod_bits_shift(s16 domain, s16 idx, u32 mask) -{ - u32 v; - - v = omap2_cm_read_mod_reg(domain, idx); - v &= mask; - v >>= __ffs(mask); - - return v; -} - -static inline u32 omap2_cm_set_mod_reg_bits(u32 bits, s16 module, s16 idx) -{ - return omap2_cm_rmw_mod_reg_bits(bits, bits, module, idx); -} - -static inline u32 omap2_cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) -{ - return omap2_cm_rmw_mod_reg_bits(bits, 0x0, module, idx); -} - extern int omap2xxx_cm_apll54_enable(void); extern void omap2xxx_cm_apll54_disable(void); extern int omap2xxx_cm_apll96_enable(void); diff --git a/arch/arm/mach-omap2/cm2xxx_3xxx_private.h b/arch/arm/mach-omap2/cm2xxx_3xxx_private.h new file mode 100644 index 0000000..9131829 --- /dev/null +++ b/arch/arm/mach-omap2/cm2xxx_3xxx_private.h @@ -0,0 +1,74 @@ +/* + * OMAP2/3 Clock Management (CM) register definitions + * + * Copyright (C) 2007-2009 Texas Instruments, Inc. + * Copyright (C) 2007-2010 Nokia Corporation + * Paul Walmsley + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * The CM hardware modules on the OMAP2/3 are quite similar to each + * other. The CM modules/instances on OMAP4 are quite different, so + * they are handled in a separate file. + */ +#ifndef __ARCH_ARM_MACH_OMAP2_CM2XXX_3XXX_PRIVATE_H +#define __ARCH_ARM_MACH_OMAP2_CM2XXX_3XXX_PRIVATE_H + +#include "cm.h" +#include "cm2xxx_3xxx.h" + +#ifndef __ASSEMBLER__ + +#include + +static inline u32 omap2_cm_read_mod_reg(s16 module, u16 idx) +{ + return __raw_readl(cm_base + module + idx); +} + +static inline void omap2_cm_write_mod_reg(u32 val, s16 module, u16 idx) +{ + __raw_writel(val, cm_base + module + idx); +} + +/* Read-modify-write a register in a CM module. Caller must lock */ +static inline u32 omap2_cm_rmw_mod_reg_bits(u32 mask, u32 bits, s16 module, + s16 idx) +{ + u32 v; + + v = omap2_cm_read_mod_reg(module, idx); + v &= ~mask; + v |= bits; + omap2_cm_write_mod_reg(v, module, idx); + + return v; +} + +/* Read a CM register, AND it, and shift the result down to bit 0 */ +static inline u32 omap2_cm_read_mod_bits_shift(s16 domain, s16 idx, u32 mask) +{ + u32 v; + + v = omap2_cm_read_mod_reg(domain, idx); + v &= mask; + v >>= __ffs(mask); + + return v; +} + +static inline u32 omap2_cm_set_mod_reg_bits(u32 bits, s16 module, s16 idx) +{ + return omap2_cm_rmw_mod_reg_bits(bits, bits, module, idx); +} + +static inline u32 omap2_cm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx) +{ + return omap2_cm_rmw_mod_reg_bits(bits, 0x0, module, idx); +} + +#endif + +#endif diff --git a/arch/arm/mach-omap2/cm3xxx.c b/arch/arm/mach-omap2/cm3xxx.c index 129a4e7..989590e 100644 --- a/arch/arm/mach-omap2/cm3xxx.c +++ b/arch/arm/mach-omap2/cm3xxx.c @@ -20,6 +20,7 @@ #include "prm2xxx_3xxx.h" #include "cm.h" +#include "cm2xxx_3xxx_private.h" #include "cm3xxx.h" #include "cm-regbits-34xx.h" #include "clockdomain.h" diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index 92ab46a..6dfa95c 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c @@ -24,7 +24,7 @@ #include "powerdomain.h" #include "prm3xxx.h" #include "prm2xxx_3xxx.h" -#include "cm2xxx_3xxx.h" +#include "cm2xxx_3xxx_private.h" #include "prm-regbits-34xx.h" #include "cm3xxx.h" #include "cm-regbits-34xx.h"