Unverified Commit 245f5f65 authored by Adrien Grassein's avatar Adrien Grassein Committed by Mark Brown
Browse files

regulator: pf8x00: mark nxp,ilim-ma property as deprecated 



This property seems useless because we can use the
regulator-max-microamp generic property to do the same
and using generic code.

As this property was already released in a kernel version,
we can't remove it, just mark it as deprecated.

Signed-off-by: default avatarAdrien Grassein <adrien.grassein@gmail.com>
Link: https://lore.kernel.org/r/20210114174714.122561-5-adrien.grassein@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 34b860aa

drivers/regulator/pf8x00-regulator.c

+41 −14
Original line number Diff line number Diff line
@@ -128,7 +128,6 @@ enum pf8x00_devid { 


struct pf8x00_regulator {

	struct regulator_desc desc;

	u8 ilim;

	u8 phase_shift;

};
@@ -150,6 +149,11 @@ static const int pf8x00_ldo_voltages[] = { 
	3100000, 3150000, 3200000, 3300000, 3350000, 1650000, 1700000, 5000000,

};



/* Output: 2.1A to 4.5A */

static const unsigned int pf8x00_sw_current_table[] = {

	2100000, 2600000, 3000000, 4500000,

};



#define SWV(i)		(6250 * i + 400000)

#define SWV_LINE(i)	SWV(i*8+0), SWV(i*8+1), SWV(i*8+2), SWV(i*8+3), \

			SWV(i*8+4), SWV(i*8+5), SWV(i*8+6), SWV(i*8+7)
@@ -199,10 +203,10 @@ static struct pf8x00_regulator *desc_to_regulator(const struct regulator_desc *d 
	return container_of(desc, struct pf8x00_regulator, desc);

}



static void swxilim_select(const struct regulator_desc *desc, int ilim)

static void swxilim_select(struct pf8x00_chip *chip, int id, int ilim)

{

	struct pf8x00_regulator *data = desc_to_regulator(desc);

	u8 ilim_sel;

	u8 reg = PF8X00_SW_BASE(id) + SW_CONFIG2;



	switch (ilim) {

	case 2100:
@@ -222,7 +226,32 @@ static void swxilim_select(const struct regulator_desc *desc, int ilim) 
		break;

	}



	data->ilim = ilim_sel;

	regmap_update_bits(chip->regmap, reg,

					PF8X00_SWXILIM_MASK,

					ilim_sel << PF8X00_SWXILIM_SHIFT);

}



static void handle_ilim_property(struct device_node *np,

			      const struct regulator_desc *desc,

			      struct regulator_config *config)

{

	struct pf8x00_chip *chip = config->driver_data;

	int ret;

	int val;



	if ((desc->id >= PF8X00_BUCK1) && (desc->id <= PF8X00_BUCK7)) {

		ret = of_property_read_u32(np, "nxp,ilim-ma", &val);

		if (ret) {

			dev_dbg(chip->dev, "unspecified ilim for BUCK%d, use value stored in OTP\n",

				desc->id - PF8X00_LDO4);

			return;

		}



		dev_warn(chip->dev, "nxp,ilim-ma is deprecated, please use regulator-max-microamp\n");

		swxilim_select(chip, desc->id, val);



	} else

		dev_warn(chip->dev, "nxp,ilim-ma used with incorrect regulator (%d)\n", desc->id);

}



static int pf8x00_of_parse_cb(struct device_node *np,
@@ -235,12 +264,7 @@ static int pf8x00_of_parse_cb(struct device_node *np, 
	int val;

	int ret;



	ret = of_property_read_u32(np, "nxp,ilim-ma", &val);

	if (ret)

		dev_dbg(chip->dev, "unspecified ilim for BUCK%d, use 2100 mA\n",

			desc->id - PF8X00_LDO4);



	swxilim_select(desc, val);

	handle_ilim_property(np, desc, config);



	ret = of_property_read_u32(np, "nxp,phase-shift", &val);

	if (ret) {
@@ -279,6 +303,8 @@ static const struct regulator_ops pf8x00_buck_ops = { 
	.list_voltage = regulator_list_voltage_table,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.get_current_limit = regulator_get_current_limit_regmap,

	.set_current_limit = regulator_set_current_limit_regmap,

};



static const struct regulator_ops pf8x00_vsnvs_ops = {
@@ -327,6 +353,11 @@ static const struct regulator_ops pf8x00_vsnvs_ops = { 
			.volt_table = voltages,			\

			.vsel_reg = (base) + SW_RUN_VOLT,	\

			.vsel_mask = 0xff,			\

			.curr_table = pf8x00_sw_current_table, \

			.n_current_limits = \

				ARRAY_SIZE(pf8x00_sw_current_table), \

			.csel_reg = (base) + SW_CONFIG2,	\

			.csel_mask = PF8X00_SWXILIM_MASK,	\

			.enable_reg = (base) + SW_MODE1,	\

			.enable_val = 0x3,			\

			.disable_val = 0x0,			\
@@ -458,10 +489,6 @@ static int pf8x00_i2c_probe(struct i2c_client *client) 
			regmap_update_bits(chip->regmap, reg,

					   PF8X00_SWXPHASE_MASK,

					   data->phase_shift);



			regmap_update_bits(chip->regmap, reg,

					   PF8X00_SWXILIM_MASK,

					   data->ilim << PF8X00_SWXILIM_SHIFT);

		}

	}