From ac5311e98e80b17397b23fe1337abcded95d1c60 Mon Sep 17 00:00:00 2001 From: Thara Gopinath Date: Wed, 18 Aug 2010 16:21:58 +0530 Subject: [PATCH] --- yaml --- r: 226659 b: refs/heads/master c: 3b92408c7dfeb918fdd2f9fadc73177a59ad621c h: refs/heads/master i: 226657: ea3da369493e127200006b21ab820c848c23f2e4 226655: d15b385084ef6e7a422208aa846f9c0814093840 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3d009b540ef2..7867c94a8e69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f34ce81b8c05c900e45bd88595cc154f7bb5957 +refs/heads/master: 3b92408c7dfeb918fdd2f9fadc73177a59ad621c diff --git a/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h b/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h index 2825b456da0e..b219a88cac2c 100644 --- a/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h +++ b/trunk/arch/arm/plat-omap/include/plat/omap_hwmod.h @@ -34,6 +34,7 @@ #include #include #include +#include struct omap_device; @@ -452,6 +453,8 @@ struct omap_hwmod_class { * @main_clk: main clock: OMAP clock name * @_clk: pointer to the main struct clk (filled in at runtime) * @opt_clks: other device clocks that drivers can request (0..*) + * @vdd_name: voltage domain name + * @voltdm: pointer to voltage domain (filled in at runtime) * @masters: ptr to array of OCP ifs that this hwmod can initiate on * @slaves: ptr to array of OCP ifs that this hwmod can respond on * @dev_attr: arbitrary device attributes that can be passed to the driver @@ -494,6 +497,8 @@ struct omap_hwmod { const char *main_clk; struct clk *_clk; struct omap_hwmod_opt_clk *opt_clks; + char *vdd_name; + struct voltagedomain *voltdm; struct omap_hwmod_ocp_if **masters; /* connect to *_IA */ struct omap_hwmod_ocp_if **slaves; /* connect to *_TA */ void *dev_attr;