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

Merge tag 'regulator-fix-v7.0-rc7' of... 

Merge tag 'regulator-fix-v7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "One last fix for v7.0, the BD72720 incorrectly described which DCDC is
  tied to the LDO for its LDON-HEAD mode which automates using the DCDC
  to more efficiently drop a supply for delivery via the LDO"

* tag 'regulator-fix-v7.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: bd71828-regulator.c: Fix LDON-HEAD mode
parents 086aca10 b1baaff4

drivers/regulator/bd71828-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ static const struct bd71828_regulator_data bd71828_rdata[] = { 
	},

};



#define BD72720_BUCK10_DESC_INDEX 10

#define BD72720_BUCK10_DESC_INDEX 9

#define BD72720_NUM_BUCK_VOLTS 0x100

#define BD72720_NUM_LDO_VOLTS 0x100

#define BD72720_NUM_LDO12346_VOLTS 0x80