diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-22 10:21:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-22 10:21:05 -0700 |
| commit | eec3b80fb1ccc6320e0dae85c0dfb2666bc898e1 (patch) | |
| tree | 483390f63aa0c7ec4abe0a42e1f17c8e294097a3 | |
| parent | 6470812e22261d2342ef1597be62e63a0423d691 (diff) | |
| parent | 0f0fc5c090055983163ed8e7b3a73980e128048c (diff) | |
| download | linux-eec3b80fb1ccc6320e0dae85c0dfb2666bc898e1.tar.bz2 | |
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"
| -rw-r--r-- | drivers/mfd/da9062-core.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mfd/da9062-core.c b/drivers/mfd/da9062-core.c index fbe0f245ce8e..fe1811523e4a 100644 --- a/drivers/mfd/da9062-core.c +++ b/drivers/mfd/da9062-core.c @@ -645,6 +645,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, }, { @@ -721,6 +724,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, }, |