diff options
Diffstat (limited to 'arch/arm/plat-omap/include/plat/omap-pm.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/omap-pm.h | 31 | 
1 files changed, 10 insertions, 21 deletions
diff --git a/arch/arm/plat-omap/include/plat/omap-pm.h b/arch/arm/plat-omap/include/plat/omap-pm.h index 728fbb9dd54..62c3fe918ab 100644 --- a/arch/arm/plat-omap/include/plat/omap-pm.h +++ b/arch/arm/plat-omap/include/plat/omap-pm.h @@ -17,27 +17,10 @@  #include <linux/device.h>  #include <linux/cpufreq.h>  #include <linux/clk.h> +#include <linux/opp.h>  #include "powerdomain.h" -/** - * struct omap_opp - clock frequency-to-OPP ID table for DSP, MPU - * @rate: target clock rate - * @opp_id: OPP ID - * @min_vdd: minimum VDD1 voltage (in millivolts) for this OPP - * - * Operating performance point data.  Can vary by OMAP chip and board. - */ -struct omap_opp { -	unsigned long rate; -	u8 opp_id; -	u16 min_vdd; -}; - -extern struct omap_opp *mpu_opps; -extern struct omap_opp *dsp_opps; -extern struct omap_opp *l3_opps; -  /*   * agent_id values for use with omap_pm_set_min_bus_tput():   * @@ -59,9 +42,11 @@ extern struct omap_opp *l3_opps;   * framework starts.  The "_if_" is to avoid name collisions with the   * PM idle-loop code.   */ -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); +#ifdef CONFIG_OMAP_PM_NONE +#define omap_pm_if_early_init() 0 +#else +int __init omap_pm_if_early_init(void); +#endif  /**   * omap_pm_if_init - OMAP PM init code called after clock fw init @@ -69,7 +54,11 @@ int __init omap_pm_if_early_init(struct omap_opp *mpu_opp_table,   * The main initialization code.  OPP tables are passed in here.  The   * "_if_" is to avoid name collisions with the PM idle-loop code.   */ +#ifdef CONFIG_OMAP_PM_NONE +#define omap_pm_if_init() 0 +#else  int __init omap_pm_if_init(void); +#endif  /**   * omap_pm_if_exit - OMAP PM exit code  |