From patchwork Mon Mar 31 15:15:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 27440 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 66F2D202E0 for ; Mon, 31 Mar 2014 15:17:59 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id lh14sf19711149vcb.6 for ; Mon, 31 Mar 2014 08:17:59 -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=WEHijB2Q2tODR9mo4VcOVWmYARmnTXrd2nhZv6pX1Bg=; b=SnddHSNoHy01hq2RPx5P76vc2qWtlW5GFPoJopgwjbz5zZVJJ7b+m3LauAI8OpLApg rmIfwz+jKA0reEqQbQt6IcNn/tDjK+GbZrWdnjd/Tbh0wVwWafAEfDtlufPx46VqIq51 YbLrJAkAezVCW6tFVvY0OuOvcUF5lV9LBFYxgPI2MfrI/5t8YMqLsYFvE2jb6pZvKdOB k48R/uXeCw/TXXTowsiTg4uYTnx+Fneb5r9saaAHXJ+lyuQ+u7A9/vTzGzM15HCYq3Z7 iKUhtnt4/OsaD0oS7X5bZwMCc8yD5L7KNuc5aNfQQq1ZmcV2u6e1XlnYf6jw39oOiAle U5XQ== X-Gm-Message-State: ALoCoQl2bfzwsc2i1ryialwrdo68Szt98mKT4XyluFITBURxyTKmYzgzkvQoG+wI7Y9/vdKhBNoi X-Received: by 10.236.83.197 with SMTP id q45mr8416816yhe.10.1396279079161; Mon, 31 Mar 2014 08:17:59 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.17.3 with SMTP id 3ls2368193qgc.83.gmail; Mon, 31 Mar 2014 08:17:59 -0700 (PDT) X-Received: by 10.220.133.80 with SMTP id e16mr23852448vct.13.1396279079079; Mon, 31 Mar 2014 08:17:59 -0700 (PDT) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id tq2si2756738vdc.3.2014.03.31.08.17.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 31 Mar 2014 08:17:59 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.170 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.170; Received: by mail-ve0-f170.google.com with SMTP id pa12so8531064veb.1 for ; Mon, 31 Mar 2014 08:17:59 -0700 (PDT) X-Received: by 10.221.22.71 with SMTP id qv7mr174703vcb.34.1396279078991; Mon, 31 Mar 2014 08:17:58 -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 v8csp150700vcv; Mon, 31 Mar 2014 08:17:58 -0700 (PDT) X-Received: by 10.69.1.69 with SMTP id be5mr7761342pbd.126.1396279078320; Mon, 31 Mar 2014 08:17:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k1si9354231pao.142.2014.03.31.08.17.57; Mon, 31 Mar 2014 08:17:57 -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 S1753737AbaCaPRy (ORCPT + 5 others); Mon, 31 Mar 2014 11:17:54 -0400 Received: from devils.ext.ti.com ([198.47.26.153]:58754 "EHLO devils.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753789AbaCaPRv (ORCPT ); Mon, 31 Mar 2014 11:17:51 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id s2VFHN1q021886; Mon, 31 Mar 2014 10:17:23 -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 s2VFHNJ3023331; Mon, 31 Mar 2014 10:17:23 -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:22 -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 s2VFGm44013169; Mon, 31 Mar 2014 10:17:21 -0500 From: Tero Kristo To: , , CC: Subject: [PATCH 17/55] ARM: AM33xx: PRM: remove references to prm-regbits-33xx.h from PRM core code Date: Mon, 31 Mar 2014 18:15:56 +0300 Message-ID: <1396278994-12624-18-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.170 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/prm33xx.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/prm33xx.c b/arch/arm/mach-omap2/prm33xx.c index 0660105..877d7c7 100644 --- a/arch/arm/mach-omap2/prm33xx.c +++ b/arch/arm/mach-omap2/prm33xx.c @@ -21,7 +21,13 @@ #include "powerdomain.h" #include "prm33xx.h" -#include "prm-regbits-33xx.h" + +#define AM33XX_LASTPOWERSTATEENTERED_SHIFT 24 +#define AM33XX_LASTPOWERSTATEENTERED_MASK (0x3 << 24) +#define AM33XX_LOGICSTATEST_SHIFT 2 +#define AM33XX_LOGICSTATEST_MASK (1 << 2) +#define AM33XX_LOWPOWERSTATECHANGE_SHIFT 4 +#define AM33XX_LOWPOWERSTATECHANGE_MASK (1 << 4) /* Read a register in a PRM instance */ u32 am33xx_prm_read_reg(s16 inst, u16 idx)