Commit 75164578 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v5.8-rc2' of... 

Merge tag 'regulator-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "This has a fix for the refactoring out of the pickable ranges
  functionality, plus the removal of a BROKEN dependency on mt6358 now
  that the dependencies were merged in -rc1 and a couple of device
  specific fixes"

* tag 'regulator-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: mt6358: Remove BROKEN dependency
  regualtor: pfuze100: correct sw1a/sw2 on pfuze3000
  regulator: Fix pickable ranges mapping
  regulator: da9063: fix LDO9 suspend and warning.
parents 2a000870 1b3bcca2

drivers/regulator/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -684,7 +684,7 @@ config REGULATOR_MT6323 


config REGULATOR_MT6358

	tristate "MediaTek MT6358 PMIC"

	depends on MFD_MT6397 && BROKEN

	depends on MFD_MT6397

	help

	  Say y here to select this option to enable the power regulator of

	  MediaTek MT6358 PMIC.

drivers/regulator/da9063-regulator.c

+0 −1
Original line number Diff line number Diff line
@@ -512,7 +512,6 @@ static const struct da9063_regulator_info da9063_regulator_info[] = { 
	},

	{

		DA9063_LDO(DA9063, LDO9, 950, 50, 3600),

		.suspend = BFIELD(DA9063_REG_LDO9_CONT, DA9063_VLDO9_SEL),

	},

	{

		DA9063_LDO(DA9063, LDO11, 900, 50, 3600),

drivers/regulator/helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ int regulator_map_voltage_pickable_linear_range(struct regulator_dev *rdev, 
			continue;

		}



		ret = selector + sel;

		ret = selector + sel - range->min_sel;



		voltage = rdev->desc->ops->list_voltage(rdev, ret);

drivers/regulator/pfuze100-regulator.c

+39 −21
Original line number Diff line number Diff line
@@ -209,6 +209,19 @@ static const struct regulator_ops pfuze100_swb_regulator_ops = { 


};



static const struct regulator_ops pfuze3000_sw_regulator_ops = {

	.enable = regulator_enable_regmap,

	.disable = regulator_disable_regmap,

	.is_enabled = regulator_is_enabled_regmap,

	.list_voltage = regulator_list_voltage_table,

	.map_voltage = regulator_map_voltage_ascend,

	.set_voltage_sel = regulator_set_voltage_sel_regmap,

	.get_voltage_sel = regulator_get_voltage_sel_regmap,

	.set_voltage_time_sel = regulator_set_voltage_time_sel,

	.set_ramp_delay = pfuze100_set_ramp_delay,



};



#define PFUZE100_FIXED_REG(_chip, _name, base, voltage)	\

	[_chip ## _ ## _name] = {	\

		.desc = {	\
@@ -318,22 +331,27 @@ static const struct regulator_ops pfuze100_swb_regulator_ops = { 
	.stby_mask = 0x20,	\

}





#define PFUZE3000_SW2_REG(_chip, _name, base, min, max, step)	{	\

/* No linar case for the some switches of PFUZE3000 */

#define PFUZE3000_SW_REG(_chip, _name, base, mask, voltages)	\

	[_chip ## _ ##  _name] = {	\

		.desc = {	\

			.name = #_name,	\

		.n_voltages = ((max) - (min)) / (step) + 1,	\

		.ops = &pfuze100_sw_regulator_ops,	\

			.n_voltages = ARRAY_SIZE(voltages),	\

			.ops = &pfuze3000_sw_regulator_ops,	\

			.type = REGULATOR_VOLTAGE,	\

			.id = _chip ## _ ## _name,	\

			.owner = THIS_MODULE,	\

		.min_uV = (min),	\

		.uV_step = (step),	\

			.volt_table = voltages,	\

			.vsel_reg = (base) + PFUZE100_VOL_OFFSET,	\

		.vsel_mask = 0x7,	\

			.vsel_mask = (mask),	\

			.enable_reg = (base) + PFUZE100_MODE_OFFSET,	\

			.enable_mask = 0xf,	\

			.enable_val = 0x8,	\

			.enable_time = 500,	\

		},	\

		.stby_reg = (base) + PFUZE100_STANDBY_OFFSET,	\

	.stby_mask = 0x7,	\

		.stby_mask = (mask),	\

		.sw_reg = true,		\

	}



#define PFUZE3000_SW3_REG(_chip, _name, base, min, max, step)	{	\
@@ -391,9 +409,9 @@ static struct pfuze_regulator pfuze200_regulators[] = { 
};



static struct pfuze_regulator pfuze3000_regulators[] = {

	PFUZE100_SWB_REG(PFUZE3000, SW1A, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),

	PFUZE3000_SW_REG(PFUZE3000, SW1A, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),

	PFUZE100_SW_REG(PFUZE3000, SW1B, PFUZE100_SW1CVOL, 700000, 1475000, 25000),

	PFUZE100_SWB_REG(PFUZE3000, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),

	PFUZE3000_SW_REG(PFUZE3000, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),

	PFUZE3000_SW3_REG(PFUZE3000, SW3, PFUZE100_SW3AVOL, 900000, 1650000, 50000),

	PFUZE100_SWB_REG(PFUZE3000, SWBST, PFUZE100_SWBSTCON1, 0x3, pfuze100_swbst),

	PFUZE100_SWB_REG(PFUZE3000, VSNVS, PFUZE100_VSNVSVOL, 0x7, pfuze100_vsnvs),
@@ -407,8 +425,8 @@ static struct pfuze_regulator pfuze3000_regulators[] = { 
};



static struct pfuze_regulator pfuze3001_regulators[] = {

	PFUZE100_SWB_REG(PFUZE3001, SW1, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),

	PFUZE100_SWB_REG(PFUZE3001, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),

	PFUZE3000_SW_REG(PFUZE3001, SW1, PFUZE100_SW1ABVOL, 0x1f, pfuze3000_sw1a),

	PFUZE3000_SW_REG(PFUZE3001, SW2, PFUZE100_SW2VOL, 0x7, pfuze3000_sw2lo),

	PFUZE3000_SW3_REG(PFUZE3001, SW3, PFUZE100_SW3AVOL, 900000, 1650000, 50000),

	PFUZE100_SWB_REG(PFUZE3001, VSNVS, PFUZE100_VSNVSVOL, 0x7, pfuze100_vsnvs),

	PFUZE100_VGEN_REG(PFUZE3001, VLDO1, PFUZE100_VGEN1VOL, 1800000, 3300000, 100000),

CRA Git | Maintained and supported by SUSTech CRA and CCSE