summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorThara Gopinath <thara@ti.com>2010-08-13 19:51:40 +0530
committerBryan Wu <bryan.wu@canonical.com>2010-08-26 21:45:38 +0800
commit5c8700f186fb6ee282612617b048cb733fbfcd7f (patch)
treea5dcd24f8a5f1605d80779f7874c0d744804dae7 /arch
parent1fddcc91252a14ded0e7781d9b60b90cd64bc207 (diff)
OMAP4: Fix compilation warnings.
This patch fixes the compilation warnings in the voltage driver. Signed-off-by: Thara Gopinath <thara@ti.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/prcm-common.h2
-rw-r--r--arch/arm/mach-omap2/voltage.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h
index e60c78ffcb0e..86c966403444 100644
--- a/arch/arm/mach-omap2/prcm-common.h
+++ b/arch/arm/mach-omap2/prcm-common.h
@@ -52,7 +52,7 @@
#define OMAP3430ES2_USBHOST_MOD 0xc00
#define BITS(n_bit) \
- (((1 << n_bit) - 1) | (1 << n_bit))
+ (((1U << n_bit) - 1) | (1U << n_bit))
#define BITFIELD(l_bit, u_bit) \
(BITS(u_bit) & ~((BITS(l_bit)) >> 1))
diff --git a/arch/arm/mach-omap2/voltage.c b/arch/arm/mach-omap2/voltage.c
index 61970ac68267..646fd0dbf1d6 100644
--- a/arch/arm/mach-omap2/voltage.c
+++ b/arch/arm/mach-omap2/voltage.c
@@ -852,6 +852,10 @@ static int vc_bypass_scale_voltage(struct omap_vdd_info *vdd,
vc_valid = OMAP3430_VALID_MASK;
vc_bypass_val_reg_offs = OMAP3_PRM_VC_BYPASS_VAL_OFFSET;
sr_i2c_slave_addr = OMAP3_SRI2C_SLAVE_ADDR;
+ } else {
+ pr_warning("%s: vc bypass method of voltage scaling"
+ "not supported\n", __func__);
+ return -EINVAL;
}
/* Get volt_data corresponding to target_volt */