diff options
Diffstat (limited to 'include/linux/mfd/88pm80x.h')
| -rw-r--r-- | include/linux/mfd/88pm80x.h | 17 | 
1 files changed, 10 insertions, 7 deletions
| diff --git a/include/linux/mfd/88pm80x.h b/include/linux/mfd/88pm80x.h index e94537befabd..97cb283cc8e1 100644 --- a/include/linux/mfd/88pm80x.h +++ b/include/linux/mfd/88pm80x.h @@ -17,7 +17,6 @@  #include <linux/regmap.h>  #include <linux/atomic.h> -#define PM80X_VERSION_MASK		(0xFF)	/* 80X chip ID mask */  enum {  	CHIP_INVALID = 0,  	CHIP_PM800, @@ -299,8 +298,7 @@ struct pm80x_chip {  	struct regmap *regmap;  	struct regmap_irq_chip *regmap_irq_chip;  	struct regmap_irq_chip_data *irq_data; -	unsigned char version; -	int id; +	int type;  	int irq;  	int irq_mode;  	unsigned long wu_flag; @@ -309,8 +307,14 @@ struct pm80x_chip {  struct pm80x_platform_data {  	struct pm80x_rtc_pdata *rtc; -	unsigned short power_page_addr;	/* power page I2C address */ -	unsigned short gpadc_page_addr;	/* gpadc page I2C address */ +	/* +	 * For the regulator not defined, set regulators[not_defined] to be +	 * NULL. num_regulators are the number of regulators supposed to be +	 * initialized. If all regulators are not defined, set num_regulators +	 * to be 0. +	 */ +	struct regulator_init_data *regulators[PM800_ID_RG_MAX]; +	unsigned int num_regulators;  	int irq_mode;		/* Clear interrupt by read/write(0/1) */  	int batt_det;		/* enable/disable */  	int (*plat_config)(struct pm80x_chip *chip, @@ -363,7 +367,6 @@ static inline int pm80x_dev_resume(struct device *dev)  }  #endif -extern int pm80x_init(struct i2c_client *client, -		      const struct i2c_device_id *id); +extern int pm80x_init(struct i2c_client *client);  extern int pm80x_deinit(void);  #endif /* __LINUX_MFD_88PM80X_H */ |