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

Commit 0460a368 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/lp8755',... 

Merge remote-tracking branches 'regulator/topic/lp8755', 'regulator/topic/max14577', 'regulator/topic/max77693', 'regulator/topic/max77843' and 'regulator/topic/max8973' into regulator-next
parents c16bcf03 840499aa cab344d3 39d23308 6986f44c 366604ec

Documentation/devicetree/bindings/regulator/max8973-regulator.txt

+19 −1
Original line number Diff line number Diff line
@@ -2,12 +2,30 @@ 


Required properties:



- compatible:	must be "maxim,max8973"

- compatible:	must be one of following:

			"maxim,max8973"

			"maxim,max77621".

- reg:		the i2c slave address of the regulator. It should be 0x1b.



Any standard regulator properties can be used to configure the single max8973

DCDC.



Optional properties:



-maxim,externally-enable: boolean, externally control the regulator output

		enable/disable.

-maxim,enable-gpio: GPIO for enable control. If the valid GPIO is provided

		then externally enable control will be considered.

-maxim,dvs-gpio: GPIO which is connected to DVS pin of device.

-maxim,dvs-default-state: Default state of GPIO during initialisation.

		1 for HIGH and 0 for LOW.

-maxim,enable-remote-sense: boolean, enable reote sense.

-maxim,enable-falling-slew-rate: boolean, enable falling slew rate.

-maxim,enable-active-discharge: boolean: enable active discharge.

-maxim,enable-frequency-shift: boolean, enable 9% frequency shift.

-maxim,enable-bias-control: boolean, enable bias control. By enabling this

		startup delay can be reduce to 20us from 220us.



Example:



	max8973@1b {

drivers/regulator/lp8755.c

+8 −15
Original line number Diff line number Diff line
@@ -419,20 +419,16 @@ static int lp8755_int_config(struct lp8755_chip *pchip) 
	}



	ret = lp8755_read(pchip, 0x0F, &regval);

	if (ret < 0)

		goto err_i2c;

	if (ret < 0) {

		dev_err(pchip->dev, "i2c acceess error %s\n", __func__);

		return ret;

	}



	pchip->irqmask = regval;

	ret = request_threaded_irq(pchip->irq, NULL, lp8755_irq_handler,

	return devm_request_threaded_irq(pchip->dev, pchip->irq, NULL,

					 lp8755_irq_handler,

					 IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

					 "lp8755-irq", pchip);

	if (ret)

		return ret;



	return ret;



err_i2c:

	dev_err(pchip->dev, "i2c acceess error %s\n", __func__);

	return ret;

}



static const struct regmap_config lp8755_regmap = {
@@ -514,9 +510,6 @@ static int lp8755_remove(struct i2c_client *client) 
	for (icnt = 0; icnt < LP8755_BUCK_MAX; icnt++)

		lp8755_write(pchip, icnt, 0x00);



	if (pchip->irq != 0)

		free_irq(pchip->irq, pchip);



	return 0;

}

drivers/regulator/max14577.c

+48 −80
Original line number Diff line number Diff line
@@ -100,31 +100,34 @@ static struct regulator_ops max14577_charger_ops = { 
	.set_current_limit	= max14577_reg_set_current_limit,

};



#define MAX14577_SAFEOUT_REG	{ \

	.name		= "SAFEOUT", \

	.of_match	= of_match_ptr("SAFEOUT"), \

	.regulators_node = of_match_ptr("regulators"), \

	.id		= MAX14577_SAFEOUT, \

	.ops		= &max14577_safeout_ops, \

	.type		= REGULATOR_VOLTAGE, \

	.owner		= THIS_MODULE, \

	.n_voltages	= 1, \

	.min_uV		= MAX14577_REGULATOR_SAFEOUT_VOLTAGE, \

	.enable_reg	= MAX14577_REG_CONTROL2, \

	.enable_mask	= CTRL2_SFOUTORD_MASK, \

}

#define MAX14577_CHARGER_REG	{ \

	.name		= "CHARGER", \

	.of_match	= of_match_ptr("CHARGER"), \

	.regulators_node = of_match_ptr("regulators"), \

	.id		= MAX14577_CHARGER, \

	.ops		= &max14577_charger_ops, \

	.type		= REGULATOR_CURRENT, \

	.owner		= THIS_MODULE, \

	.enable_reg	= MAX14577_CHG_REG_CHG_CTRL2, \

	.enable_mask	= CHGCTRL2_MBCHOSTEN_MASK, \

}



static const struct regulator_desc max14577_supported_regulators[] = {

	[MAX14577_SAFEOUT] = {

		.name		= "SAFEOUT",

		.of_match	= of_match_ptr("SAFEOUT"),

		.regulators_node = of_match_ptr("regulators"),

		.id		= MAX14577_SAFEOUT,

		.ops		= &max14577_safeout_ops,

		.type		= REGULATOR_VOLTAGE,

		.owner		= THIS_MODULE,

		.n_voltages	= 1,

		.min_uV		= MAX14577_REGULATOR_SAFEOUT_VOLTAGE,

		.enable_reg	= MAX14577_REG_CONTROL2,

		.enable_mask	= CTRL2_SFOUTORD_MASK,

	},

	[MAX14577_CHARGER] = {

		.name		= "CHARGER",

		.of_match	= of_match_ptr("CHARGER"),

		.regulators_node = of_match_ptr("regulators"),

		.id		= MAX14577_CHARGER,

		.ops		= &max14577_charger_ops,

		.type		= REGULATOR_CURRENT,

		.owner		= THIS_MODULE,

		.enable_reg	= MAX14577_CHG_REG_CHG_CTRL2,

		.enable_mask	= CHGCTRL2_MBCHOSTEN_MASK,

	},

	[MAX14577_SAFEOUT] = MAX14577_SAFEOUT_REG,

	[MAX14577_CHARGER] = MAX14577_CHARGER_REG,

};



static struct regulator_ops max77836_ldo_ops = {
@@ -138,63 +141,28 @@ static struct regulator_ops max77836_ldo_ops = { 
	/* TODO: add .set_suspend_mode */

};



#define MAX77836_LDO_REG(num)	{ \

	.name		= "LDO" # num, \

	.of_match	= of_match_ptr("LDO" # num), \

	.regulators_node = of_match_ptr("regulators"), \

	.id		= MAX77836_LDO ## num, \

	.ops		= &max77836_ldo_ops, \

	.type		= REGULATOR_VOLTAGE, \

	.owner		= THIS_MODULE, \

	.n_voltages	= MAX77836_REGULATOR_LDO_VOLTAGE_STEPS_NUM, \

	.min_uV		= MAX77836_REGULATOR_LDO_VOLTAGE_MIN, \

	.uV_step	= MAX77836_REGULATOR_LDO_VOLTAGE_STEP, \

	.enable_reg	= MAX77836_LDO_REG_CNFG1_LDO ## num, \

	.enable_mask	= MAX77836_CNFG1_LDO_PWRMD_MASK, \

	.vsel_reg	= MAX77836_LDO_REG_CNFG1_LDO ## num, \

	.vsel_mask	= MAX77836_CNFG1_LDO_TV_MASK, \

}



static const struct regulator_desc max77836_supported_regulators[] = {

	[MAX14577_SAFEOUT] = {

		.name		= "SAFEOUT",

		.of_match	= of_match_ptr("SAFEOUT"),

		.regulators_node = of_match_ptr("regulators"),

		.id		= MAX14577_SAFEOUT,

		.ops		= &max14577_safeout_ops,

		.type		= REGULATOR_VOLTAGE,

		.owner		= THIS_MODULE,

		.n_voltages	= 1,

		.min_uV		= MAX14577_REGULATOR_SAFEOUT_VOLTAGE,

		.enable_reg	= MAX14577_REG_CONTROL2,

		.enable_mask	= CTRL2_SFOUTORD_MASK,

	},

	[MAX14577_CHARGER] = {

		.name		= "CHARGER",

		.of_match	= of_match_ptr("CHARGER"),

		.regulators_node = of_match_ptr("regulators"),

		.id		= MAX14577_CHARGER,

		.ops		= &max14577_charger_ops,

		.type		= REGULATOR_CURRENT,

		.owner		= THIS_MODULE,

		.enable_reg	= MAX14577_CHG_REG_CHG_CTRL2,

		.enable_mask	= CHGCTRL2_MBCHOSTEN_MASK,

	},

	[MAX77836_LDO1] = {

		.name		= "LDO1",

		.of_match	= of_match_ptr("LDO1"),

		.regulators_node = of_match_ptr("regulators"),

		.id		= MAX77836_LDO1,

		.ops		= &max77836_ldo_ops,

		.type		= REGULATOR_VOLTAGE,

		.owner		= THIS_MODULE,

		.n_voltages	= MAX77836_REGULATOR_LDO_VOLTAGE_STEPS_NUM,

		.min_uV		= MAX77836_REGULATOR_LDO_VOLTAGE_MIN,

		.uV_step	= MAX77836_REGULATOR_LDO_VOLTAGE_STEP,

		.enable_reg	= MAX77836_LDO_REG_CNFG1_LDO1,

		.enable_mask	= MAX77836_CNFG1_LDO_PWRMD_MASK,

		.vsel_reg	= MAX77836_LDO_REG_CNFG1_LDO1,

		.vsel_mask	= MAX77836_CNFG1_LDO_TV_MASK,

	},

	[MAX77836_LDO2] = {

		.name		= "LDO2",

		.of_match	= of_match_ptr("LDO2"),

		.regulators_node = of_match_ptr("regulators"),

		.id		= MAX77836_LDO2,

		.ops		= &max77836_ldo_ops,

		.type		= REGULATOR_VOLTAGE,

		.owner		= THIS_MODULE,

		.n_voltages	= MAX77836_REGULATOR_LDO_VOLTAGE_STEPS_NUM,

		.min_uV		= MAX77836_REGULATOR_LDO_VOLTAGE_MIN,

		.uV_step	= MAX77836_REGULATOR_LDO_VOLTAGE_STEP,

		.enable_reg	= MAX77836_LDO_REG_CNFG1_LDO2,

		.enable_mask	= MAX77836_CNFG1_LDO_PWRMD_MASK,

		.vsel_reg	= MAX77836_LDO_REG_CNFG1_LDO2,

		.vsel_mask	= MAX77836_CNFG1_LDO_TV_MASK,

	},

	[MAX14577_SAFEOUT] = MAX14577_SAFEOUT_REG,

	[MAX14577_CHARGER] = MAX14577_CHARGER_REG,

	[MAX77836_LDO1] = MAX77836_LDO_REG(1),

	[MAX77836_LDO2] = MAX77836_LDO_REG(2),

};



#ifdef CONFIG_OF

drivers/regulator/max77693.c

+2 −15
Original line number Diff line number Diff line
@@ -35,20 +35,6 @@ 


#define CHGIN_ILIM_STEP_20mA			20000



/* CHARGER regulator ops */

/* CHARGER regulator uses two bits for enabling */

static int max77693_chg_is_enabled(struct regulator_dev *rdev)

{

	int ret;

	unsigned int val;



	ret = regmap_read(rdev->regmap, rdev->desc->enable_reg, &val);

	if (ret)

		return ret;



	return (val & rdev->desc->enable_mask) == rdev->desc->enable_mask;

}



/*

 * CHARGER regulator - Min : 20mA, Max : 2580mA, step : 20mA

 * 0x00, 0x01, 0x2, 0x03	= 60 mA
@@ -118,7 +104,7 @@ static struct regulator_ops max77693_safeout_ops = { 
};



static struct regulator_ops max77693_charger_ops = {

	.is_enabled		= max77693_chg_is_enabled,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.get_current_limit	= max77693_chg_get_current_limit,
@@ -155,6 +141,7 @@ static const struct regulator_desc regulators[] = { 
		.enable_reg = MAX77693_CHG_REG_CHG_CNFG_00,

		.enable_mask = CHG_CNFG_00_CHG_MASK |

				CHG_CNFG_00_BUCK_MASK,

		.enable_val = CHG_CNFG_00_CHG_MASK | CHG_CNFG_00_BUCK_MASK,

	},

};

drivers/regulator/max77843.c

+21 −47
Original line number Diff line number Diff line
@@ -33,21 +33,6 @@ static const unsigned int max77843_safeout_voltage_table[] = { 
	3300000,

};



static int max77843_reg_is_enabled(struct regulator_dev *rdev)

{

	struct regmap *regmap = rdev->regmap;

	int ret;

	unsigned int reg;



	ret = regmap_read(regmap, rdev->desc->enable_reg, &reg);

	if (ret) {

		dev_err(&rdev->dev, "Fialed to read charger register\n");

		return ret;

	}



	return (reg & rdev->desc->enable_mask) == rdev->desc->enable_mask;

}



static int max77843_reg_get_current_limit(struct regulator_dev *rdev)

{

	struct regmap *regmap = rdev->regmap;
@@ -96,7 +81,7 @@ static int max77843_reg_set_current_limit(struct regulator_dev *rdev, 
}



static struct regulator_ops max77843_charger_ops = {

	.is_enabled		= max77843_reg_is_enabled,

	.is_enabled		= regulator_is_enabled_regmap,

	.enable			= regulator_enable_regmap,

	.disable		= regulator_disable_regmap,

	.get_current_limit	= max77843_reg_get_current_limit,
@@ -112,37 +97,25 @@ static struct regulator_ops max77843_regulator_ops = { 
	.set_voltage_sel        = regulator_set_voltage_sel_regmap,

};



#define	MAX77843_SAFEOUT(num)	{ \

	.name		= "SAFEOUT" # num, \

	.id		= MAX77843_SAFEOUT ## num, \

	.ops		= &max77843_regulator_ops, \

	.of_match	= of_match_ptr("SAFEOUT" # num), \

	.regulators_node = of_match_ptr("regulators"), \

	.type		= REGULATOR_VOLTAGE, \

	.owner		= THIS_MODULE, \

	.n_voltages	= ARRAY_SIZE(max77843_safeout_voltage_table), \

	.volt_table	= max77843_safeout_voltage_table, \

	.enable_reg	= MAX77843_SYS_REG_SAFEOUTCTRL, \

	.enable_mask	= MAX77843_REG_SAFEOUTCTRL_ENSAFEOUT ## num, \

	.vsel_reg	= MAX77843_SYS_REG_SAFEOUTCTRL, \

	.vsel_mask	= MAX77843_REG_SAFEOUTCTRL_SAFEOUT ## num ## _MASK, \

}



static const struct regulator_desc max77843_supported_regulators[] = {

	[MAX77843_SAFEOUT1] = {

		.name		= "SAFEOUT1",

		.id		= MAX77843_SAFEOUT1,

		.ops		= &max77843_regulator_ops,

		.of_match	= of_match_ptr("SAFEOUT1"),

		.regulators_node = of_match_ptr("regulators"),

		.type		= REGULATOR_VOLTAGE,

		.owner		= THIS_MODULE,

		.n_voltages	= ARRAY_SIZE(max77843_safeout_voltage_table),

		.volt_table	= max77843_safeout_voltage_table,

		.enable_reg	= MAX77843_SYS_REG_SAFEOUTCTRL,

		.enable_mask	= MAX77843_REG_SAFEOUTCTRL_ENSAFEOUT1,

		.vsel_reg	= MAX77843_SYS_REG_SAFEOUTCTRL,

		.vsel_mask	= MAX77843_REG_SAFEOUTCTRL_SAFEOUT1_MASK,

	},

	[MAX77843_SAFEOUT2] = {

		.name           = "SAFEOUT2",

		.id             = MAX77843_SAFEOUT2,

		.ops            = &max77843_regulator_ops,

		.of_match	= of_match_ptr("SAFEOUT2"),

		.regulators_node = of_match_ptr("regulators"),

		.type           = REGULATOR_VOLTAGE,

		.owner          = THIS_MODULE,

		.n_voltages	= ARRAY_SIZE(max77843_safeout_voltage_table),

		.volt_table	= max77843_safeout_voltage_table,

		.enable_reg     = MAX77843_SYS_REG_SAFEOUTCTRL,

		.enable_mask    = MAX77843_REG_SAFEOUTCTRL_ENSAFEOUT2,

		.vsel_reg	= MAX77843_SYS_REG_SAFEOUTCTRL,

		.vsel_mask	= MAX77843_REG_SAFEOUTCTRL_SAFEOUT2_MASK,

	},

	[MAX77843_SAFEOUT1] = MAX77843_SAFEOUT(1),

	[MAX77843_SAFEOUT2] = MAX77843_SAFEOUT(2),

	[MAX77843_CHARGER] = {

		.name		= "CHARGER",

		.id		= MAX77843_CHARGER,
@@ -152,7 +125,8 @@ static const struct regulator_desc max77843_supported_regulators[] = { 
		.type		= REGULATOR_CURRENT,

		.owner		= THIS_MODULE,

		.enable_reg	= MAX77843_CHG_REG_CHG_CNFG_00,

		.enable_mask	= MAX77843_CHG_MASK,

		.enable_mask	= MAX77843_CHG_MASK | MAX77843_CHG_BUCK_MASK,

		.enable_val	= MAX77843_CHG_MASK | MAX77843_CHG_BUCK_MASK,

	},

};