From patchwork Mon Mar 31 15:15:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27436 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EC516202E0 for ; Mon, 31 Mar 2014 15:17:50 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf29742267oag.0 for ; Mon, 31 Mar 2014 08:17:50 -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=vSm5+EFmIuUaFoUFGJo4rscBAX4u083WoOLGD6w7zIY=; b=eDs4eO4/VcTMJ5ejY3lVPoy1SPv1HD2XKrtNKwy4xj9KLMI9zy2wQJQkJNLH5aNew5 vFmPv3UbI38wvCQsXrkvWOajYO+z8JFL4ZjfG+r1Hqeskz+2EMBuBM3DWCxTtTAa/5vp Bo9doho2SEsjCYd4ZkinZb8UYZurhOM4FGjdK4FxWlywM6xUqKjtCstf/BRkxa2S5Ufb 5ppXZPPAqiHyHJ/iYzgSo1QJJQewt/8wdhl6DXC2r1N7oSXefJX8cbgqfMcDiOG9GOQu Ux+ILTEookeh2v7v7NisfNZBqRWMFWkaGdPCBoGUN546Sp4KWl2nGAM0vERB4iPL39wH 6osg== X-Gm-Message-State: ALoCoQmUwL1e2gs6O6ZTrACU4UwU5nxJyKqxIEsw0GNNjI3TkJN7OJ3hzBjOBbgb6QHo8bbH479v X-Received: by 10.42.87.140 with SMTP id y12mr8406123icl.31.1396279070458; Mon, 31 Mar 2014 08:17:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.134 with SMTP id b6ls2538794qgb.91.gmail; Mon, 31 Mar 2014 08:17:50 -0700 (PDT) X-Received: by 10.58.154.10 with SMTP id vk10mr3681784veb.18.1396279070361; Mon, 31 Mar 2014 08:17:50 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id o2si645044vew.7.2014.03.31.08.17.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:50 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 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.172; Received: by mail-vc0-f172.google.com with SMTP id la4so8538521vcb.3 for ; Mon, 31 Mar 2014 08:17:50 -0700 (PDT) X-Received: by 10.58.150.68 with SMTP id ug4mr41680veb.50.1396279070284; Mon, 31 Mar 2014 08:17:50 -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 v8csp150682vcv; Mon, 31 Mar 2014 08:17:49 -0700 (PDT) X-Received: by 10.68.178.66 with SMTP id cw2mr25884462pbc.89.1396279069576; Mon, 31 Mar 2014 08:17:49 -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.46; Mon, 31 Mar 2014 08:17:46 -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 S1753712AbaCaPRn (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:43 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:49811 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753625AbaCaPRm (ORCPT ); Mon, 31 Mar 2014 11:17:42 -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 s2VFHGwT015176; Mon, 31 Mar 2014 10:17:16 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFHGFC013787; Mon, 31 Mar 2014 10:17:16 -0500 Received: from dflp32.itg.ti.com (10.64.6.15) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Mon, 31 Mar 2014 10:17:15 -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 s2VFGm40013169; Mon, 31 Mar 2014 10:17:14 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 13/55] ARM: OMAP4: PRCM: remove references to cm-regbits-44xx.h from PRCM core files Date: Mon, 31 Mar 2014 18:15:52 +0300 Message-ID: <1396278994-12624-14-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.172 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 PRCM a standalone driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/cm44xx.c | 1 - arch/arm/mach-omap2/cminst44xx.c | 8 +++++++- arch/arm/mach-omap2/powerdomain-common.c | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/cm44xx.c b/arch/arm/mach-omap2/cm44xx.c index 37ba6e8..c440ba7 100644 --- a/arch/arm/mach-omap2/cm44xx.c +++ b/arch/arm/mach-omap2/cm44xx.c @@ -21,7 +21,6 @@ #include "cm.h" #include "cm1_44xx.h" #include "cm2_44xx.h" -#include "cm-regbits-44xx.h" /* CM1 hardware module low-level functions */ diff --git a/arch/arm/mach-omap2/cminst44xx.c b/arch/arm/mach-omap2/cminst44xx.c index d27d2bd..c2712d3 100644 --- a/arch/arm/mach-omap2/cminst44xx.c +++ b/arch/arm/mach-omap2/cminst44xx.c @@ -28,12 +28,18 @@ #include "cm44xx.h" #include "cminst44xx.h" #include "cm-regbits-34xx.h" -#include "cm-regbits-44xx.h" #include "prcm44xx.h" #include "prm44xx.h" #include "prcm_mpu44xx.h" #include "prcm-common.h" +#define OMAP4430_IDLEST_SHIFT 16 +#define OMAP4430_IDLEST_MASK (0x3 << 16) +#define OMAP4430_CLKTRCTRL_SHIFT 0 +#define OMAP4430_CLKTRCTRL_MASK (0x3 << 0) +#define OMAP4430_MODULEMODE_SHIFT 0 +#define OMAP4430_MODULEMODE_MASK (0x3 << 0) + /* * CLKCTRL_IDLEST_*: possible values for the CM_*_CLKCTRL.IDLEST bitfield: * diff --git a/arch/arm/mach-omap2/powerdomain-common.c b/arch/arm/mach-omap2/powerdomain-common.c index c0aeabf..c40e5f0 100644 --- a/arch/arm/mach-omap2/powerdomain-common.c +++ b/arch/arm/mach-omap2/powerdomain-common.c @@ -17,7 +17,6 @@ #include "pm.h" #include "cm.h" #include "cm-regbits-34xx.h" -#include "cm-regbits-44xx.h" #include "prm-regbits-34xx.h" #include "prm-regbits-44xx.h"