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

Commit c6db1828 authored by Mike Rapoport's avatar Mike Rapoport Committed by Liam Girdwood
Browse files

regulator: da903x: consolidate DA903[045]_DVC macros 



Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 72b86876

drivers/regulator/da903x.c

+17 −49
Original line number Diff line number Diff line
@@ -404,69 +404,25 @@ static struct regulator_ops da9034_regulator_ldo12_ops = { 
	.enable_bit	= (ebit),					\

}



#define DA9030_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \

#define DA903x_DVC(_pmic, _id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \

{									\

	.desc	= {							\

		.name	= #_id,						\

		.ops	= &da9034_regulator_dvc_ops,			\

		.type	= REGULATOR_VOLTAGE,				\

		.id	= DA9030_ID_##_id,				\

		.id	= _pmic##_ID_##_id,				\

		.n_voltages = (step) ? ((max - min) / step + 1) : 1,	\

		.owner	= THIS_MODULE,					\

	},								\

	.min_uV		= (min) * 1000,					\

	.max_uV		= (max) * 1000,					\

	.step_uV	= (step) * 1000,				\

	.vol_reg	= DA9030_##vreg,				\

	.vol_shift	= (0),						\

	.vol_nbits	= (nbits),					\

	.update_reg	= DA9030_##ureg,				\

	.update_bit	= (ubit),					\

	.enable_reg	= DA9030_##ereg,				\

	.enable_bit	= (ebit),					\

}



#define DA9034_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \

{									\

	.desc	= {							\

		.name	= #_id,						\

		.ops	= &da9034_regulator_dvc_ops,			\

		.type	= REGULATOR_VOLTAGE,				\

		.id	= DA9034_ID_##_id,				\

		.n_voltages = (step) ? ((max - min) / step + 1) : 1,	\

		.owner	= THIS_MODULE,					\

	},								\

	.min_uV		= (min) * 1000,					\

	.max_uV		= (max) * 1000,					\

	.step_uV	= (step) * 1000,				\

	.vol_reg	= DA9034_##vreg,				\

	.vol_shift	= (0),						\

	.vol_nbits	= (nbits),					\

	.update_reg	= DA9034_##ureg,				\

	.update_bit	= (ubit),					\

	.enable_reg	= DA9034_##ereg,				\

	.enable_bit	= (ebit),					\

}



#define DA9035_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \

{									\

	.desc	= {							\

		.name	= #_id,						\

		.ops	= &da9034_regulator_dvc_ops,			\

		.type	= REGULATOR_VOLTAGE,				\

		.id	= DA9035_ID_##_id,				\

		.n_voltages = (step) ? ((max - min) / step + 1) : 1,	\

		.owner	= THIS_MODULE,					\

	},								\

	.min_uV		= (min) * 1000,					\

	.max_uV		= (max) * 1000,					\

	.step_uV	= (step) * 1000,				\

	.vol_reg	= DA9035_##vreg,				\

	.vol_reg	= _pmic##_##vreg,				\

	.vol_shift	= (0),						\

	.vol_nbits	= (nbits),					\

	.update_reg	= DA9035_##ureg,				\

	.update_reg	= _pmic##_##ureg,				\

	.update_bit	= (ubit),					\

	.enable_reg	= DA9035_##ereg,				\

	.enable_reg	= _pmic##_##ereg,				\

	.enable_bit	= (ebit),					\

}
@@ -476,6 +432,18 @@ static struct regulator_ops da9034_regulator_ldo12_ops = { 
#define DA9030_LDO(_id, min, max, step, vreg, shift, nbits, ereg, ebit)	\

	DA903x_LDO(DA9030, _id, min, max, step, vreg, shift, nbits, ereg, ebit)



#define DA9030_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \

	DA903x_DVC(DA9030, _id, min, max, step, vreg, nbits, ureg, ubit, \

		   ereg, ebit)



#define DA9034_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \

	DA903x_DVC(DA9034, _id, min, max, step, vreg, nbits, ureg, ubit, \

		   ereg, ebit)



#define DA9035_DVC(_id, min, max, step, vreg, nbits, ureg, ubit, ereg, ebit) \

	DA903x_DVC(DA9035, _id, min, max, step, vreg, nbits, ureg, ubit, \

		   ereg, ebit)



static struct da903x_regulator_info da903x_regulator_info[] = {

	/* DA9030 */

	DA9030_DVC(BUCK2, 850, 1625, 25, BUCK2DVM1, 5, BUCK2DVM1, 7, RCTL11, 0),