Unverified Commit 5db5dd5b authored by Axel Lin's avatar Axel Lin Committed by Mark Brown
Browse files

regulator: hi6421v600: Fix getting wrong drvdata that causes boot failure 



Since config.dev = pdev->dev.parent in current code, so
dev_get_drvdata(rdev->dev.parent) actually returns the drvdata of the mfd
device rather than the regulator. Fix it.

Fixes: 9bc146ac ("regulator: hi6421v600: Fix setting wrong driver_data")
Reported-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Tested-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Reviewed-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/20210630074246.2305166-1-axel.lin@ingics.com


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

drivers/regulator/hi6421v600-regulator.c

+9 −7
Original line number Diff line number Diff line
@@ -98,10 +98,9 @@ static const unsigned int ldo34_voltages[] = { 


static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev)

{

	struct hi6421_spmi_reg_priv *priv;

	struct hi6421_spmi_reg_priv *priv = rdev_get_drvdata(rdev);

	int ret;



	priv = dev_get_drvdata(rdev->dev.parent);

	/* cannot enable more than one regulator at one time */

	mutex_lock(&priv->enable_mutex);
@@ -119,9 +118,10 @@ static int hi6421_spmi_regulator_enable(struct regulator_dev *rdev) 


static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev)

{

	struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);

	struct hi6421_spmi_reg_info *sreg;

	unsigned int reg_val;



	sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);

	regmap_read(rdev->regmap, rdev->desc->enable_reg, &reg_val);



	if (reg_val & sreg->eco_mode_mask)
@@ -133,9 +133,10 @@ static unsigned int hi6421_spmi_regulator_get_mode(struct regulator_dev *rdev) 
static int hi6421_spmi_regulator_set_mode(struct regulator_dev *rdev,

					  unsigned int mode)

{

	struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);

	struct hi6421_spmi_reg_info *sreg;

	unsigned int val;



	sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);

	switch (mode) {

	case REGULATOR_MODE_NORMAL:

		val = 0;
@@ -159,7 +160,9 @@ hi6421_spmi_regulator_get_optimum_mode(struct regulator_dev *rdev, 
				       int input_uV, int output_uV,

				       int load_uA)

{

	struct hi6421_spmi_reg_info *sreg = rdev_get_drvdata(rdev);

	struct hi6421_spmi_reg_info *sreg;



	sreg = container_of(rdev->desc, struct hi6421_spmi_reg_info, desc);



	if (!sreg->eco_uA || ((unsigned int)load_uA > sreg->eco_uA))

		return REGULATOR_MODE_NORMAL;
@@ -252,13 +255,12 @@ static int hi6421_spmi_regulator_probe(struct platform_device *pdev) 
		return -ENOMEM;



	mutex_init(&priv->enable_mutex);

	platform_set_drvdata(pdev, priv);



	for (i = 0; i < ARRAY_SIZE(regulator_info); i++) {

		info = &regulator_info[i];



		config.dev = pdev->dev.parent;

		config.driver_data = info;

		config.driver_data = priv;

		config.regmap = pmic->regmap;



		rdev = devm_regulator_register(dev, &info->desc, &config);