Unverified Commit 7933147e authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'regulator-5.3' into regulator-5.4

parents 6cbe29c9 3829100a

drivers/regulator/act8945a-regulator.c

+4 −4
Original line number Diff line number Diff line
@@ -169,16 +169,16 @@ static int act8945a_set_mode(struct regulator_dev *rdev, unsigned int mode) 
		reg = ACT8945A_DCDC3_CTRL;

		break;

	case ACT8945A_ID_LDO1:

		reg = ACT8945A_LDO1_SUS;

		reg = ACT8945A_LDO1_CTRL;

		break;

	case ACT8945A_ID_LDO2:

		reg = ACT8945A_LDO2_SUS;

		reg = ACT8945A_LDO2_CTRL;

		break;

	case ACT8945A_ID_LDO3:

		reg = ACT8945A_LDO3_SUS;

		reg = ACT8945A_LDO3_CTRL;

		break;

	case ACT8945A_ID_LDO4:

		reg = ACT8945A_LDO4_SUS;

		reg = ACT8945A_LDO4_CTRL;

		break;

	default:

		return -EINVAL;

drivers/regulator/axp20x-regulator.c

+5 −5
Original line number Diff line number Diff line
@@ -174,14 +174,14 @@ 
#define AXP803_DCDC5_1140mV_STEPS	35

#define AXP803_DCDC5_1140mV_END		\

	(AXP803_DCDC5_1140mV_START + AXP803_DCDC5_1140mV_STEPS)

#define AXP803_DCDC5_NUM_VOLTAGES	68

#define AXP803_DCDC5_NUM_VOLTAGES	69



#define AXP803_DCDC6_600mV_START	0x00

#define AXP803_DCDC6_600mV_STEPS	50

#define AXP803_DCDC6_600mV_END		\

	(AXP803_DCDC6_600mV_START + AXP803_DCDC6_600mV_STEPS)

#define AXP803_DCDC6_1120mV_START	0x33

#define AXP803_DCDC6_1120mV_STEPS	14

#define AXP803_DCDC6_1120mV_STEPS	20

#define AXP803_DCDC6_1120mV_END		\

	(AXP803_DCDC6_1120mV_START + AXP803_DCDC6_1120mV_STEPS)

#define AXP803_DCDC6_NUM_VOLTAGES	72
@@ -240,7 +240,7 @@ 
#define AXP806_DCDCA_600mV_END		\

	(AXP806_DCDCA_600mV_START + AXP806_DCDCA_600mV_STEPS)

#define AXP806_DCDCA_1120mV_START	0x33

#define AXP806_DCDCA_1120mV_STEPS	14

#define AXP806_DCDCA_1120mV_STEPS	20

#define AXP806_DCDCA_1120mV_END		\

	(AXP806_DCDCA_1120mV_START + AXP806_DCDCA_1120mV_STEPS)

#define AXP806_DCDCA_NUM_VOLTAGES	72
@@ -774,8 +774,8 @@ static const struct regulator_linear_range axp806_dcdcd_ranges[] = { 
			       AXP806_DCDCD_600mV_END,

			       20000),

	REGULATOR_LINEAR_RANGE(1600000,

			       AXP806_DCDCD_600mV_START,

			       AXP806_DCDCD_600mV_END,

			       AXP806_DCDCD_1600mV_START,

			       AXP806_DCDCD_1600mV_END,

			       100000),

};

drivers/regulator/lp87565-regulator.c

+4 −4
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static int lp87565_regulator_probe(struct platform_device *pdev) 
	struct lp87565 *lp87565 = dev_get_drvdata(pdev->dev.parent);

	struct regulator_config config = { };

	struct regulator_dev *rdev;

	int i, min_idx = LP87565_BUCK_0, max_idx = LP87565_BUCK_3;

	int i, min_idx, max_idx;



	platform_set_drvdata(pdev, lp87565);
@@ -182,9 +182,9 @@ static int lp87565_regulator_probe(struct platform_device *pdev) 
		max_idx = LP87565_BUCK_3210;

		break;

	default:

		dev_err(lp87565->dev, "Invalid lp config %d\n",

			lp87565->dev_type);

		return -EINVAL;

		min_idx = LP87565_BUCK_0;

		max_idx = LP87565_BUCK_3;

		break;

	}



	for (i = min_idx; i <= max_idx; i++) {

drivers/regulator/of_regulator.c

+3 −1
Original line number Diff line number Diff line
@@ -416,9 +416,11 @@ device_node *regulator_of_get_init_node(struct device *dev, 
		if (!name)

			name = child->name;



		if (!strcmp(desc->of_match, name))

		if (!strcmp(desc->of_match, name)) {

			of_node_put(search);

			return of_node_get(child);

		}

	}



	of_node_put(search);

drivers/regulator/slg51000-regulator.c

+2 −2
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int slg51000_of_parse_cb(struct device_node *np, 
	ena_gpiod = devm_gpiod_get_from_of_node(chip->dev, np,

						"enable-gpios", 0,

						gflags, "gpio-en-ldo");

	if (ena_gpiod) {

	if (!IS_ERR(ena_gpiod)) {

		config->ena_gpiod = ena_gpiod;

		devm_gpiod_unhinge(chip->dev, config->ena_gpiod);

	}
@@ -459,7 +459,7 @@ static int slg51000_i2c_probe(struct i2c_client *client, 
					       GPIOD_OUT_HIGH

					       | GPIOD_FLAGS_BIT_NONEXCLUSIVE,

					       "slg51000-cs");

	if (cs_gpiod) {

	if (!IS_ERR(cs_gpiod)) {

		dev_info(dev, "Found chip selector property\n");

		chip->cs_gpiod = cs_gpiod;

	}