From patchwork Thu Mar 24 00:00:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 657481 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 p2O00CrB020570 for ; Thu, 24 Mar 2011 00:00:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933342Ab1CXAAa (ORCPT ); Wed, 23 Mar 2011 20:00:30 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:49686 "EHLO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933110Ab1CXAA1 (ORCPT ); Wed, 23 Mar 2011 20:00:27 -0400 Received: from source ([209.85.210.170]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKTYqJmhMp4OKlutgC0V/5x7XR7X63Xm5C@postini.com; Wed, 23 Mar 2011 17:00:27 PDT Received: by iyb12 with SMTP id 12so11325411iyb.15 for ; Wed, 23 Mar 2011 17:00:26 -0700 (PDT) Received: by 10.43.60.205 with SMTP id wt13mr11061409icb.253.1300924826400; Wed, 23 Mar 2011 17:00:26 -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 i2sm5580631icv.3.2011.03.23.17.00.25 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2011 17:00:25 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: Paul Walmsely , Benoit Cousson Subject: [PATCH/RFC 08/19] OMAP2+: powerdomain: add voltagedomain to struct powerdomain Date: Wed, 23 Mar 2011 17:00:22 -0700 Message-Id: <1300924833-26745-9-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1300924833-26745-1-git-send-email-khilman@ti.com> References: <1300924833-26745-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, 24 Mar 2011 00:00:30 +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;