Merge remote-tracking branches 'regulator/topic/da9211', 'regulator/topic/pfuze100' and 'regulator/topic/tps65218' into regulator-next
This commit is contained in:
@@ -245,24 +245,6 @@ enum tps65218_irqs {
|
||||
TPS65218_INVALID4_IRQ,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct tps_info - packages regulator constraints
|
||||
* @id: Id of the regulator
|
||||
* @name: Voltage regulator name
|
||||
* @min_uV: minimum micro volts
|
||||
* @max_uV: minimum micro volts
|
||||
* @strobe: sequencing strobe value for the regulator
|
||||
*
|
||||
* This data is used to check the regualtor voltage limits while setting.
|
||||
*/
|
||||
struct tps_info {
|
||||
int id;
|
||||
const char *name;
|
||||
int min_uV;
|
||||
int max_uV;
|
||||
int strobe;
|
||||
};
|
||||
|
||||
/**
|
||||
* struct tps65218 - tps65218 sub-driver chip access routines
|
||||
*
|
||||
@@ -280,7 +262,6 @@ struct tps65218 {
|
||||
u32 irq_mask;
|
||||
struct regmap_irq_chip_data *irq_data;
|
||||
struct regulator_desc desc[TPS65218_NUM_REGULATOR];
|
||||
struct tps_info *info[TPS65218_NUM_REGULATOR];
|
||||
struct regmap *regmap;
|
||||
u8 *strobes;
|
||||
};
|
||||
|
Reference in New Issue
Block a user