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

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

Merge remote-tracking branches 'regulator/topic/88pm800',... 

Merge remote-tracking branches 'regulator/topic/88pm800', 'regulator/topic/88pm8607', 'regulator/topic/aat2870', 'regulator/topic/act8865', 'regulator/topic/anatop', 'regulator/topic/arizona', 'regulator/topic/as3711' and 'regulator/topic/as3722' into regulator-next
parents 29dbdcf3 001f004b e54f19bf 08d6da29 fb8eb454 114c5748 a35ff286 31833581 ba40e557

drivers/regulator/88pm800.c

+1 −3
Original line number Diff line number Diff line
@@ -310,10 +310,8 @@ static int pm800_regulator_probe(struct platform_device *pdev) 


	pm800_data = devm_kzalloc(&pdev->dev, sizeof(*pm800_data),

					GFP_KERNEL);

	if (!pm800_data) {

		dev_err(&pdev->dev, "Failed to allocate pm800_regualtors");

	if (!pm800_data)

		return -ENOMEM;

	}



	pm800_data->map = chip->subchip->regmap_power;

	pm800_data->chip = chip;

drivers/regulator/88pm8607.c

+4 −4
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int pm8607_regulator_dt_init(struct platform_device *pdev, 
	nproot = of_node_get(pdev->dev.parent->of_node);

	if (!nproot)

		return -ENODEV;

	nproot = of_find_node_by_name(nproot, "regulators");

	nproot = of_get_child_by_name(nproot, "regulators");

	if (!nproot) {

		dev_err(&pdev->dev, "failed to find regulators node\n");

		return -ENODEV;

drivers/regulator/aat2870-regulator.c

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ static int aat2870_ldo_is_enabled(struct regulator_dev *rdev) 


static struct regulator_ops aat2870_ldo_ops = {

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.set_voltage_sel = aat2870_ldo_set_voltage_sel,

	.get_voltage_sel = aat2870_ldo_get_voltage_sel,

	.enable = aat2870_ldo_enable,

drivers/regulator/act8865-regulator.c

+8 −13
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ 
#define	ACT8865_VOLTAGE_NUM	64



struct act8865 {

	struct regulator_dev *rdev[ACT8865_REG_NUM];

	struct regmap *regmap;

};
@@ -213,7 +212,7 @@ static int act8865_pdata_from_dt(struct device *dev, 
	struct device_node *np;

	struct act8865_regulator_data *regulator;



	np = of_find_node_by_name(dev->of_node, "regulators");

	np = of_get_child_by_name(dev->of_node, "regulators");

	if (!np) {

		dev_err(dev, "missing 'regulators' subnode in DT\n");

		return -EINVAL;
@@ -221,17 +220,15 @@ static int act8865_pdata_from_dt(struct device *dev, 


	matched = of_regulator_match(dev, np,

				act8865_matches, ARRAY_SIZE(act8865_matches));

	of_node_put(np);

	if (matched <= 0)

		return matched;



	pdata->regulators = devm_kzalloc(dev,

				sizeof(struct act8865_regulator_data) *

				ARRAY_SIZE(act8865_matches), GFP_KERNEL);

	if (!pdata->regulators) {

		dev_err(dev, "%s: failed to allocate act8865 registor\n",

						__func__);

	if (!pdata->regulators)

		return -ENOMEM;

	}



	pdata->num_regulators = matched;

	regulator = pdata->regulators;
@@ -258,7 +255,7 @@ static inline int act8865_pdata_from_dt(struct device *dev, 
static int act8865_pmic_probe(struct i2c_client *client,

			   const struct i2c_device_id *i2c_id)

{

	struct regulator_dev **rdev;

	struct regulator_dev *rdev;

	struct device *dev = &client->dev;

	struct act8865_platform_data *pdata = dev_get_platdata(dev);

	struct regulator_config config = { };
@@ -292,8 +289,6 @@ static int act8865_pmic_probe(struct i2c_client *client, 
	if (!act8865)

		return -ENOMEM;



	rdev = act8865->rdev;



	act8865->regmap = devm_regmap_init_i2c(client, &act8865_regmap_config);

	if (IS_ERR(act8865->regmap)) {

		error = PTR_ERR(act8865->regmap);
@@ -313,12 +308,12 @@ static int act8865_pmic_probe(struct i2c_client *client, 
		config.driver_data = act8865;

		config.regmap = act8865->regmap;



		rdev[i] = devm_regulator_register(&client->dev,

						&act8865_reg[i], &config);

		if (IS_ERR(rdev[i])) {

		rdev = devm_regulator_register(&client->dev, &act8865_reg[i],

					       &config);

		if (IS_ERR(rdev)) {

			dev_err(dev, "failed to register %s\n",

				act8865_reg[id].name);

			return PTR_ERR(rdev[i]);

			return PTR_ERR(rdev);

		}

	}

drivers/regulator/anatop-regulator.c

+107 −17
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 
#define LDO_RAMP_UP_UNIT_IN_CYCLES      64 /* 64 cycles per step */

#define LDO_RAMP_UP_FREQ_IN_MHZ         24 /* cycle based on 24M OSC */



#define LDO_POWER_GATE			0x00

#define LDO_FET_FULL_ON			0x1f



struct anatop_regulator {

	const char *name;

	u32 control_reg;
@@ -48,19 +51,10 @@ struct anatop_regulator { 
	int max_voltage;

	struct regulator_desc rdesc;

	struct regulator_init_data *initdata;

	bool bypass;

	int sel;

};



static int anatop_regmap_set_voltage_sel(struct regulator_dev *reg,

					unsigned selector)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);



	if (!anatop_reg->control_reg)

		return -ENOTSUPP;



	return regulator_set_voltage_sel_regmap(reg, selector);

}



static int anatop_regmap_set_voltage_time_sel(struct regulator_dev *reg,

	unsigned int old_sel,

	unsigned int new_sel)
@@ -87,22 +81,99 @@ static int anatop_regmap_set_voltage_time_sel(struct regulator_dev *reg, 
	return ret;

}



static int anatop_regmap_get_voltage_sel(struct regulator_dev *reg)

static int anatop_regmap_enable(struct regulator_dev *reg)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);

	int sel;



	sel = anatop_reg->bypass ? LDO_FET_FULL_ON : anatop_reg->sel;

	return regulator_set_voltage_sel_regmap(reg, sel);

}



static int anatop_regmap_disable(struct regulator_dev *reg)

{

	return regulator_set_voltage_sel_regmap(reg, LDO_POWER_GATE);

}



static int anatop_regmap_is_enabled(struct regulator_dev *reg)

{

	return regulator_get_voltage_sel_regmap(reg) != LDO_POWER_GATE;

}



static int anatop_regmap_core_set_voltage_sel(struct regulator_dev *reg,

					      unsigned selector)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);

	int ret;



	if (anatop_reg->bypass || !anatop_regmap_is_enabled(reg)) {

		anatop_reg->sel = selector;

		return 0;

	}



	ret = regulator_set_voltage_sel_regmap(reg, selector);

	if (!ret)

		anatop_reg->sel = selector;

	return ret;

}



static int anatop_regmap_core_get_voltage_sel(struct regulator_dev *reg)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);



	if (!anatop_reg->control_reg)

		return -ENOTSUPP;

	if (anatop_reg->bypass || !anatop_regmap_is_enabled(reg))

		return anatop_reg->sel;



	return regulator_get_voltage_sel_regmap(reg);

}



static int anatop_regmap_get_bypass(struct regulator_dev *reg, bool *enable)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);

	int sel;



	sel = regulator_get_voltage_sel_regmap(reg);

	if (sel == LDO_FET_FULL_ON)

		WARN_ON(!anatop_reg->bypass);

	else if (sel != LDO_POWER_GATE)

		WARN_ON(anatop_reg->bypass);



	*enable = anatop_reg->bypass;

	return 0;

}



static int anatop_regmap_set_bypass(struct regulator_dev *reg, bool enable)

{

	struct anatop_regulator *anatop_reg = rdev_get_drvdata(reg);

	int sel;



	if (enable == anatop_reg->bypass)

		return 0;



	sel = enable ? LDO_FET_FULL_ON : anatop_reg->sel;

	anatop_reg->bypass = enable;



	return regulator_set_voltage_sel_regmap(reg, sel);

}



static struct regulator_ops anatop_rops = {

	.set_voltage_sel = anatop_regmap_set_voltage_sel,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.list_voltage = regulator_list_voltage_linear,

	.map_voltage = regulator_map_voltage_linear,

};



static struct regulator_ops anatop_core_rops = {

	.enable = anatop_regmap_enable,

	.disable = anatop_regmap_disable,

	.is_enabled = anatop_regmap_is_enabled,

	.set_voltage_sel = anatop_regmap_core_set_voltage_sel,

	.set_voltage_time_sel = anatop_regmap_set_voltage_time_sel,

	.get_voltage_sel = anatop_regmap_get_voltage_sel,

	.get_voltage_sel = anatop_regmap_core_get_voltage_sel,

	.list_voltage = regulator_list_voltage_linear,

	.map_voltage = regulator_map_voltage_linear,

	.get_bypass = anatop_regmap_get_bypass,

	.set_bypass = anatop_regmap_set_bypass,

};



static int anatop_regulator_probe(struct platform_device *pdev)
@@ -116,6 +187,7 @@ static int anatop_regulator_probe(struct platform_device *pdev) 
	struct regulator_init_data *initdata;

	struct regulator_config config = { };

	int ret = 0;

	u32 val;



	initdata = of_get_regulator_init_data(dev, np);

	sreg = devm_kzalloc(dev, sizeof(*sreg), GFP_KERNEL);
@@ -125,7 +197,6 @@ static int anatop_regulator_probe(struct platform_device *pdev) 
	sreg->name = of_get_property(np, "regulator-name", NULL);

	rdesc = &sreg->rdesc;

	rdesc->name = sreg->name;

	rdesc->ops = &anatop_rops;

	rdesc->type = REGULATOR_VOLTAGE;

	rdesc->owner = THIS_MODULE;
@@ -197,6 +268,25 @@ static int anatop_regulator_probe(struct platform_device *pdev) 
	config.of_node = pdev->dev.of_node;

	config.regmap = sreg->anatop;



	/* Only core regulators have the ramp up delay configuration. */

	if (sreg->control_reg && sreg->delay_bit_width) {

		rdesc->ops = &anatop_core_rops;



		ret = regmap_read(config.regmap, rdesc->vsel_reg, &val);

		if (ret) {

			dev_err(dev, "failed to read initial state\n");

			return ret;

		}



		sreg->sel = (val & rdesc->vsel_mask) >> sreg->vol_bit_shift;

		if (sreg->sel == LDO_FET_FULL_ON) {

			sreg->sel = 0;

			sreg->bypass = true;

		}

	} else {

		rdesc->ops = &anatop_rops;

	}



	/* register regulator */

	rdev = devm_regulator_register(dev, rdesc, &config);

	if (IS_ERR(rdev)) {