diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:58:08 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-17 07:58:08 +0200 |
| commit | cffc32975da7df2ef909299c47ff644e1357e0ac (patch) | |
| tree | 04cfa6276b890f49f686d65be7397c4232ac44af /arch/arm/mach-omap2/vc44xx_data.c | |
| parent | 6dc178760553605c58d78bd403dfcb4e042c5b72 (diff) | |
| parent | adeb5537849d9db428fe0ddc3562e5a765a347e2 (diff) | |
| download | op-kernel-dev-cffc32975da7df2ef909299c47ff644e1357e0ac.zip op-kernel-dev-cffc32975da7df2ef909299c47ff644e1357e0ac.tar.gz | |
Merge branch 'x86/asm' into x86/apic, to resolve conflicts
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/mach-omap2/vc44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/vc44xx_data.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/vc44xx_data.c b/arch/arm/mach-omap2/vc44xx_data.c index 085e5d6..2abd5fa 100644 --- a/arch/arm/mach-omap2/vc44xx_data.c +++ b/arch/arm/mach-omap2/vc44xx_data.c @@ -42,6 +42,7 @@ static const struct omap_vc_common omap4_vc_common = { .cmd_ret_shift = OMAP4430_RET_SHIFT, .cmd_off_shift = OMAP4430_OFF_SHIFT, .i2c_cfg_reg = OMAP4_PRM_VC_CFG_I2C_MODE_OFFSET, + .i2c_cfg_clear_mask = OMAP4430_SRMODEEN_MASK | OMAP4430_HSMODEEN_MASK, .i2c_cfg_hsen_mask = OMAP4430_HSMODEEN_MASK, .i2c_mcode_mask = OMAP4430_HSMCODE_MASK, }; |
