Merge branch 'omap/pm-voltdomain-cleanup' into next/soc
Conflicts: arch/arm/mach-omap2/Makefile arch/arm/mach-omap2/io.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -166,6 +166,7 @@ struct powerdomain {
|
||||
* @pwrdm_disable_hdwr_sar: Disable Hardware Save-Restore feature for a pd
|
||||
* @pwrdm_set_lowpwrstchange: Enable pd transitions from a shallow to deep sleep
|
||||
* @pwrdm_wait_transition: Wait for a pd state transition to complete
|
||||
* @pwrdm_has_voltdm: Check if a voltdm association is needed
|
||||
*
|
||||
* Regarding @pwrdm_set_lowpwrstchange: On the OMAP2 and 3-family
|
||||
* chips, a powerdomain's power state is not allowed to directly
|
||||
@@ -196,6 +197,7 @@ struct pwrdm_ops {
|
||||
int (*pwrdm_disable_hdwr_sar)(struct powerdomain *pwrdm);
|
||||
int (*pwrdm_set_lowpwrstchange)(struct powerdomain *pwrdm);
|
||||
int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
|
||||
int (*pwrdm_has_voltdm)(void);
|
||||
};
|
||||
|
||||
int pwrdm_register_platform_funcs(struct pwrdm_ops *custom_funcs);
|
||||
|
Reference in New Issue
Block a user