diff options
| author | Ann Thornton <Ann.Thornton@freescale.com> | 2009-04-08 12:15:49 -0500 |
|---|---|---|
| committer | Ann Thornton <Ann.Thornton@freescale.com> | 2009-04-08 12:25:47 -0500 |
| commit | 2a06efa81125dfa2d6602e280abc5de60007d8ae (patch) | |
| tree | fca2dac53911ddab1cb391f49c30c5fdfd06c004 /include | |
| parent | af166826e8d7a494ce384d213776928ce2732cf2 (diff) | |
ENGR00110536-1 Made files less regulator specific. Added some error checking.
The structure pmic_platform_data is used to specify the init function instead of
conditional compilations. pmic_alloc_data is added instead of regulator
specific initialization. Checks are made before getting and enabling regulators.
Signed-off-by: Ann Thornton <Ann.Thornton@freescale.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pmic_external.h | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/include/linux/pmic_external.h b/include/linux/pmic_external.h index 8b2c7af7e146..96d61b740666 100644 --- a/include/linux/pmic_external.h +++ b/include/linux/pmic_external.h @@ -1096,39 +1096,13 @@ PMIC_STATUS pmic_get_sensors(t_sensor_bits * sensor_bits); void pmic_event_callback(type_event event); void pmic_event_list_init(void); -#ifdef CONFIG_REGULATOR_MC13783 -/*! - * This function is used to initialize the regulator for MC13783. - * - * @return Returns 0. - */ -int reg_mc13783_probe(struct device *dev); -#else -static inline int reg_mc13783_probe(struct device *dev) -{ - return 0; -}; -#endif - -#ifdef CONFIG_REGULATOR_MC13892 -int mc13892_regulator_i2c_init(struct i2c_client *client); -#else -static inline int mc13892_regulator_i2c_init(struct i2c_client *client) -{ - return 0; -}; -#endif - -#ifdef CONFIG_REGULATOR_MC34704 -int reg_mc34704_probe(void); -#else -static inline int reg_mc34704_probe(void) -{ - return 0; -}; -#endif #endif /*CONFIG_MXC_PMIC*/ #endif /* __KERNEL__ */ /* CONFIG_MXC_PMIC_MC13783 || CONFIG_MXC_PMIC_MC9SDZ60 */ +struct pmic_platform_data { + int (*init)(void *); + int power_key_irq; +}; + #endif /* __ASM_ARCH_MXC_PMIC_EXTERNAL_H__ */ |