Unverified Commit 20638181 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "regulator: mp886x: two features and dt json convert" from... 

Merge series "regulator: mp886x: two features and dt json convert" from Jisheng Zhang <jszhang3@mail.ustc.edu.cn>
Jisheng Zhang <Jisheng.Zhang@synaptics.com>:

From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>

This is to improve the mp886x regulator driver support.
patch1 implments .set_ramp_delay
patch2 and patch3 support the switch freq setting
patch4 converts dt binding to json-schema

Since v2:
  - put any schema conversions at the end of the series as Mark
    suggested.

Jisheng Zhang (4):
  regulator: mp886x: implement set_ramp_delay
  dt-bindings: regulator: mp886x: support mps,switch-frequency
  regulator: mp886x: support setting switch freq
  dt-bindings: regulator: Convert mp886x to json-schema

 .../devicetree/bindings/regulator/mp886x.txt  |  27 -----
 .../bindings/regulator/mps,mp886x.yaml        |  58 ++++++++++
 drivers/regulator/mp886x.c                    | 109 +++++++++++++++++-
 3 files changed, 164 insertions(+), 30 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/regulator/mp886x.txt
 create mode 100644 Documentation/devicetree/bindings/regulator/mps,mp886x.yaml

--
2.28.0.rc1
parents 4c13f934 b4b85af0

Documentation/devicetree/bindings/regulator/mp886x.txt

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ Required properties: 
- mps,fb-voltage-divider: An array of two integers containing the resistor

  values R1 and R2 of the feedback voltage divider in kilo ohms.



Optional properties:

- mps,switch-frequency: The valid switch frequency in Hertz. Available values

  are: 500000, 750000, 1000000, 1250000, 1500000



Any property defined as part of the core regulator binding, defined in

./regulator.txt, can also be used.

drivers/regulator/mp886x.c

+106 −3
Original line number Diff line number Diff line
@@ -18,18 +18,70 @@ 
#define  MP886X_V_BOOT		(1 << 7)

#define MP886X_SYSCNTLREG1	0x01

#define  MP886X_MODE		(1 << 0)

#define  MP886X_SLEW_SHIFT	3

#define  MP886X_SLEW_MASK	(0x7 << MP886X_SLEW_SHIFT)

#define  MP886X_GO		(1 << 6)

#define  MP886X_EN		(1 << 7)

#define MP8869_SYSCNTLREG2	0x02



struct mp886x_cfg_info {

	const struct regulator_ops *rops;

	const int slew_rates[8];

	const int switch_freq[4];

	const u8 fs_reg;

	const u8 fs_shift;

};



struct mp886x_device_info {

	struct device *dev;

	struct regulator_desc desc;

	struct regulator_init_data *regulator;

	struct gpio_desc *en_gpio;

	const struct mp886x_cfg_info *ci;

	u32 r[2];

	unsigned int sel;

};



static int mp886x_set_ramp(struct regulator_dev *rdev, int ramp)

{

	struct mp886x_device_info *di = rdev_get_drvdata(rdev);

	const struct mp886x_cfg_info *ci = di->ci;

	int reg = -1, i;



	for (i = 0; i < ARRAY_SIZE(ci->slew_rates); i++) {

		if (ramp <= ci->slew_rates[i])

			reg = i;

		else

			break;

	}



	if (reg < 0) {

		dev_err(di->dev, "unsupported ramp value %d\n", ramp);

		return -EINVAL;

	}



	return regmap_update_bits(rdev->regmap, MP886X_SYSCNTLREG1,

				  MP886X_SLEW_MASK, reg << MP886X_SLEW_SHIFT);

}



static void mp886x_set_switch_freq(struct mp886x_device_info *di,

				   struct regmap *regmap,

				   u32 freq)

{

	const struct mp886x_cfg_info *ci = di->ci;

	int i;



	for (i = 0; i < ARRAY_SIZE(ci->switch_freq); i++) {

		if (freq == ci->switch_freq[i]) {

			regmap_update_bits(regmap, ci->fs_reg,

				  0x3 << ci->fs_shift, i << ci->fs_shift);

			return;

		}

	}



	dev_err(di->dev, "invalid frequency %d\n", freq);

}



static int mp886x_set_mode(struct regulator_dev *rdev, unsigned int mode)

{

	switch (mode) {
@@ -117,6 +169,29 @@ static const struct regulator_ops mp8869_regulator_ops = { 
	.is_enabled = regulator_is_enabled_regmap,

	.set_mode = mp886x_set_mode,

	.get_mode = mp886x_get_mode,

	.set_ramp_delay = mp886x_set_ramp,

};



static const struct mp886x_cfg_info mp8869_ci = {

	.rops = &mp8869_regulator_ops,

	.slew_rates = {

		40000,

		30000,

		20000,

		10000,

		5000,

		2500,

		1250,

		625,

	},

	.switch_freq = {

		500000,

		750000,

		1000000,

		1250000,

	},

	.fs_reg = MP8869_SYSCNTLREG2,

	.fs_shift = 4,

};



static int mp8867_set_voltage_sel(struct regulator_dev *rdev, unsigned int sel)
@@ -173,6 +248,29 @@ static const struct regulator_ops mp8867_regulator_ops = { 
	.is_enabled = regulator_is_enabled_regmap,

	.set_mode = mp886x_set_mode,

	.get_mode = mp886x_get_mode,

	.set_ramp_delay = mp886x_set_ramp,

};



static const struct mp886x_cfg_info mp8867_ci = {

	.rops = &mp8867_regulator_ops,

	.slew_rates = {

		64000,

		32000,

		16000,

		8000,

		4000,

		2000,

		1000,

		500,

	},

	.switch_freq = {

		500000,

		750000,

		1000000,

		1500000,

	},

	.fs_reg = MP886X_SYSCNTLREG1,

	.fs_shift = 1,

};



static int mp886x_regulator_register(struct mp886x_device_info *di,
@@ -183,7 +281,7 @@ static int mp886x_regulator_register(struct mp886x_device_info *di, 


	rdesc->name = "mp886x-reg";

	rdesc->supply_name = "vin";

	rdesc->ops = of_device_get_match_data(di->dev);

	rdesc->ops = di->ci->rops;

	rdesc->type = REGULATOR_VOLTAGE;

	rdesc->n_voltages = 128;

	rdesc->enable_reg = MP886X_SYSCNTLREG1;
@@ -213,6 +311,7 @@ static int mp886x_i2c_probe(struct i2c_client *client) 
	struct mp886x_device_info *di;

	struct regulator_config config = { };

	struct regmap *regmap;

	u32 freq;

	int ret;



	di = devm_kzalloc(dev, sizeof(struct mp886x_device_info), GFP_KERNEL);
@@ -234,6 +333,7 @@ static int mp886x_i2c_probe(struct i2c_client *client) 
	if (IS_ERR(di->en_gpio))

		return PTR_ERR(di->en_gpio);



	di->ci = of_device_get_match_data(dev);

	di->dev = dev;



	regmap = devm_regmap_init_i2c(client, &mp886x_regmap_config);
@@ -249,6 +349,9 @@ static int mp886x_i2c_probe(struct i2c_client *client) 
	config.driver_data = di;

	config.of_node = np;



	if (!of_property_read_u32(np, "mps,switch-frequency", &freq))

		mp886x_set_switch_freq(di, regmap, freq);



	ret = mp886x_regulator_register(di, &config);

	if (ret < 0)

		dev_err(dev, "Failed to register regulator!\n");
@@ -258,11 +361,11 @@ static int mp886x_i2c_probe(struct i2c_client *client) 
static const struct of_device_id mp886x_dt_ids[] = {

	{

		.compatible = "mps,mp8867",

		.data = &mp8867_regulator_ops

		.data = &mp8867_ci

	},

	{

		.compatible = "mps,mp8869",

		.data = &mp8869_regulator_ops

		.data = &mp8869_ci

	},

	{ }

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE