Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9577e8c3 authored by NeilBrown's avatar NeilBrown Committed by Samuel Ortiz
Browse files

mfd: Define all twl-regulator feature flags in one place 



twl-regulator has a collection of feature flags, some defined
in twl-core.c and  one defined in i2c/twl.h.
This is confusing for anyone adding a new feature flag.

So collect them together and place them in twl.h immediately
after the structure in which they are initially set.

Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent cd4209ce

drivers/mfd/twl-core.c

+0 −7
Original line number Diff line number Diff line
@@ -224,13 +224,6 @@ 
#define HIGH_PERF_SQ			(1 << 3)

#define CK32K_LOWPWR_EN			(1 << 7)





/* chip-specific feature flags, for i2c_device_id.driver_data */

#define TWL4030_VAUX2		BIT(0)	/* pre-5030 voltage ranges */

#define TPS_SUBSET		BIT(1)	/* tps659[23]0 have fewer LDOs */

#define TWL5031			BIT(2)  /* twl5031 has different registers */

#define TWL6030_CLASS		BIT(3)	/* TWL6030 class */



/*----------------------------------------------------------------------*/



/* is driver active, bound to a chip? */

include/linux/i2c/twl.h

+6 −2
Original line number Diff line number Diff line
@@ -171,8 +171,6 @@ static inline int twl_class_is_ ##class(void) \ 
TWL_CLASS_IS(4030, TWL4030_CLASS_ID)

TWL_CLASS_IS(6030, TWL6030_CLASS_ID)



#define TWL6025_SUBCLASS	BIT(4)  /* TWL6025 has changed registers */



/*

 * Read and write single 8-bit registers

 */
@@ -746,6 +744,12 @@ struct twl_regulator_driver_data { 
	void		*data;

	unsigned long	features;

};

/* chip-specific feature flags, for twl_regulator_driver_data.features */

#define TWL4030_VAUX2		BIT(0)	/* pre-5030 voltage ranges */

#define TPS_SUBSET		BIT(1)	/* tps659[23]0 have fewer LDOs */

#define TWL5031			BIT(2)  /* twl5031 has different registers */

#define TWL6030_CLASS		BIT(3)	/* TWL6030 class */

#define TWL6025_SUBCLASS	BIT(4)  /* TWL6025 has changed registers */



/*----------------------------------------------------------------------*/