Commit ed4bf4f5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/tps65217',... 

Merge remote-tracking branches 'regulator/topic/tps65217', 'regulator/topic/tps65218', 'regulator/topic/tps6586x' and 'regulator/topic/twl' into regulator-next
parents f71f2627 6bdaaf0e ce26db08 2628b100 cd01e32d

Documentation/devicetree/bindings/regulator/tps65218.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
TPS65218 family of regulators



Required properties:

For tps65218 regulators/LDOs

- compatible:

  - "ti,tps65218-dcdc1" for DCDC1

  - "ti,tps65218-dcdc2" for DCDC2

  - "ti,tps65218-dcdc3" for DCDC3

  - "ti,tps65218-dcdc4" for DCDC4

  - "ti,tps65218-dcdc5" for DCDC5

  - "ti,tps65218-dcdc6" for DCDC6

  - "ti,tps65218-ldo1" for LDO1



Optional properties:

- Any optional property defined in bindings/regulator/regulator.txt



Example:



	xyz: regulator@0 {

		compatible = "ti,tps65218-dcdc1";

		regulator-min-microvolt  = <1000000>;

		regulator-max-microvolt  = <3000000>;

	};

drivers/regulator/tps65217-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static const struct regulator_linear_range tps65217_uv2_ranges[] = { 
static int tps65217_pmic_enable(struct regulator_dev *dev)

{

	struct tps65217 *tps = rdev_get_drvdata(dev);

	unsigned int rid = rdev_get_id(dev);

	int rid = rdev_get_id(dev);



	if (rid < TPS65217_DCDC_1 || rid > TPS65217_LDO_4)

		return -EINVAL;
@@ -82,7 +82,7 @@ static int tps65217_pmic_enable(struct regulator_dev *dev) 
static int tps65217_pmic_disable(struct regulator_dev *dev)

{

	struct tps65217 *tps = rdev_get_drvdata(dev);

	unsigned int rid = rdev_get_id(dev);

	int rid = rdev_get_id(dev);



	if (rid < TPS65217_DCDC_1 || rid > TPS65217_LDO_4)

		return -EINVAL;

drivers/regulator/tps65218-regulator.c

+25 −25
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 


enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, DCDC6, LDO1 };



#define TPS65218_REGULATOR(_name, _id, _ops, _n, _vr, _vm, _er, _em, _t, \

			    _lr, _nlr, _delay)			\

#define TPS65218_REGULATOR(_name, _id, _ops, _n, _vr, _vm, _er, _em, \

			    _lr, _nlr, _delay, _fuv)		\

	{							\

		.name			= _name,		\

		.id			= _id,			\
@@ -42,14 +42,15 @@ enum tps65218_regulators { DCDC1, DCDC2, DCDC3, DCDC4, DCDC5, DCDC6, LDO1 }; 
		.vsel_mask		= _vm,			\

		.enable_reg		= _er,			\

		.enable_mask		= _em,			\

		.volt_table		= _t,			\

		.volt_table		= NULL,			\

		.linear_ranges		= _lr,			\

		.n_linear_ranges	= _nlr,			\

		.ramp_delay		= _delay,		\

		.fixed_uV		= _fuv			\

	}							\



#define TPS65218_INFO(_id, _nm, _min, _max)	\

	{						\

	[_id] = {					\

		.id		= _id,			\

		.name		= _nm,			\

		.min_uV		= _min,			\
@@ -72,13 +73,13 @@ static const struct regulator_linear_range dcdc4_ranges[] = { 
};



static struct tps_info tps65218_pmic_regs[] = {

	TPS65218_INFO(0, "DCDC1", 850000, 167500),

	TPS65218_INFO(1, "DCDC2", 850000, 1675000),

	TPS65218_INFO(2, "DCDC3", 900000, 3400000),

	TPS65218_INFO(3, "DCDC4", 1175000, 3400000),

	TPS65218_INFO(4, "DCDC5", 1000000, 1000000),

	TPS65218_INFO(5, "DCDC6", 1800000, 1800000),

	TPS65218_INFO(6, "LDO1", 900000, 3400000),

	TPS65218_INFO(DCDC1, "DCDC1", 850000, 167500),

	TPS65218_INFO(DCDC2, "DCDC2", 850000, 1675000),

	TPS65218_INFO(DCDC3, "DCDC3", 900000, 3400000),

	TPS65218_INFO(DCDC4, "DCDC4", 1175000, 3400000),

	TPS65218_INFO(DCDC5, "DCDC5", 1000000, 1000000),

	TPS65218_INFO(DCDC6, "DCDC6", 1800000, 1800000),

	TPS65218_INFO(LDO1, "LDO1", 900000, 3400000),

};



#define TPS65218_OF_MATCH(comp, label) \
@@ -127,7 +128,7 @@ static int tps65218_pmic_set_voltage_sel(struct regulator_dev *dev, 
static int tps65218_pmic_enable(struct regulator_dev *dev)

{

	struct tps65218 *tps = rdev_get_drvdata(dev);

	unsigned int rid = rdev_get_id(dev);

	int rid = rdev_get_id(dev);



	if (rid < TPS65218_DCDC_1 || rid > TPS65218_LDO_1)

		return -EINVAL;
@@ -141,7 +142,7 @@ static int tps65218_pmic_enable(struct regulator_dev *dev) 
static int tps65218_pmic_disable(struct regulator_dev *dev)

{

	struct tps65218 *tps = rdev_get_drvdata(dev);

	unsigned int rid = rdev_get_id(dev);

	int rid = rdev_get_id(dev);



	if (rid < TPS65218_DCDC_1 || rid > TPS65218_LDO_1)

		return -EINVAL;
@@ -185,34 +186,33 @@ static const struct regulator_desc regulators[] = { 
	TPS65218_REGULATOR("DCDC1", TPS65218_DCDC_1, tps65218_dcdc12_ops, 64,

			   TPS65218_REG_CONTROL_DCDC1,

			   TPS65218_CONTROL_DCDC1_MASK,

			   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC1_EN, NULL,

			   dcdc1_dcdc2_ranges, 2, 4000),

			   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC1_EN,

			   dcdc1_dcdc2_ranges, 2, 4000, 0),

	TPS65218_REGULATOR("DCDC2", TPS65218_DCDC_2, tps65218_dcdc12_ops, 64,

			   TPS65218_REG_CONTROL_DCDC2,

			   TPS65218_CONTROL_DCDC2_MASK,

			   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC2_EN, NULL,

			   dcdc1_dcdc2_ranges, 2, 4000),

			   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC2_EN,

			   dcdc1_dcdc2_ranges, 2, 4000, 0),

	TPS65218_REGULATOR("DCDC3", TPS65218_DCDC_3, tps65218_ldo1_dcdc34_ops,

			   64, TPS65218_REG_CONTROL_DCDC3,

			   TPS65218_CONTROL_DCDC3_MASK, TPS65218_REG_ENABLE1,

			   TPS65218_ENABLE1_DC3_EN, NULL,

			   ldo1_dcdc3_ranges, 2, 0),

			   TPS65218_ENABLE1_DC3_EN, ldo1_dcdc3_ranges, 2, 0, 0),

	TPS65218_REGULATOR("DCDC4", TPS65218_DCDC_4, tps65218_ldo1_dcdc34_ops,

			   53, TPS65218_REG_CONTROL_DCDC4,

			   TPS65218_CONTROL_DCDC4_MASK,

			   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC4_EN, NULL,

			   dcdc4_ranges, 2, 0),

			   TPS65218_REG_ENABLE1, TPS65218_ENABLE1_DC4_EN,

			   dcdc4_ranges, 2, 0, 0),

	TPS65218_REGULATOR("DCDC5", TPS65218_DCDC_5, tps65218_dcdc56_pmic_ops,

			   1, -1, -1, TPS65218_REG_ENABLE1,

			   TPS65218_ENABLE1_DC5_EN, NULL, NULL, 0, 0),

			   TPS65218_ENABLE1_DC5_EN, NULL, 0, 0, 1000000),

	TPS65218_REGULATOR("DCDC6", TPS65218_DCDC_6, tps65218_dcdc56_pmic_ops,

			   1, -1, -1, TPS65218_REG_ENABLE1,

			   TPS65218_ENABLE1_DC6_EN, NULL, NULL, 0, 0),

			   TPS65218_ENABLE1_DC6_EN, NULL, 0, 0, 1800000),

	TPS65218_REGULATOR("LDO1", TPS65218_LDO_1, tps65218_ldo1_dcdc34_ops, 64,

			   TPS65218_REG_CONTROL_LDO1,

			   TPS65218_CONTROL_LDO1_MASK, TPS65218_REG_ENABLE2,

			   TPS65218_ENABLE2_LDO1_EN, NULL, ldo1_dcdc3_ranges,

			   2, 0),

			   TPS65218_ENABLE2_LDO1_EN, ldo1_dcdc3_ranges,

			   2, 0, 0),

};



static int tps65218_regulator_probe(struct platform_device *pdev)

drivers/regulator/tps6586x-regulator.c

+68 −61
Original line number Diff line number Diff line
@@ -74,6 +74,16 @@ static struct regulator_ops tps6586x_rw_regulator_ops = { 
	.disable = regulator_disable_regmap,

};



static struct regulator_ops tps6586x_rw_linear_regulator_ops = {

	.list_voltage = regulator_list_voltage_linear,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,



	.is_enabled = regulator_is_enabled_regmap,

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

};



static struct regulator_ops tps6586x_ro_regulator_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,
@@ -91,48 +101,11 @@ static const unsigned int tps6586x_ldo0_voltages[] = { 
	1200000, 1500000, 1800000, 2500000, 2700000, 2850000, 3100000, 3300000,

};



static const unsigned int tps6586x_ldo4_voltages[] = {

	1700000, 1725000, 1750000, 1775000, 1800000, 1825000, 1850000, 1875000,

	1900000, 1925000, 1950000, 1975000, 2000000, 2025000, 2050000, 2075000,

	2100000, 2125000, 2150000, 2175000, 2200000, 2225000, 2250000, 2275000,

	2300000, 2325000, 2350000, 2375000, 2400000, 2425000, 2450000, 2475000,

};



#define tps658623_sm2_voltages tps6586x_ldo4_voltages



static const unsigned int tps6586x_ldo_voltages[] = {

	1250000, 1500000, 1800000, 2500000, 2700000, 2850000, 3100000, 3300000,

};



static const unsigned int tps6586x_sm2_voltages[] = {

	3000000, 3050000, 3100000, 3150000, 3200000, 3250000, 3300000, 3350000,

	3400000, 3450000, 3500000, 3550000, 3600000, 3650000, 3700000, 3750000,

	3800000, 3850000, 3900000, 3950000, 4000000, 4050000, 4100000, 4150000,

	4200000, 4250000, 4300000, 4350000, 4400000, 4450000, 4500000, 4550000,

};



static int tps658640_sm2_voltages[] = {

	2150000, 2200000, 2250000, 2300000, 2350000, 2400000, 2450000, 2500000,

	2550000, 2600000, 2650000, 2700000, 2750000, 2800000, 2850000, 2900000,

	2950000, 3000000, 3050000, 3100000, 3150000, 3200000, 3250000, 3300000,

	3350000, 3400000, 3450000, 3500000, 3550000, 3600000, 3650000, 3700000,

};



static const unsigned int tps658643_sm2_voltages[] = {

	1025000, 1050000, 1075000, 1100000, 1125000, 1150000, 1175000, 1200000,

	1225000, 1250000, 1275000, 1300000, 1325000, 1350000, 1375000, 1400000,

	1425000, 1450000, 1475000, 1500000, 1525000, 1550000, 1575000, 1600000,

	1625000, 1650000, 1675000, 1700000, 1725000, 1750000, 1775000, 1800000,

};



static const unsigned int tps6586x_dvm_voltages[] = {

	 725000,  750000,  775000,  800000,  825000,  850000,  875000,  900000,

	 925000,  950000,  975000, 1000000, 1025000, 1050000, 1075000, 1100000,

	1125000, 1150000, 1175000, 1200000, 1225000, 1250000, 1275000, 1300000,

	1325000, 1350000, 1375000, 1400000, 1425000, 1450000, 1475000, 1500000,

};



static int tps658640_rtc_voltages[] = {

static const unsigned int tps658640_rtc_voltages[] = {

	2500000, 2850000, 3100000, 3300000,

};
@@ -159,6 +132,31 @@ static int tps658640_rtc_voltages[] = { 
	.enable_reg[1]	= TPS6586X_SUPPLY##ereg1,			\

	.enable_bit[1]	= (ebit1),



#define TPS6586X_REGULATOR_LINEAR(_id, _ops, _pin_name, n_volt, min_uv,	\

				  uv_step, vreg, shift, nbits, ereg0,	\

				  ebit0, ereg1, ebit1, goreg, gobit)	\

	.desc	= {							\

		.supply_name = _pin_name,				\

		.name	= "REG-" #_id,					\

		.ops	= &tps6586x_## _ops ## _regulator_ops,		\

		.type	= REGULATOR_VOLTAGE,				\

		.id	= TPS6586X_ID_##_id,				\

		.n_voltages = n_volt,					\

		.min_uV = min_uv,					\

		.uV_step = uv_step,					\

		.owner	= THIS_MODULE,					\

		.enable_reg = TPS6586X_SUPPLY##ereg0,			\

		.enable_mask = 1 << (ebit0),				\

		.vsel_reg = TPS6586X_##vreg,				\

		.vsel_mask = ((1 << (nbits)) - 1) << (shift),		\

		.apply_reg = (goreg),				\

		.apply_bit = (gobit),				\

	},								\

	.enable_reg[0]	= TPS6586X_SUPPLY##ereg0,			\

	.enable_bit[0]	= (ebit0),					\

	.enable_reg[1]	= TPS6586X_SUPPLY##ereg1,			\

	.enable_bit[1]	= (ebit1),



#define TPS6586X_LDO(_id, _pname, vdata, vreg, shift, nbits,		\

		     ereg0, ebit0, ereg1, ebit1)			\

{									\
@@ -166,6 +164,14 @@ static int tps658640_rtc_voltages[] = { 
			   ereg0, ebit0, ereg1, ebit1, 0, 0)		\

}



#define TPS6586X_LDO_LINEAR(_id, _pname, n_volt, min_uv, uv_step, vreg,	\

			    shift, nbits, ereg0, ebit0, ereg1, ebit1)	\

{									\

	TPS6586X_REGULATOR_LINEAR(_id, rw_linear, _pname, n_volt,	\

				  min_uv, uv_step, vreg, shift, nbits,	\

				  ereg0, ebit0, ereg1, ebit1, 0, 0)	\

}



#define TPS6586X_FIXED_LDO(_id, _pname, vdata, vreg, shift, nbits,	\

			  ereg0, ebit0, ereg1, ebit1)			\

{									\
@@ -173,11 +179,13 @@ static int tps658640_rtc_voltages[] = { 
			   ereg0, ebit0, ereg1, ebit1, 0, 0)		\

}



#define TPS6586X_DVM(_id, _pname, vdata, vreg, shift, nbits,		\

		     ereg0, ebit0, ereg1, ebit1, goreg, gobit)		\

#define TPS6586X_DVM(_id, _pname, n_volt, min_uv, uv_step, vreg, shift,	\

		     nbits, ereg0, ebit0, ereg1, ebit1, goreg, gobit)	\

{									\

	TPS6586X_REGULATOR(_id, rw, _pname, vdata, vreg, shift, nbits,	\

			   ereg0, ebit0, ereg1, ebit1, goreg, gobit)	\

	TPS6586X_REGULATOR_LINEAR(_id, rw_linear, _pname, n_volt,	\

				  min_uv, uv_step, vreg, shift, nbits,	\

				  ereg0, ebit0, ereg1, ebit1, goreg,	\

				  gobit)				\

}



#define TPS6586X_SYS_REGULATOR()					\
@@ -210,24 +218,23 @@ static struct tps6586x_regulator tps6586x_regulator[] = { 
					ENE, 7),

	TPS6586X_LDO(LDO_RTC, "REG-SYS", tps6586x_ldo, SUPPLYV4, 3, 3, V4, 7,

					V4, 7),

	TPS6586X_LDO(LDO_1, "vinldo01", tps6586x_dvm, SUPPLYV1, 0, 5, ENC, 1,

					END, 1),

	TPS6586X_LDO(SM_2, "vin-sm2", tps6586x_sm2, SUPPLYV2, 0, 5, ENC, 7,

					END, 7),



	TPS6586X_DVM(LDO_2, "vinldo23", tps6586x_dvm, LDO2BV1, 0, 5, ENA, 3,

					ENB, 3, TPS6586X_VCC2, BIT(6)),

	TPS6586X_DVM(LDO_4, "vinldo4", tps6586x_ldo4, LDO4V1, 0, 5, ENC, 3,

					END, 3, TPS6586X_VCC1, BIT(6)),

	TPS6586X_DVM(SM_0, "vin-sm0", tps6586x_dvm, SM0V1, 0, 5, ENA, 1,

					ENB, 1, TPS6586X_VCC1, BIT(2)),

	TPS6586X_DVM(SM_1, "vin-sm1", tps6586x_dvm, SM1V1, 0, 5, ENA, 0,

					ENB, 0, TPS6586X_VCC1, BIT(0)),

	TPS6586X_LDO_LINEAR(LDO_1, "vinldo01", 32, 725000, 25000, SUPPLYV1,

			    0, 5, ENC, 1, END, 1),

	TPS6586X_LDO_LINEAR(SM_2, "vin-sm2", 32, 3000000, 50000, SUPPLYV2,

			    0, 5, ENC, 7, END, 7),

	TPS6586X_DVM(LDO_2, "vinldo23", 32, 725000, 25000, LDO2BV1, 0, 5,

		     ENA, 3, ENB, 3, TPS6586X_VCC2, BIT(6)),

	TPS6586X_DVM(LDO_4, "vinldo4", 32, 1700000, 25000, LDO4V1, 0, 5,

		     ENC, 3, END, 3, TPS6586X_VCC1, BIT(6)),

	TPS6586X_DVM(SM_0, "vin-sm0", 32, 725000, 25000, SM0V1, 0, 5,

		     ENA, 1, ENB, 1, TPS6586X_VCC1, BIT(2)),

	TPS6586X_DVM(SM_1, "vin-sm1", 32, 725000, 25000, SM1V1, 0, 5,

		     ENA, 0, ENB, 0, TPS6586X_VCC1, BIT(0)),

};



static struct tps6586x_regulator tps658623_regulator[] = {

	TPS6586X_LDO(SM_2, "vin-sm2", tps658623_sm2, SUPPLYV2, 0, 5, ENC, 7,

					END, 7),

	TPS6586X_LDO_LINEAR(SM_2, "vin-sm2", 32, 1700000, 25000, SUPPLYV2,

			    0, 5, ENC, 7, END, 7),

};



static struct tps6586x_regulator tps658640_regulator[] = {
@@ -243,16 +250,16 @@ static struct tps6586x_regulator tps658640_regulator[] = { 
					ENC, 6, END, 6),

	TPS6586X_LDO(LDO_9, "vinldo9", tps6586x_ldo0, SUPPLYV6, 3, 3,

					ENE, 7, ENE, 7),

	TPS6586X_LDO(SM_2, "vin-sm2", tps658640_sm2, SUPPLYV2, 0, 5,

					ENC, 7, END, 7),

	TPS6586X_LDO_LINEAR(SM_2, "vin-sm2", 32, 2150000, 50000, SUPPLYV2,

			    0, 5, ENC, 7, END, 7),



	TPS6586X_FIXED_LDO(LDO_RTC, "REG-SYS", tps658640_rtc, SUPPLYV4, 3, 2,

					V4, 7, V4, 7),

};



static struct tps6586x_regulator tps658643_regulator[] = {

	TPS6586X_LDO(SM_2, "vin-sm2", tps658643_sm2, SUPPLYV2, 0, 5, ENC, 7,

					END, 7),

	TPS6586X_LDO_LINEAR(SM_2, "vin-sm2", 32, 1025000, 25000, SUPPLYV2,

			    0, 5, ENC, 7, END, 7),

};



/*

drivers/regulator/twl-regulator.c

+1 −12
Original line number Diff line number Diff line
@@ -1128,7 +1128,7 @@ static int twlreg_probe(struct platform_device *pdev) 
	if (!initdata)

		return -EINVAL;



	info = kmemdup(template, sizeof(*info), GFP_KERNEL);

	info = devm_kmemdup(&pdev->dev, template, sizeof(*info), GFP_KERNEL);

	if (!info)

		return -ENOMEM;
@@ -1192,7 +1192,6 @@ static int twlreg_probe(struct platform_device *pdev) 
	if (IS_ERR(rdev)) {

		dev_err(&pdev->dev, "can't register %s, %ld\n",

				info->desc.name, PTR_ERR(rdev));

		kfree(info);

		return PTR_ERR(rdev);

	}

	platform_set_drvdata(pdev, rdev);
@@ -1212,20 +1211,10 @@ static int twlreg_probe(struct platform_device *pdev) 
	return 0;

}



static int twlreg_remove(struct platform_device *pdev)

{

	struct regulator_dev *rdev = platform_get_drvdata(pdev);

	struct twlreg_info *info = rdev->reg_data;



	kfree(info);

	return 0;

}



MODULE_ALIAS("platform:twl_reg");



static struct platform_driver twlreg_driver = {

	.probe		= twlreg_probe,

	.remove		= twlreg_remove,

	/* NOTE: short name, to work around driver model truncation of

	 * "twl_regulator.12" (and friends) to "twl_regulator.1".

	 */