From patchwork Mon Aug 29 17:35:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 1109452 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7THrWT5008158 for ; Mon, 29 Aug 2011 17:53:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754536Ab1H2Rft (ORCPT ); Mon, 29 Aug 2011 13:35:49 -0400 Received: from na3sys009aog113.obsmtp.com ([74.125.149.209]:38007 "EHLO na3sys009aog113.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754521Ab1H2Rfp (ORCPT ); Mon, 29 Aug 2011 13:35:45 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]) (using TLSv1) by na3sys009aob113.postini.com ([74.125.148.12]) with SMTP ID DSNKTlvN8D6i1p69M+vrhUUzB81rDpjkt8st@postini.com; Mon, 29 Aug 2011 10:35:45 PDT Received: by mail-pz0-f42.google.com with SMTP id 37so10665694pzk.29 for ; Mon, 29 Aug 2011 10:35:44 -0700 (PDT) Received: by 10.143.79.8 with SMTP id g8mr2680463wfl.365.1314639344675; Mon, 29 Aug 2011 10:35:44 -0700 (PDT) Received: from localhost.localdomain (c-24-19-7-36.hsd1.wa.comcast.net. [24.19.7.36]) by mx.google.com with ESMTPS id m1sm19531524pbf.3.2011.08.29.10.35.43 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 29 Aug 2011 10:35:43 -0700 (PDT) From: Kevin Hilman To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org Subject: [PATCH 08/22] OMAP2+: powerdomain: add voltagedomain to struct powerdomain Date: Mon, 29 Aug 2011 10:35:41 -0700 Message-Id: <1314639355-12713-9-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: <1314639355-12713-1-git-send-email-khilman@ti.com> References: <1314639355-12713-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 (demeter2.kernel.org [140.211.167.43]); Mon, 29 Aug 2011 17:53:41 +0000 (UTC) Each powerdomain is associated with a voltage domain. Add an entry to struct powerdomain where the enclosing voltagedomain can be referenced. Modeled after similar relationship between clockdomains and powerdomains. Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/powerdomain.h | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h index d23d979..9ce920d 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;