From patchwork Thu Mar 31 00:16:11 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 678151 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2V0GP4f032454 for ; Thu, 31 Mar 2011 00:16:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756621Ab1CaAQX (ORCPT ); Wed, 30 Mar 2011 20:16:23 -0400 Received: from na3sys009aog113.obsmtp.com ([74.125.149.209]:38915 "EHLO na3sys009aog113.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933084Ab1CaAQU (ORCPT ); Wed, 30 Mar 2011 20:16:20 -0400 Received: from source ([209.85.218.47]) (using TLSv1) by na3sys009aob113.postini.com ([74.125.148.12]) with SMTP ID DSNKTZPH05ZTClof0MaR/HnLdDlYqvlhatuV@postini.com; Wed, 30 Mar 2011 17:16:20 PDT Received: by yia13 with SMTP id 13so1001207yia.20 for ; Wed, 30 Mar 2011 17:16:18 -0700 (PDT) Received: by 10.151.135.21 with SMTP id m21mr2157222ybn.373.1301530578767; Wed, 30 Mar 2011 17:16:18 -0700 (PDT) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id q18sm2645591ybk.26.2011.03.30.17.16.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 30 Mar 2011 17:16:18 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/17] OMAP2+: powerdomain: add voltagedomain to struct powerdomain Date: Wed, 30 Mar 2011 17:16:11 -0700 Message-Id: <1301530580-12046-9-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1301530580-12046-1-git-send-email-khilman@ti.com> References: <1301530580-12046-1-git-send-email-khilman@ti.com> 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.6 (demeter1.kernel.org [140.211.167.41]); Thu, 31 Mar 2011 00:16:26 +0000 (UTC) diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h index 027f40b..cc03a0d 100644 --- a/arch/arm/mach-omap2/powerdomain.h +++ b/arch/arm/mach-omap2/powerdomain.h @@ -24,6 +24,8 @@ #include +#include "voltage.h" + /* Powerdomain basic power states */ #define PWRDM_POWER_OFF 0x0 #define PWRDM_POWER_RET 0x1 @@ -78,6 +80,7 @@ struct powerdomain; /** * struct powerdomain - OMAP powerdomain * @name: Powerdomain name + * @voltdm: voltagedomain containing this powerdomain * @omap_chip: represents the OMAP chip types containing this pwrdm * @prcm_offs: the address offset from CM_BASE/PRM_BASE * @prcm_partition: (OMAP4 only) the PRCM partition ID containing @prcm_offs @@ -98,6 +101,10 @@ struct powerdomain; */ struct powerdomain { const char *name; + union { + const char *name; + struct voltagedomain *ptr; + } voltdm; const struct omap_chip_id omap_chip; const s16 prcm_offs; const u8 pwrsts;