Unverified Commit ebad413c authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/for-5.13' into regulator-linus

parents 13311e74 50c9462e

drivers/regulator/hi655x-regulator.c

+5 −11
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ enum hi655x_regulator_id { 
static int hi655x_is_enabled(struct regulator_dev *rdev)

{

	unsigned int value = 0;

	struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);

	const struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);



	regmap_read(rdev->regmap, regulator->status_reg, &value);

	return (value & rdev->desc->enable_mask);
@@ -80,7 +80,7 @@ static int hi655x_is_enabled(struct regulator_dev *rdev) 


static int hi655x_disable(struct regulator_dev *rdev)

{

	struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);

	const struct hi655x_regulator *regulator = rdev_get_drvdata(rdev);



	return regmap_write(rdev->regmap, regulator->disable_reg,

			    rdev->desc->enable_mask);
@@ -169,7 +169,6 @@ static const struct hi655x_regulator regulators[] = { 
static int hi655x_regulator_probe(struct platform_device *pdev)

{

	unsigned int i;

	struct hi655x_regulator *regulator;

	struct hi655x_pmic *pmic;

	struct regulator_config config = { };

	struct regulator_dev *rdev;
@@ -180,22 +179,17 @@ static int hi655x_regulator_probe(struct platform_device *pdev) 
		return -ENODEV;

	}



	regulator = devm_kzalloc(&pdev->dev, sizeof(*regulator), GFP_KERNEL);

	if (!regulator)

		return -ENOMEM;



	platform_set_drvdata(pdev, regulator);



	config.dev = pdev->dev.parent;

	config.regmap = pmic->regmap;

	config.driver_data = regulator;

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

		config.driver_data = (void *) &regulators[i];



		rdev = devm_regulator_register(&pdev->dev,

					       &regulators[i].rdesc,

					       &config);

		if (IS_ERR(rdev)) {

			dev_err(&pdev->dev, "failed to register regulator %s\n",

				regulator->rdesc.name);

				regulators[i].rdesc.name);

			return PTR_ERR(rdev);

		}

	}

drivers/regulator/mt6358-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static struct mt6358_regulator_info mt6358_regulators[] = { 
	MT6358_REG_FIXED("ldo_vaud28", VAUD28,

			 MT6358_LDO_VAUD28_CON0, 0, 2800000),

	MT6358_LDO("ldo_vdram2", VDRAM2, vdram2_voltages, vdram2_idx,

		   MT6358_LDO_VDRAM2_CON0, 0, MT6358_LDO_VDRAM2_ELR0, 0x10, 0),

		   MT6358_LDO_VDRAM2_CON0, 0, MT6358_LDO_VDRAM2_ELR0, 0xf, 0),

	MT6358_LDO("ldo_vsim1", VSIM1, vsim_voltages, vsim_idx,

		   MT6358_LDO_VSIM1_CON0, 0, MT6358_VSIM1_ANA_CON0, 0xf00, 8),

	MT6358_LDO("ldo_vibr", VIBR, vibr_voltages, vibr_idx,