summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2015-06-11 10:50:34 +0000
committerGerrit Code Review <gerrit2@ip-172-31-25-77.us-west-1.compute.internal>2015-04-16 10:08:13 +0000
commit08ff40216d991727807e36e0442acaac8fe44f72 (patch)
treef0a4c3f207be5190059a9b3b9c4e0c86fb54dea7
parent92f32a18e02cdf53eacae1ec077b3b0281396ed7 (diff)
parentbe1b78afbe1a2beb0f10b4ca285b82e6309f898f (diff)
downloadolio-linux-3.10-08ff40216d991727807e36e0442acaac8fe44f72.tar.xz
olio-linux-3.10-08ff40216d991727807e36e0442acaac8fe44f72.zip
Merge "Making sure that the regulator for BT is always on (until we can fix the driver)." into android-3.10-bringup
-rw-r--r--arch/arm/mach-omap2/board-omap3h1.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3h1.c b/arch/arm/mach-omap2/board-omap3h1.c
index a3fc2d10bc8..54cf6126f10 100644
--- a/arch/arm/mach-omap2/board-omap3h1.c
+++ b/arch/arm/mach-omap2/board-omap3h1.c
@@ -390,7 +390,7 @@ static struct regulator_init_data tps65910_3v3 = {
.valid_modes_mask = REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY,
.valid_ops_mask = REGULATOR_CHANGE_MODE |
REGULATOR_CHANGE_STATUS,
- .always_on = false,
+ .always_on = true,
.apply_uV = true,
.state_mem = {