From patchwork Mon Mar 1 23:43:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 83089 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o21NhNMk014240 for ; Mon, 1 Mar 2010 23:43:23 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752550Ab0CAXnW (ORCPT ); Mon, 1 Mar 2010 18:43:22 -0500 Received: from mail-yw0-f197.google.com ([209.85.211.197]:62888 "EHLO mail-yw0-f197.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751467Ab0CAXnW (ORCPT ); Mon, 1 Mar 2010 18:43:22 -0500 Received: by ywh35 with SMTP id 35so1461140ywh.4 for ; Mon, 01 Mar 2010 15:43:21 -0800 (PST) Received: by 10.91.160.19 with SMTP id m19mr4237568ago.99.1267487001057; Mon, 01 Mar 2010 15:43:21 -0800 (PST) Received: from localhost (deeprootsystems.com [216.254.16.51]) by mx.google.com with ESMTPS id 21sm3447218iwn.15.2010.03.01.15.43.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 01 Mar 2010 15:43:20 -0800 (PST) To: Tero Kristo Cc: linux-omap@vger.kernel.org Subject: Re: [PATCHv6 9/9] OMAP3: PM: Added support for suspending to INACTIVE state References: <1265999265-4363-1-git-send-email-tero.kristo@nokia.com> <1265999265-4363-2-git-send-email-tero.kristo@nokia.com> <1265999265-4363-3-git-send-email-tero.kristo@nokia.com> <1265999265-4363-4-git-send-email-tero.kristo@nokia.com> <1265999265-4363-5-git-send-email-tero.kristo@nokia.com> <1265999265-4363-6-git-send-email-tero.kristo@nokia.com> <1265999265-4363-7-git-send-email-tero.kristo@nokia.com> <1265999265-4363-8-git-send-email-tero.kristo@nokia.com> <1265999265-4363-9-git-send-email-tero.kristo@nokia.com> <1265999265-4363-10-git-send-email-tero.kristo@nokia.com> From: Kevin Hilman Organization: Deep Root Systems, LLC Date: Mon, 01 Mar 2010 15:43:18 -0800 In-Reply-To: <1265999265-4363-10-git-send-email-tero.kristo@nokia.com> (Tero Kristo's message of "Fri\, 12 Feb 2010 20\:27\:45 +0200") Message-ID: <873a0j8v6x.fsf@deeprootsystems.com> User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 01 Mar 2010 23:43:23 +0000 (UTC) diff --git a/arch/arm/plat-omap/include/plat/powerdomain.h b/arch/arm/plat-omap/include/plat/powerdomain.h index a1ecd47..c692472 100644 --- a/arch/arm/plat-omap/include/plat/powerdomain.h +++ b/arch/arm/plat-omap/include/plat/powerdomain.h @@ -31,17 +31,17 @@ #define PWRDM_MAX_PWRSTS 4 /* Powerdomain allowable state bitfields */ -#define PWRSTS_OFF_ON ((1 << PWRDM_POWER_OFF) | \ +#define PWRSTS_ON ((1 << PWRDM_POWER_INACTIVE) | \ (1 << PWRDM_POWER_ON)) +#define PWRSTS_OFF_ON ((1 << PWRDM_POWER_OFF) | PWRSTS_ON) + #define PWRSTS_OFF_RET ((1 << PWRDM_POWER_OFF) | \ (1 << PWRDM_POWER_RET)) -#define PWRSTS_RET_ON ((1 << PWRDM_POWER_RET) | \ - (1 << PWRDM_POWER_ON)) - -#define PWRSTS_OFF_RET_ON (PWRSTS_OFF_RET | (1 << PWRDM_POWER_ON)) +#define PWRSTS_RET_ON ((1 << PWRDM_POWER_RET) | PWRSTS_ON) +#define PWRSTS_OFF_RET_ON (PWRSTS_OFF_RET | PWRSTS_ON) /* Powerdomain flags */ #define PWRDM_HAS_HDWR_SAR (1 << 0) /* hardware save-and-restore support */