From 832dc633afe70fa840f93bb6dd6481b47451bb80 Mon Sep 17 00:00:00 2001 From: Kevin Hilman Date: Tue, 9 Jun 2009 09:45:26 -0700 Subject: [PATCH] OMAP3 SRF: Add virt clk nodes for VDD1/VDD2 The patch defines virtual nodes for VDD1 and VDD2 Signed-off-by: Rajendra Nayak Conflicts: arch/arm/mach-omap2/clock34xx.c arch/arm/mach-omap2/clock34xx.h arch/arm/mach-omap2/io.c --- arch/arm/plat-omap/omap-pm-srf.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/plat-omap/omap-pm-srf.c b/arch/arm/plat-omap/omap-pm-srf.c index fb9f743c7b0..43ad1bc3c5e 100644 --- a/arch/arm/plat-omap/omap-pm-srf.c +++ b/arch/arm/plat-omap/omap-pm-srf.c @@ -27,9 +27,9 @@ #include #include -static struct omap_opp *dsp_opps; -static struct omap_opp *mpu_opps; -static struct omap_opp *l3_opps; +struct omap_opp *dsp_opps; +struct omap_opp *mpu_opps; +struct omap_opp *l3_opps; #define LAT_RES_POSTAMBLE "_latency" #define MAX_LATENCY_RES_NAME 30 @@ -340,19 +340,19 @@ void omap_pm_pwrdm_inactive(struct powerdomain *pwrdm) * Should be called before clk framework since clk fw will call * omap_pm_pwrdm_{in,}active() */ -int __init omap_pm_if_early_init(void) +int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table, + struct omap_opp *dsp_opp_table, + struct omap_opp *l3_opp_table) { + mpu_opps = mpu_opp_table; + dsp_opps = dsp_opp_table; + l3_opps = l3_opp_table; return 0; } /* Must be called after clock framework is initialized */ -int __init omap_pm_if_init(struct omap_opp *mpu_opp_table, - struct omap_opp *dsp_opp_table, - struct omap_opp *l3_opp_table) +int __init omap_pm_if_init(void) { - mpu_opps = mpu_opp_table; - dsp_opps = dsp_opp_table; - l3_opps = l3_opp_table; resource_init(resources_omap); return 0; } -- 2.11.4.GIT