From patchwork Mon Mar 31 15:15:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27437 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6D30D202E0 for ; Mon, 31 Mar 2014 15:17:54 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id n16sf29755334oag.5 for ; Mon, 31 Mar 2014 08:17:53 -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=AiB5FL8nWf9y8q58zp0EqcLRvDcqXev+CSLRZvUGF+o=; b=W/anNWMLn2VfTZ1rKLYd3nFofLQqStza7wdezDrYExquYkxJG7/W8bYDHpi2myzS8a wCLvWNfYqBc0qMFusKUcvDQKnqpf/q3dNFOeCEvZ+VGu5JKjiPIIZs8oygfHwg0uTis/ 8DveU8ttHkBsXL19baIV9JpKoE/wXyzW/QbZSSqPb0sLd0wVvUlZpu9h03P0aCyYMAPA Z2JdItmnOkUYvg42Ueo/f5/+3ciQ35l9/THvTmGh9+8/pinLfxqviPi+VUWuFu1qlS9j tkfgGeaiIgTxCzSOrA8Gsj3WZFIfhKQUH4hQNu7/MJ4Ox9hfZ7JS7F51iKU+I9Qy0I5/ suyA== X-Gm-Message-State: ALoCoQm3XHowMION3lALDHMxOaPKJe/fpf5vBVUi31UkrfvmOd7a+EOPAexT63Y6bnDDDgqgcYIq X-Received: by 10.42.235.206 with SMTP id kh14mr8551594icb.30.1396279073660; Mon, 31 Mar 2014 08:17:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.89.70 with SMTP id u64ls2380866qgd.80.gmail; Mon, 31 Mar 2014 08:17:53 -0700 (PDT) X-Received: by 10.52.191.100 with SMTP id gx4mr20027536vdc.4.1396279073545; Mon, 31 Mar 2014 08:17:53 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id sj4si3004558vdc.210.2014.03.31.08.17.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:53 -0700 (PDT) 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 sa20so8068617veb.8 for ; Mon, 31 Mar 2014 08:17:53 -0700 (PDT) X-Received: by 10.58.195.202 with SMTP id ig10mr458218vec.33.1396279073463; Mon, 31 Mar 2014 08:17:53 -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 v8csp150690vcv; Mon, 31 Mar 2014 08:17:53 -0700 (PDT) X-Received: by 10.66.240.4 with SMTP id vw4mr25728610pac.26.1396279072614; Mon, 31 Mar 2014 08:17:52 -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.49; Mon, 31 Mar 2014 08:17:49 -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 S1753656AbaCaPRm (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:42 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:39098 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753625AbaCaPRk (ORCPT ); Mon, 31 Mar 2014 11:17:40 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFHLa9004852; Mon, 31 Mar 2014 10:17:21 -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 s2VFHL07013823; Mon, 31 Mar 2014 10:17:21 -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:20 -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 s2VFGm43013169; Mon, 31 Mar 2014 10:17:19 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 16/55] ARM: OMAP2: PRM: remove references to prm-regbits-24xx.h from PRM core code Date: Mon, 31 Mar 2014 18:15:55 +0300 Message-ID: <1396278994-12624-17-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.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 make PRM a standalone driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/prm2xxx.c | 16 +++++++++++++++- arch/arm/mach-omap2/prm2xxx_3xxx.c | 1 - 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/prm2xxx.c b/arch/arm/mach-omap2/prm2xxx.c index a7f1cac..7264ae6 100644 --- a/arch/arm/mach-omap2/prm2xxx.c +++ b/arch/arm/mach-omap2/prm2xxx.c @@ -20,9 +20,23 @@ #include "powerdomain.h" #include "clockdomain.h" +#include "prm2xxx.h" #include "prm2xxx_3xxx_private.h" #include "cm2xxx_3xxx.h" -#include "prm-regbits-24xx.h" + +#define OMAP24XX_FORCESTATE_MASK (1 << 18) +#define OMAP24XX_AUTOIDLE_MASK (1 << 0) +#define OMAP24XX_AUTO_EXTVOLT_MASK (1 << 15) + +#define OMAP24XX_SETOFF_LEVEL_SHIFT 12 +#define OMAP24XX_MEMRETCTRL_MASK (1 << 8) +#define OMAP24XX_SETRET_LEVEL_SHIFT 6 +#define OMAP24XX_VOLT_LEVEL_SHIFT 0 + +#define OMAP24XX_EXTWMPU_RST_SHIFT 6 +#define OMAP24XX_SECU_WD_RST_SHIFT 5 +#define OMAP24XX_MPU_WD_RST_SHIFT 4 +#define OMAP24XX_SECU_VIOL_RST_SHIFT 3 /* * OMAP24xx PM_PWSTCTRL_*.POWERSTATE and PM_PWSTST_*.LASTSTATEENTERED bits - diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.c b/arch/arm/mach-omap2/prm2xxx_3xxx.c index d891499..d8044f9 100644 --- a/arch/arm/mach-omap2/prm2xxx_3xxx.c +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.c @@ -18,7 +18,6 @@ #include "powerdomain.h" #include "prm2xxx_3xxx_private.h" -#include "prm-regbits-24xx.h" #include "clockdomain.h" /**