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

Commit eec3b80f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mfd-fixes-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd 

Pull MFD fix from Lee Jones:
 "Revert duplicate commit in da9062-core"

* tag 'mfd-fixes-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  Revert "mfd: da9061: Fix to remove BBAT_CONT register from chip model"
parents 6470812e 0f0fc5c0

drivers/mfd/da9062-core.c

+6 −0
Original line number Diff line number Diff line
@@ -644,6 +644,9 @@ static const struct regmap_range da9062_aa_readable_ranges[] = { 
	}, {

		.range_min = DA9062AA_VLDO1_B,

		.range_max = DA9062AA_VLDO4_B,

	}, {

		.range_min = DA9062AA_BBAT_CONT,

		.range_max = DA9062AA_BBAT_CONT,

	}, {

		.range_min = DA9062AA_INTERFACE,

		.range_max = DA9062AA_CONFIG_E,
@@ -720,6 +723,9 @@ static const struct regmap_range da9062_aa_writeable_ranges[] = { 
	}, {

		.range_min = DA9062AA_VLDO1_B,

		.range_max = DA9062AA_VLDO4_B,

	}, {

		.range_min = DA9062AA_BBAT_CONT,

		.range_max = DA9062AA_BBAT_CONT,

	}, {

		.range_min = DA9062AA_GP_ID_0,

		.range_max = DA9062AA_GP_ID_19,