aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorAlexander Aring <a.aring@phytec.de>2011-12-08 15:43:53 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 17:25:01 -0800
commit6c8e76e158a9bc849ec946ab030595e06ad89210 (patch)
tree72ce65be39486578fb73e4bcaae83f0a7239724d /drivers/i2c
parent06a23648ebbb532745eb85c1a381b83dd90e94af (diff)
downloadkernel_samsung_smdk4412-6c8e76e158a9bc849ec946ab030595e06ad89210.zip
kernel_samsung_smdk4412-6c8e76e158a9bc849ec946ab030595e06ad89210.tar.gz
kernel_samsung_smdk4412-6c8e76e158a9bc849ec946ab030595e06ad89210.tar.bz2
I2C: OMAP: correct SYSC register offset for OMAP4
commit 2727b1753934e154931d6b3bdf20c9b2398457a2 upstream. Correct OMAP_I2C_SYSC_REG offset in omap4 register map. Offset 0x20 is reserved and OMAP_I2C_SYSC_REG has 0x10 as offset. Signed-off-by: Alexander Aring <a.aring@phytec.de> [khilman@ti.com: minor changelog edits] Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-omap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 58a58c7..137e1a3 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -235,7 +235,7 @@ const static u8 omap4_reg_map[] = {
[OMAP_I2C_BUF_REG] = 0x94,
[OMAP_I2C_CNT_REG] = 0x98,
[OMAP_I2C_DATA_REG] = 0x9c,
- [OMAP_I2C_SYSC_REG] = 0x20,
+ [OMAP_I2C_SYSC_REG] = 0x10,
[OMAP_I2C_CON_REG] = 0xa4,
[OMAP_I2C_OA_REG] = 0xa8,
[OMAP_I2C_SA_REG] = 0xac,