summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/omap_twl.c
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2011-05-18 07:17:32 +0200
committerKevin Hilman <khilman@ti.com>2011-09-15 21:09:36 +0200
commit2aed5b9e8877237886453f138be7ecea224b32b0 (patch)
tree438f32825d7dd28277f7acc7826daa29924c414b /arch/arm/mach-omap2/omap_twl.c
parentOMAP4: PM: TWL6030: fix uv to voltage for >0x39 (diff)
downloadlinux-2aed5b9e8877237886453f138be7ecea224b32b0.tar.xz
linux-2aed5b9e8877237886453f138be7ecea224b32b0.zip
OMAP4: PM: TWL6030: address 0V conversions
0V conversions should be mapped to 0 as it is meant to denote off voltages. Signed-off-by: Nishanth Menon <nm@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap_twl.c')
-rw-r--r--arch/arm/mach-omap2/omap_twl.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap_twl.c b/arch/arm/mach-omap2/omap_twl.c
index 5def7c274f75..b30adf349b73 100644
--- a/arch/arm/mach-omap2/omap_twl.c
+++ b/arch/arm/mach-omap2/omap_twl.c
@@ -95,6 +95,8 @@ static unsigned long twl6030_vsel_to_uv(const u8 vsel)
is_offset_valid = true;
}
+ if (!vsel)
+ return 0;
/*
* There is no specific formula for voltage to vsel
* conversion above 1.3V. There are special hardcoded
@@ -127,6 +129,8 @@ static u8 twl6030_uv_to_vsel(unsigned long uv)
is_offset_valid = true;
}
+ if (!uv)
+ return 0x00;
/*
* There is no specific formula for voltage to vsel
* conversion above 1.3V. There are special hardcoded