Unverified Commit 2f595d08 authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "regulator: mcp16502: add support for ramp delay" from Claudiu... 


Merge series "regulator: mcp16502: add support for ramp delay" from Claudiu Beznea <claudiu.beznea@microchip.com>:

Hi,

This series adds support for ramp delay on mcp16502. It also adds
some cleanup on mcp16502.

Apart from that patches 1/6 fixes the selector validation in case
the regulator::desc::linear_min_sel is not zero.

Thank you,
Claudiu Beznea

Changes in v3:
- fix compilation error in patch 5/6
  Reported-by: default avatarkernel test robot <lkp@intel.com>

Changes in v2:
- rebase on top of regulator/for-next
- checked 1/6 and 3/6 applies on top of regulator/for-5.10

Claudiu Beznea (6):
  regulator: core: validate selector against linear_min_sel
  regulator: core: do not continue if selector match
  regulator: mcp16502: add linear_min_sel
  regulator: mcp16502: adapt for get/set on other registers
  regulator: mcp16502: add support for ramp delay
  regulator: mcp16502: remove void documentation of struct mcp16502

 drivers/regulator/core.c     |  12 +++-
 drivers/regulator/helpers.c  |   3 +-
 drivers/regulator/mcp16502.c | 135 ++++++++++++++++++++++++++++++++++++-------
 3 files changed, 127 insertions(+), 23 deletions(-)

--
2.7.4

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
parents 0917c9db bdcd1177

drivers/regulator/core.c

+7 −2
Original line number Diff line number Diff line
@@ -2958,7 +2958,8 @@ static int _regulator_list_voltage(struct regulator_dev *rdev, 
		return rdev->desc->fixed_uV;



	if (ops->list_voltage) {

		if (selector >= rdev->desc->n_voltages)

		if (selector >= rdev->desc->n_voltages ||

		    selector < rdev->desc->linear_min_sel)

			return -EINVAL;

		if (lock)

			regulator_lock(rdev);
@@ -3109,7 +3110,8 @@ int regulator_list_hardware_vsel(struct regulator *regulator, 
	struct regulator_dev *rdev = regulator->rdev;

	const struct regulator_ops *ops = rdev->desc->ops;



	if (selector >= rdev->desc->n_voltages)

	if (selector >= rdev->desc->n_voltages ||

	    selector < rdev->desc->linear_min_sel)

		return -EINVAL;

	if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap)

		return -EOPNOTSUPP;
@@ -4032,6 +4034,9 @@ int regulator_set_voltage_time(struct regulator *regulator, 


	for (i = 0; i < rdev->desc->n_voltages; i++) {

		/* We only look for exact voltage matches here */

		if (i < rdev->desc->linear_min_sel)

			continue;



		voltage = regulator_list_voltage(regulator, i);

		if (voltage < 0)

			return -EINVAL;

drivers/regulator/helpers.c

+2 −1
Original line number Diff line number Diff line
@@ -647,7 +647,8 @@ int regulator_list_voltage_table(struct regulator_dev *rdev, 
		return -EINVAL;

	}



	if (selector >= rdev->desc->n_voltages)

	if (selector >= rdev->desc->n_voltages ||

	    selector < rdev->desc->linear_min_sel)

		return -EINVAL;



	return rdev->desc->volt_table[selector];

drivers/regulator/mcp16502.c

+115 −20
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#define VDD_HIGH_SEL 0x3F



#define MCP16502_FLT		BIT(7)

#define MCP16502_DVSR		GENMASK(3, 2)

#define MCP16502_ENS		BIT(0)



/*
@@ -54,13 +55,9 @@ 
 * This function is useful for iterating over all regulators and accessing their

 * registers in a generic way or accessing a regulator device by its id.

 */

#define MCP16502_BASE(i) (((i) + 1) << 4)

#define MCP16502_REG_BASE(i, r) ((((i) + 1) << 4) + MCP16502_REG_##r)

#define MCP16502_STAT_BASE(i) ((i) + 5)



#define MCP16502_OFFSET_MODE_A 0

#define MCP16502_OFFSET_MODE_LPM 1

#define MCP16502_OFFSET_MODE_HIB 2



#define MCP16502_OPMODE_ACTIVE REGULATOR_MODE_NORMAL

#define MCP16502_OPMODE_LPM REGULATOR_MODE_IDLE

#define MCP16502_OPMODE_HIB REGULATOR_MODE_STANDBY
@@ -75,6 +72,29 @@ 
#define MCP16502_MIN_REG 0x0

#define MCP16502_MAX_REG 0x65



/**

 * enum mcp16502_reg - MCP16502 regulators's registers

 * @MCP16502_REG_A: active state register

 * @MCP16502_REG_LPM: low power mode state register

 * @MCP16502_REG_HIB: hibernate state register

 * @MCP16502_REG_SEQ: startup sequence register

 * @MCP16502_REG_CFG: configuration register

 */

enum mcp16502_reg {

	MCP16502_REG_A,

	MCP16502_REG_LPM,

	MCP16502_REG_HIB,

	MCP16502_REG_HPM,

	MCP16502_REG_SEQ,

	MCP16502_REG_CFG,

};



/* Ramp delay (uV/us) for buck1, ldo1, ldo2. */

static const int mcp16502_ramp_b1l12[] = { 6250, 3125, 2083, 1563 };



/* Ramp delay (uV/us) for buck2, buck3, buck4. */

static const int mcp16502_ramp_b234[] = { 3125, 1563, 1042, 781 };



static unsigned int mcp16502_of_map_mode(unsigned int mode)

{

	if (mode == REGULATOR_MODE_NORMAL || mode == REGULATOR_MODE_IDLE)
@@ -93,6 +113,7 @@ static unsigned int mcp16502_of_map_mode(unsigned int mode) 
		.owner			= THIS_MODULE,			\

		.n_voltages		= MCP16502_VSEL + 1,		\

		.linear_ranges		= _ranges,			\

		.linear_min_sel		= VDD_LOW_SEL,			\

		.n_linear_ranges	= ARRAY_SIZE(_ranges),		\

		.of_match		= of_match_ptr(_name),		\

		.of_map_mode		= mcp16502_of_map_mode,		\
@@ -114,8 +135,6 @@ enum { 


/*

 * struct mcp16502 - PMIC representation

 * @rdev: the regulators belonging to this chip

 * @rmap: regmap to be used for I2C communication

 * @lpm: LPM GPIO descriptor

 */

struct mcp16502 {
@@ -143,22 +162,20 @@ static void mcp16502_gpio_set_mode(struct mcp16502 *mcp, int mode) 
}



/*

 * mcp16502_get_reg() - get the PMIC's configuration register for opmode

 * mcp16502_get_reg() - get the PMIC's state configuration register for opmode

 *

 * @rdev: the regulator whose register we are searching

 * @opmode: the PMIC's operating mode ACTIVE, Low-power, Hibernate

 */

static int mcp16502_get_reg(struct regulator_dev *rdev, int opmode)

static int mcp16502_get_state_reg(struct regulator_dev *rdev, int opmode)

{

	int reg = MCP16502_BASE(rdev_get_id(rdev));



	switch (opmode) {

	case MCP16502_OPMODE_ACTIVE:

		return reg + MCP16502_OFFSET_MODE_A;

		return MCP16502_REG_BASE(rdev_get_id(rdev), A);

	case MCP16502_OPMODE_LPM:

		return reg + MCP16502_OFFSET_MODE_LPM;

		return MCP16502_REG_BASE(rdev_get_id(rdev), LPM);

	case MCP16502_OPMODE_HIB:

		return reg + MCP16502_OFFSET_MODE_HIB;

		return MCP16502_REG_BASE(rdev_get_id(rdev), HIB);

	default:

		return -EINVAL;

	}
@@ -178,7 +195,7 @@ static unsigned int mcp16502_get_mode(struct regulator_dev *rdev) 
	unsigned int val;

	int ret, reg;



	reg = mcp16502_get_reg(rdev, MCP16502_OPMODE_ACTIVE);

	reg = mcp16502_get_state_reg(rdev, MCP16502_OPMODE_ACTIVE);

	if (reg < 0)

		return reg;
@@ -209,7 +226,7 @@ static int _mcp16502_set_mode(struct regulator_dev *rdev, unsigned int mode, 
	int val;

	int reg;



	reg = mcp16502_get_reg(rdev, op_mode);

	reg = mcp16502_get_state_reg(rdev, op_mode);

	if (reg < 0)

		return reg;
@@ -259,6 +276,80 @@ static int mcp16502_get_status(struct regulator_dev *rdev) 
	return REGULATOR_STATUS_UNDEFINED;

}



static int mcp16502_set_voltage_time_sel(struct regulator_dev *rdev,

					 unsigned int old_sel,

					 unsigned int new_sel)

{

	static const u8 us_ramp[] = { 8, 16, 24, 32 };

	int id = rdev_get_id(rdev);

	unsigned int uV_delta, val;

	int ret;



	ret = regmap_read(rdev->regmap, MCP16502_REG_BASE(id, CFG), &val);

	if (ret)

		return ret;



	val = (val & MCP16502_DVSR) >> 2;

	uV_delta = abs(new_sel * rdev->desc->linear_ranges->step -

		       old_sel * rdev->desc->linear_ranges->step);

	switch (id) {

	case BUCK1:

	case LDO1:

	case LDO2:

		ret = DIV_ROUND_CLOSEST(uV_delta * us_ramp[val],

					mcp16502_ramp_b1l12[val]);

		break;



	case BUCK2:

	case BUCK3:

	case BUCK4:

		ret = DIV_ROUND_CLOSEST(uV_delta * us_ramp[val],

					mcp16502_ramp_b234[val]);

		break;



	default:

		return -EINVAL;

	}



	return ret;

}



static int mcp16502_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)

{

	const int *ramp;

	int id = rdev_get_id(rdev);

	unsigned int i, size;



	switch (id) {

	case BUCK1:

	case LDO1:

	case LDO2:

		ramp = mcp16502_ramp_b1l12;

		size = ARRAY_SIZE(mcp16502_ramp_b1l12);

		break;



	case BUCK2:

	case BUCK3:

	case BUCK4:

		ramp = mcp16502_ramp_b234;

		size = ARRAY_SIZE(mcp16502_ramp_b234);

		break;



	default:

		return -EINVAL;

	}



	for (i = 0; i < size; i++) {

		if (ramp[i] == ramp_delay)

			break;

	}

	if (i == size)

		return -EINVAL;



	return regmap_update_bits(rdev->regmap, MCP16502_REG_BASE(id, CFG),

				  MCP16502_DVSR, (i << 2));

}



#ifdef CONFIG_SUSPEND

/*

 * mcp16502_suspend_get_target_reg() - get the reg of the target suspend PMIC
@@ -268,10 +359,10 @@ static int mcp16502_suspend_get_target_reg(struct regulator_dev *rdev) 
{

	switch (pm_suspend_target_state) {

	case PM_SUSPEND_STANDBY:

		return mcp16502_get_reg(rdev, MCP16502_OPMODE_LPM);

		return mcp16502_get_state_reg(rdev, MCP16502_OPMODE_LPM);

	case PM_SUSPEND_ON:

	case PM_SUSPEND_MEM:

		return mcp16502_get_reg(rdev, MCP16502_OPMODE_HIB);

		return mcp16502_get_state_reg(rdev, MCP16502_OPMODE_HIB);

	default:

		dev_err(&rdev->dev, "invalid suspend target: %d\n",

			pm_suspend_target_state);
@@ -353,6 +444,8 @@ static const struct regulator_ops mcp16502_buck_ops = { 
	.disable			= regulator_disable_regmap,

	.is_enabled			= regulator_is_enabled_regmap,

	.get_status			= mcp16502_get_status,

	.set_voltage_time_sel		= mcp16502_set_voltage_time_sel,

	.set_ramp_delay			= mcp16502_set_ramp_delay,



	.set_mode			= mcp16502_set_mode,

	.get_mode			= mcp16502_get_mode,
@@ -377,6 +470,8 @@ static const struct regulator_ops mcp16502_ldo_ops = { 
	.disable			= regulator_disable_regmap,

	.is_enabled			= regulator_is_enabled_regmap,

	.get_status			= mcp16502_get_status,

	.set_voltage_time_sel		= mcp16502_set_voltage_time_sel,

	.set_ramp_delay			= mcp16502_set_ramp_delay,



#ifdef CONFIG_SUSPEND

	.set_suspend_voltage		= mcp16502_set_suspend_voltage,