linux-next: manual merge of the regulator tree with the mfd tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the regulator tree got a conflict in
include/linux/mfd/tps65090.h between commit 3863db3e800c ("mfd: tps65090:
Remove unused member of struct tps65090") from the mfd tree and commit
24282a1ca33b ("regulator: tps65090: Register all regulators in single
probe call") from the regulator tree.

I fixed it up (I think - see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc include/linux/mfd/tps65090.h
index 4bbbb13,804e280..0000000
--- a/include/linux/mfd/tps65090.h
+++ b/include/linux/mfd/tps65090.h
@@@ -23,35 -23,63 +23,70 @@@
  #define __LINUX_MFD_TPS65090_H
  
  #include <linux/irq.h>
 +#include <linux/regmap.h>
 +
 +/* TPS65090 IRQs */
 +enum {
 +	TPS65090_IRQ_VAC_STATUS_CHANGE,
 +	TPS65090_IRQ_VSYS_STATUS_CHANGE,
 +	TPS65090_IRQ_BAT_STATUS_CHANGE,
 +	TPS65090_IRQ_CHARGING_STATUS_CHANGE,
 +	TPS65090_IRQ_CHARGING_COMPLETE,
 +	TPS65090_IRQ_OVERLOAD_DCDC1,
 +	TPS65090_IRQ_OVERLOAD_DCDC2,
 +	TPS65090_IRQ_OVERLOAD_DCDC3,
 +	TPS65090_IRQ_OVERLOAD_FET1,
 +	TPS65090_IRQ_OVERLOAD_FET2,
 +	TPS65090_IRQ_OVERLOAD_FET3,
 +	TPS65090_IRQ_OVERLOAD_FET4,
 +	TPS65090_IRQ_OVERLOAD_FET5,
 +	TPS65090_IRQ_OVERLOAD_FET6,
 +	TPS65090_IRQ_OVERLOAD_FET7,
 +};
  
+ /* TPS65090 Regulator ID */
+ enum {
+ 	TPS65090_REGULATOR_DCDC1,
+ 	TPS65090_REGULATOR_DCDC2,
+ 	TPS65090_REGULATOR_DCDC3,
+ 	TPS65090_REGULATOR_FET1,
+ 	TPS65090_REGULATOR_FET2,
+ 	TPS65090_REGULATOR_FET3,
+ 	TPS65090_REGULATOR_FET4,
+ 	TPS65090_REGULATOR_FET5,
+ 	TPS65090_REGULATOR_FET6,
+ 	TPS65090_REGULATOR_FET7,
+ 	TPS65090_REGULATOR_LDO1,
+ 	TPS65090_REGULATOR_LDO2,
+ 
+ 	/* Last entry for maximum ID */
+ 	TPS65090_REGULATOR_MAX,
+ };
+ 
  struct tps65090 {
 -	struct mutex		lock;
  	struct device		*dev;
 -	struct i2c_client	*client;
  	struct regmap		*rmap;
 -	struct irq_chip		irq_chip;
 -	struct mutex		irq_lock;
 -	int			irq_base;
 -	unsigned int		id;
 -};
 -
 -struct tps65090_subdev_info {
 -	int		id;
 -	const char	*name;
 -	void		*platform_data;
 +	struct regmap_irq_chip_data *irq_data;
  };
  
+ /*
+  * struct tps65090_regulator_plat_data
+  *
+  * @reg_init_data: The regulator init data.
+  * @enable_ext_control: Enable extrenal control or not. Only available for
+  *     DCDC1, DCDC2 and DCDC3.
+  * @gpio: Gpio number if external control is enabled and controlled through
+  *     gpio.
+  */
+ struct tps65090_regulator_plat_data {
+ 	struct regulator_init_data *reg_init_data;
+ 	bool enable_ext_control;
+ 	int gpio;
+ };
+ 
  struct tps65090_platform_data {
  	int irq_base;
 -	int num_subdevs;
 -	struct tps65090_subdev_info *subdevs;
+ 	struct tps65090_regulator_plat_data *reg_pdata[TPS65090_REGULATOR_MAX];
  };
  
  /*

Attachment: pgp00000.pgp
Description: PGP signature