From patchwork Mon Mar 31 15:15:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27435 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AAABF202E0 for ; Mon, 31 Mar 2014 15:17:47 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id pa12sf20393687veb.8 for ; Mon, 31 Mar 2014 08:17:47 -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=yuAL1z714SCaSqQq/A3FzSeNHz0lEhlUSLiMjpckmxs=; b=d+padApgYaafi1sj4ohIIEsbm+1qfXZ2/+JCBwNrvwxqkszr64LfQX4foOVDZUk/ni jsk/W9BHmh5IH6+2jTHRtKhX2ZDGiswccPcpvUgV66n3kCISwxsbmQhi0P8rLQmTKS4G PFv8qe+aa+WczR3AgBTbhjvyZfqnde4lbQbihG2sBFhir1ZEUforT63heOykQgi98RGw oMk4oJJSIPNckafGfqr+2JjiEyWTGAIECABr+p8DgDJJy5836Mgmql0JVXuY5sKWMaP+ ZaN/xIzBhcXrZ8X+qi+i4nWwL0yaPXXDZw3ay5mAV0kSlseq6Yh0vQm6vfRnwah2+m2+ 2efg== X-Gm-Message-State: ALoCoQlOge/MCyzPH614CANjWCf+BymEPpIs7/1zYoF+/SPX7PmgFGUQCNcLjROs6yjIzNjImb9S X-Received: by 10.52.29.171 with SMTP id l11mr8927369vdh.0.1396279067241; Mon, 31 Mar 2014 08:17:47 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.86.85 with SMTP id o79ls2474369qgd.12.gmail; Mon, 31 Mar 2014 08:17:47 -0700 (PDT) X-Received: by 10.58.243.39 with SMTP id wv7mr41317vec.51.1396279067128; Mon, 31 Mar 2014 08:17:47 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id rx10si3005104vdc.186.2014.03.31.08.17.47 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.174 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.174; Received: by mail-ve0-f174.google.com with SMTP id oz11so8060279veb.5 for ; Mon, 31 Mar 2014 08:17:47 -0700 (PDT) X-Received: by 10.221.4.66 with SMTP id ob2mr895666vcb.28.1396279067062; Mon, 31 Mar 2014 08:17:47 -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 v8csp150677vcv; Mon, 31 Mar 2014 08:17:46 -0700 (PDT) X-Received: by 10.68.138.165 with SMTP id qr5mr8030284pbb.123.1396279066327; Mon, 31 Mar 2014 08:17:46 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ua2si9337117pab.487.2014.03.31.08.17.45; Mon, 31 Mar 2014 08:17:45 -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 S1753687AbaCaPRm (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:42 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:39097 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753613AbaCaPRk (ORCPT ); Mon, 31 Mar 2014 11:17:40 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFHJm9004849; Mon, 31 Mar 2014 10:17:19 -0500 Received: from DLEE70.ent.ti.com (dlemailx.itg.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFHJQj023305; Mon, 31 Mar 2014 10:17:19 -0500 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; Mon, 31 Mar 2014 10:17:19 -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 s2VFGm42013169; Mon, 31 Mar 2014 10:17:18 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 15/55] ARM: AM33xx: CM: remove references to cm-regbits-33xx.h from CM core code Date: Mon, 31 Mar 2014 18:15:54 +0300 Message-ID: <1396278994-12624-16-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.128.174 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 make CM a standalone driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm33xx.c | 9 ++++++++- arch/arm/mach-omap2/cm33xx.h | 1 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/cm33xx.c b/arch/arm/mach-omap2/cm33xx.c index 40a22e5..728ac3f 100644 --- a/arch/arm/mach-omap2/cm33xx.c +++ b/arch/arm/mach-omap2/cm33xx.c @@ -26,9 +26,16 @@ #include "cm.h" #include "cm33xx.h" #include "cm-regbits-34xx.h" -#include "cm-regbits-33xx.h" #include "prm33xx.h" +#define AM33XX_MODULEMODE_SHIFT 0 +#define AM33XX_MODULEMODE_MASK (0x3 << 0) + +#define AM33XX_CLKTRCTRL_SHIFT 0 +#define AM33XX_CLKTRCTRL_MASK (0x3 << 0) +#define AM33XX_IDLEST_SHIFT 16 +#define AM33XX_IDLEST_MASK (0x3 << 16) + /* * CLKCTRL_IDLEST_*: possible values for the CM_*_CLKCTRL.IDLEST bitfield: * diff --git a/arch/arm/mach-omap2/cm33xx.h b/arch/arm/mach-omap2/cm33xx.h index 15a778c..8f9e479 100644 --- a/arch/arm/mach-omap2/cm33xx.h +++ b/arch/arm/mach-omap2/cm33xx.h @@ -18,7 +18,6 @@ #define __ARCH_ARM_MACH_OMAP2_CM_33XX_H #include "cm.h" -#include "cm-regbits-33xx.h" /* CM base address */ #define AM33XX_CM_BASE 0x44e00000