aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/vc3xxx_data.c
diff options
context:
space:
mode:
authorNishanth Menon <nm@ti.com>2011-05-18 00:17:28 -0500
committerKevin Hilman <khilman@ti.com>2011-06-03 10:13:52 -0700
commit2e2478eb84ec5533734bdfd07aef7e0e6d506d63 (patch)
tree2d7b4624c8f3b68d2f98e473378f0a41488beeaf /arch/arm/mach-omap2/vc3xxx_data.c
parent818ede6faf1cff3d29d2d07eb2cb9ea48a19557e (diff)
downloadkernel_samsung_espresso10-2e2478eb84ec5533734bdfd07aef7e0e6d506d63.zip
kernel_samsung_espresso10-2e2478eb84ec5533734bdfd07aef7e0e6d506d63.tar.gz
kernel_samsung_espresso10-2e2478eb84ec5533734bdfd07aef7e0e6d506d63.tar.bz2
OMAP4: PM: VC: fix highspeed i2c for SR
Patch "OMAP3+: VC: make I2C config programmable with PMIC-specific settings" wrongly uses shift register causing mcode to be set instead of HS mode bit to be set for I2C_SR. Fix the same for OMAP4 and rename the "shift" to "mask" to rightly indicate what is to be provided in the structure. Signed-off-by: Nishanth Menon <nm@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/vc3xxx_data.c')
-rw-r--r--arch/arm/mach-omap2/vc3xxx_data.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/vc3xxx_data.c b/arch/arm/mach-omap2/vc3xxx_data.c
index 688d55d..95d7701 100644
--- a/arch/arm/mach-omap2/vc3xxx_data.c
+++ b/arch/arm/mach-omap2/vc3xxx_data.c
@@ -44,7 +44,7 @@ static struct omap_vc_common omap3_vc_common = {
.cmd_ret_shift = OMAP3430_VC_CMD_RET_SHIFT,
.cmd_off_shift = OMAP3430_VC_CMD_OFF_SHIFT,
.cfg_channel_reg = OMAP3_PRM_VC_CH_CONF_OFFSET,
- .i2c_cfg_hsen_shift = OMAP3430_HSEN_MASK,
+ .i2c_cfg_hsen_mask = OMAP3430_HSEN_MASK,
.i2c_cfg_reg = OMAP3_PRM_VC_I2C_CFG_OFFSET,
.i2c_mcode_mask = OMAP3430_MCODE_MASK,
};