From patchwork Mon Mar 31 15:15:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27439 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4E65B202E0 for ; Mon, 31 Mar 2014 15:17:57 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf29555803iec.0 for ; Mon, 31 Mar 2014 08:17:56 -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=wP/AJUusfC/FHc8SrKJ8vfCGQBDfajz6IF8dDBpE0iE=; b=Wui7mvoLdgtt55JIyz8iW7w48/jloGTISB8fLzNZV/gKPFRGrk9cCFPPnJ0XK5/dXM rmvmNim2n7+89UrJLEi1scyNU3dTJdrLpe6Qwj+ciYMXBZshUt+HebSyx8YVl+EDs9BG GiihLGk2IGqjj9ptnsKNOGK8kbV+yMNQSvJaCJ2/99b9+HyBkxDhvSAoQNSp6qOqDQj9 ivRcqzh9P+nT/9opFMTZHj1MMzneJKy+ijOVfkzC+KHrjV1pTMG9PwZOrSYlvJ2WjKf6 PuP5AhyCMev2x06JKSPBr9LvDSLeb0BMx8224Ju80XPJpcaif74Wy1h2Ry1mJaPWAVHt UGbQ== X-Gm-Message-State: ALoCoQkpFGW9pXpyaGXY+SIKCEZexU5YJqG6IRT+idUo57nVN09sSNhm5iTt0oLz1g16uoeVm6gu X-Received: by 10.182.22.133 with SMTP id d5mr10537997obf.27.1396279076697; Mon, 31 Mar 2014 08:17:56 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.41.169 with SMTP id z38ls2428032qgz.36.gmail; Mon, 31 Mar 2014 08:17:56 -0700 (PDT) X-Received: by 10.220.48.194 with SMTP id s2mr43679vcf.43.1396279076600; Mon, 31 Mar 2014 08:17:56 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id kj3si3017971vdb.87.2014.03.31.08.17.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:56 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.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.128.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so8360583veb.31 for ; Mon, 31 Mar 2014 08:17:56 -0700 (PDT) X-Received: by 10.220.162.6 with SMTP id t6mr24346533vcx.12.1396279076515; Mon, 31 Mar 2014 08:17:56 -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 v8csp150695vcv; Mon, 31 Mar 2014 08:17:56 -0700 (PDT) X-Received: by 10.68.40.138 with SMTP id x10mr25889830pbk.8.1396279075783; Mon, 31 Mar 2014 08:17:55 -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.55; Mon, 31 Mar 2014 08:17:55 -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 S1753759AbaCaPRs (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:48 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:54678 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752686AbaCaPRr (ORCPT ); Mon, 31 Mar 2014 11:17:47 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFHOoI028627; Mon, 31 Mar 2014 10:17:24 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s2VFHOrB023340; Mon, 31 Mar 2014 10:17:24 -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:24 -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 s2VFGm45013169; Mon, 31 Mar 2014 10:17:23 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 18/55] ARM: OMAP4: PRM: remove references to prm-regbits-44xx.h from PRM core code Date: Mon, 31 Mar 2014 18:15:57 +0300 Message-ID: <1396278994-12624-19-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.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 PRM a standalone driver. Signed-off-by: Tero Kristo --- arch/arm/mach-omap2/prm44xx.c | 33 ++++++++++++++++++++++++++++++++- arch/arm/mach-omap2/prminst44xx.c | 3 ++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c index 27f4603..5033cd3 100644 --- a/arch/arm/mach-omap2/prm44xx.c +++ b/arch/arm/mach-omap2/prm44xx.c @@ -23,11 +23,42 @@ #include "prm44xx.h" #include "prm54xx.h" #include "prm7xx.h" -#include "prm-regbits-44xx.h" #include "prcm44xx.h" #include "prminst44xx_private.h" #include "powerdomain.h" +#define OMAP4430_GLOBAL_COLD_RST_SHIFT 0 +#define OMAP4430_GLOBAL_WARM_SW_RST_SHIFT 1 +#define OMAP4430_MPU_SECURITY_VIOL_RST_SHIFT 2 +#define OMAP4430_MPU_WDT_RST_SHIFT 3 +#define OMAP4430_SECURE_WDT_RST_SHIFT 4 +#define OMAP4430_EXTERNAL_WARM_RST_SHIFT 5 +#define OMAP4430_VDD_MPU_VOLT_MGR_RST_SHIFT 6 +#define OMAP4430_VDD_IVA_VOLT_MGR_RST_SHIFT 7 +#define OMAP4430_VDD_CORE_VOLT_MGR_RST_SHIFT 8 +#define OMAP4430_ICEPICK_RST_SHIFT 9 +#define OMAP4430_C2C_RST_SHIFT 10 + +#define OMAP4430_GLOBAL_WUEN_MASK (1 << 16) + +#define OMAP4430_LASTPOWERSTATEENTERED_SHIFT 24 +#define OMAP4430_LASTPOWERSTATEENTERED_MASK (0x3 << 24) +#define OMAP4430_LOWPOWERSTATECHANGE_SHIFT 4 +#define OMAP4430_LOWPOWERSTATECHANGE_MASK (1 << 4) + +#define OMAP4430_LOGICRETSTATE_SHIFT 2 +#define OMAP4430_LOGICRETSTATE_MASK (1 << 2) +#define OMAP4430_LOGICSTATEST_SHIFT 2 +#define OMAP4430_LOGICSTATEST_MASK (1 << 2) + +#define OMAP4430_VP_CORE_TRANXDONE_ST_MASK (1 << 21) +#define OMAP4430_VP_IVA_TRANXDONE_ST_MASK (1 << 29) +#define OMAP4430_VP_MPU_TRANXDONE_ST_MASK (1 << 5) + +#define OMAP4430_WUCLK_CTRL_MASK (1 << 8) +#define OMAP4430_WUCLK_STATUS_SHIFT 9 +#define OMAP4430_WUCLK_STATUS_MASK (1 << 9) + /* Static data */ #define OMAP44XX_IRQ_GIC_START 32 diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c index bd0e0da..74349e1 100644 --- a/arch/arm/mach-omap2/prminst44xx.c +++ b/arch/arm/mach-omap2/prminst44xx.c @@ -21,10 +21,11 @@ #include "prm54xx.h" #include "prm7xx.h" #include "prminst44xx.h" -#include "prm-regbits-44xx.h" #include "prcm44xx.h" #include "prcm_mpu44xx.h" +#define OMAP4430_RST_GLOBAL_WARM_SW_MASK (1 << 0) + static void __iomem *_prm_bases[OMAP4_MAX_PRCM_PARTITIONS]; /**