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

Commit 10dde28d authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'regulator/topic/da9053' and... 

Merge remote-tracking branches 'regulator/topic/da9053' and 'regulator/topic/da9063' into regulator-next
parents 6727479f 8b708144 424fb281

drivers/regulator/da9052-regulator.c

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ static inline struct da9052_regulator_info *find_regulator_info(u8 chip_id, 
	case DA9053_AA:

	case DA9053_BA:

	case DA9053_BB:

	case DA9053_BC:

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

			info = &da9053_regulator_info[i];

			if (info->reg_desc.id == id)

drivers/regulator/da9063-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ static struct da9063_regulators_pdata *da9063_parse_regulators_dt( 
		rdata->initdata = da9063_matches[i].init_data;



		n++;

	};

	}



	*da9063_reg_matches = da9063_matches;

	return pdata;