p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

regulator: Fixes for v3.18 

A couple of fixes for v3.18, one fix for an incorrect voltage to
 register mapping in the rk808 driver and a fix for a build failure in
 some SH defconfigs.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJUTiy3AAoJECTWi3JdVIfQQJoH/3aq0DbX/PiEWCC+UI4+Vd3/
 oqHVNcsaR36VTL43Ywv2cLGqF/AVQ+Vp3Jlh2PokatLIF97M38HSIJ3mmPhXch2w
 0NAxVDNpPaoH+YO+OT99gxyzQMFo4dZ0f7vvePLid90VSDNE5A5Ce5IWMY7vsDIH
 kENOGKugA5qT9ctBrC0Wp490+j5oShrSeh3U1mOhNFyEsP0svDDcE5jRYhzSUe4W
 AFQFtWgAntVYGRHfr7OqTuFit0fq7Kan619+4jhDyO5GsOdxFwusq92XwRc7FD5S
 4OrAwJfNYv5f6VmqZW9a7RusvJVOeaOtWi5GE38y57Vr3Nmil7WTTwB/0BXZKrs=
 =jWtc
 -----END PGP SIGNATURE-----

Merge tag 'regulator-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of fixes for v3.18, one fix for an incorrect voltage to
  register mapping in the rk808 driver and a fix for a build failure in
  some SH defconfigs"

* tag 'regulator-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Include err.h from consumer.h to fix build failure
  regulator: rk808: Fix min_uV for DCDC1 & DCDC2
This commit is contained in:
Linus Torvalds 2014-10-27 15:03:56 -07:00
parent cac7f24298 bc02871b45
commit d855c5c909
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/regulator/rk808-regulator.c
View File

@ -44,7 +44,7 @@ static const int rk808_buck_config_regs[] = {
};
static const struct regulator_linear_range rk808_buck_voltage_ranges[] = {
REGULATOR_LINEAR_RANGE(700000, 0, 63, 12500),
REGULATOR_LINEAR_RANGE(712500, 0, 63, 12500),
};
static const struct regulator_linear_range rk808_buck4_voltage_ranges[] = {

2
include/linux/regulator/consumer.h
View File

@ -35,6 +35,8 @@
#ifndef __LINUX_REGULATOR_CONSUMER_H_
#define __LINUX_REGULATOR_CONSUMER_H_
#include <linux/err.h>
struct device;
struct notifier_block;
struct regmap;