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

Commit 5ce63c7e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/topic/lp3972' into regulator-next

parents 5ec2a5e8 c8c14a39

drivers/regulator/lp3972.c

+6 −16
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ static const int buck_base_addr[] = { 
#define LP3972_BUCK_VOL_ENABLE_REG(x) (buck_vol_enable_addr[x])

#define LP3972_BUCK_VOL1_REG(x) (buck_base_addr[x])

#define LP3972_BUCK_VOL_MASK 0x1f

#define LP3972_BUCK_VOL_MIN_IDX(x) ((x) ? 0x01 : 0x00)

#define LP3972_BUCK_VOL_MAX_IDX(x) ((x) ? 0x19 : 0x1f)



static int lp3972_i2c_read(struct i2c_client *i2c, char reg, int count,

	u16 *dest)
@@ -257,7 +255,7 @@ static int lp3972_ldo_disable(struct regulator_dev *dev) 
				mask, 0);

}



static int lp3972_ldo_get_voltage(struct regulator_dev *dev)

static int lp3972_ldo_get_voltage_sel(struct regulator_dev *dev)

{

	struct lp3972 *lp3972 = rdev_get_drvdata(dev);

	int ldo = rdev_get_id(dev) - LP3972_LDO1;
@@ -267,7 +265,7 @@ static int lp3972_ldo_get_voltage(struct regulator_dev *dev) 
	reg = lp3972_reg_read(lp3972, LP3972_LDO_VOL_CONTR_REG(ldo));

	val = (reg >> LP3972_LDO_VOL_CONTR_SHIFT(ldo)) & mask;



	return dev->desc->volt_table[val];

	return val;

}



static int lp3972_ldo_set_voltage_sel(struct regulator_dev *dev,
@@ -314,7 +312,7 @@ static struct regulator_ops lp3972_ldo_ops = { 
	.is_enabled = lp3972_ldo_is_enabled,

	.enable = lp3972_ldo_enable,

	.disable = lp3972_ldo_disable,

	.get_voltage = lp3972_ldo_get_voltage,

	.get_voltage_sel = lp3972_ldo_get_voltage_sel,

	.set_voltage_sel = lp3972_ldo_set_voltage_sel,

};
@@ -353,24 +351,16 @@ static int lp3972_dcdc_disable(struct regulator_dev *dev) 
	return val;

}



static int lp3972_dcdc_get_voltage(struct regulator_dev *dev)

static int lp3972_dcdc_get_voltage_sel(struct regulator_dev *dev)

{

	struct lp3972 *lp3972 = rdev_get_drvdata(dev);

	int buck = rdev_get_id(dev) - LP3972_DCDC1;

	u16 reg;

	int val;



	reg = lp3972_reg_read(lp3972, LP3972_BUCK_VOL1_REG(buck));

	reg &= LP3972_BUCK_VOL_MASK;

	if (reg <= LP3972_BUCK_VOL_MAX_IDX(buck))

		val = dev->desc->volt_table[reg];

	else {

		val = 0;

		dev_warn(&dev->dev, "chip reported incorrect voltage value."

				    " reg = %d\n", reg);

	}



	return val;

	return reg;

}



static int lp3972_dcdc_set_voltage_sel(struct regulator_dev *dev,
@@ -402,7 +392,7 @@ static struct regulator_ops lp3972_dcdc_ops = { 
	.is_enabled = lp3972_dcdc_is_enabled,

	.enable = lp3972_dcdc_enable,

	.disable = lp3972_dcdc_disable,

	.get_voltage = lp3972_dcdc_get_voltage,

	.get_voltage_sel = lp3972_dcdc_get_voltage_sel,

	.set_voltage_sel = lp3972_dcdc_set_voltage_sel,

};