Unverified Commit 8571bdc2 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 92bf2261 c2945541

drivers/regulator/pf8x00-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int pf8x00_identify(struct pf8x00_chip *chip) 
		name = "PF8121A";

		break;

	case PF8200:

		name = "PF8100";

		name = "PF8200";

		break;

	default:

		dev_err(chip->dev, "Unknown pf8x00 device id 0x%x\n", dev_id);

drivers/regulator/qcom-rpmh-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -928,7 +928,7 @@ static const struct rpmh_vreg_init_data pm8009_vreg_data[] = { 
	RPMH_VREG("ldo4",   "ldo%s4",  &pmic5_nldo,      "vdd-l4"),

	RPMH_VREG("ldo5",   "ldo%s5",  &pmic5_pldo,      "vdd-l5-l6"),

	RPMH_VREG("ldo6",   "ldo%s6",  &pmic5_pldo,      "vdd-l5-l6"),

	RPMH_VREG("ldo7",   "ldo%s6",  &pmic5_pldo_lv,   "vdd-l7"),

	RPMH_VREG("ldo7",   "ldo%s7",  &pmic5_pldo_lv,   "vdd-l7"),

	{},

};

drivers/regulator/rohm-regulator.c

+6 −3
Original line number Diff line number Diff line
@@ -52,9 +52,12 @@ int rohm_regulator_set_dvs_levels(const struct rohm_dvs_config *dvs, 
	char *prop;

	unsigned int reg, mask, omask, oreg = desc->enable_reg;



	for (i = 0; i < ROHM_DVS_LEVEL_MAX && !ret; i++) {

		if (dvs->level_map & (1 << i)) {

			switch (i + 1) {

	for (i = 0; i < ROHM_DVS_LEVEL_VALID_AMOUNT && !ret; i++) {

		int bit;



		bit = BIT(i);

		if (dvs->level_map & bit) {

			switch (bit) {

			case ROHM_DVS_LEVEL_RUN:

				prop = "rohm,dvs-run-voltage";

				reg = dvs->run_reg;

include/linux/mfd/rohm-generic.h

+6 −8
Original line number Diff line number Diff line
@@ -20,14 +20,12 @@ struct rohm_regmap_dev { 
	struct regmap *regmap;

};



enum {

	ROHM_DVS_LEVEL_UNKNOWN,

	ROHM_DVS_LEVEL_RUN,

	ROHM_DVS_LEVEL_IDLE,

	ROHM_DVS_LEVEL_SUSPEND,

	ROHM_DVS_LEVEL_LPSR,

	ROHM_DVS_LEVEL_MAX = ROHM_DVS_LEVEL_LPSR,

};

#define ROHM_DVS_LEVEL_RUN		BIT(0)

#define ROHM_DVS_LEVEL_IDLE		BIT(1)

#define ROHM_DVS_LEVEL_SUSPEND		BIT(2)

#define ROHM_DVS_LEVEL_LPSR		BIT(3)

#define ROHM_DVS_LEVEL_VALID_AMOUNT	4

#define ROHM_DVS_LEVEL_UNKNOWN		0



/**

 * struct rohm_dvs_config - dynamic voltage scaling register descriptions